Skip to content

Commit

Permalink
fixed an issue with backup/restore, added manual icon transparency. r…
Browse files Browse the repository at this point in the history
…eady for v7.8
  • Loading branch information
kosh committed Sep 28, 2015
1 parent 9c5c90f commit 51c0301
Show file tree
Hide file tree
Showing 12 changed files with 242 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public void onCreate() {
}
CustomActivityOnCrash.install(this);
CrashlyticsCore core = new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build();

Fabric.with(this, new Crashlytics.Builder().core(core).build());
Stetho.initialize(Stetho.newInitializerBuilder(this)
.enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
package com.styleme.floating.toolbox.pro.fragments;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.v4.app.DialogFragment;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;

import com.styleme.floating.toolbox.pro.AppController;
import com.styleme.floating.toolbox.pro.R;
import com.styleme.floating.toolbox.pro.global.helper.AppHelper;
import com.styleme.floating.toolbox.pro.global.model.EventType;
import com.styleme.floating.toolbox.pro.global.model.EventsModel;
import com.styleme.floating.toolbox.pro.widget.FontTextView;

import org.adw.library.widgets.discreteseekbar.DiscreteSeekBar;

import butterknife.Bind;
import butterknife.ButterKnife;

/**
* Created by Kosh on 9/16/2015. copyrights are reserved
*/
public class IconAlphaFragment extends DialogFragment implements DiscreteSeekBar.OnProgressChangeListener {

@Bind(R.id.toolbar)
Toolbar toolbar;
@Bind(R.id.appbar)
AppBarLayout appbar;
@Bind(R.id.alphaValue)
FontTextView alphaValue;
@Bind(R.id.seek)
DiscreteSeekBar seek;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (AppHelper.isDarkTheme(getActivity())) {
setStyle(DialogFragment.STYLE_NORMAL, R.style.FloatingTheme);
}
}

@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.icon_transparency_popup, container, false);
getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
ButterKnife.bind(this, view);
return view;
}

@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.done) {
AppHelper.setIconTransparency(getActivity(), seek.getProgress());
EventsModel eventsModel = new EventsModel();
eventsModel.setEventType(EventType.ICON_ALPHA);
AppController.getController().eventBus().post(eventsModel);
dismiss();
return true;
}
return true;
}
});
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dismiss();
}
});
toolbar.setNavigationIcon(R.drawable.ic_back);
toolbar.inflateMenu(R.menu.fragment_menu);
toolbar.getMenu().findItem(R.id.sneak).setVisible(false);
toolbar.setTitle("Icon Transparency");
toolbar.setBackgroundColor(AppHelper.getPrimaryColor(getActivity()));
seek.setTrackColor(AppHelper.getPrimaryColor(getActivity()));
seek.setOnProgressChangeListener(this);
seek.setScrubberColor(AppHelper.getAccentColor(getActivity()));
seek.setThumbColor(AppHelper.getPrimaryColor(getActivity()), AppHelper.getAccentColor(getActivity()));
seek.setProgress(AppHelper.getIconTransparency(getActivity()));
alphaValue.setTextColor(AppHelper.getAccentColor(getActivity()));
alphaValue.setText(String.format("%d", AppHelper.getIconTransparency(getActivity())));
}

@Override
public void onDestroyView() {
super.onDestroyView();
ButterKnife.unbind(this);
}

@Override
public void onProgressChanged(DiscreteSeekBar seekBar, int value, boolean fromUser) {
alphaValue.setText(String.format("%d", value));
}

@Override
public void onStartTrackingTouch(DiscreteSeekBar seekBar) {

}

@Override
public void onStopTrackingTouch(DiscreteSeekBar seekBar) {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,20 @@ public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.general_settings);
findPreference("version").setSummary(BuildConfig.VERSION_NAME);
getPreferenceManager().findPreference("dark_theme").setOnPreferenceClickListener(this);
ColorPreference primary = (ColorPreference) getPreferenceManager().findPreference("primary_color");
ColorPreference accent = (ColorPreference) getPreferenceManager().findPreference("accent_color");
getPreferenceScreen().findPreference("icon_pack").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("backup").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("restore").setOnPreferenceClickListener(this);
ColorPreference primary = (ColorPreference) getPreferenceScreen().findPreference("primary_color");
ColorPreference accent = (ColorPreference) getPreferenceScreen().findPreference("accent_color");
if (AppHelper.getBackupFile().exists()) {
getPreferenceScreen().findPreference("restore").setEnabled(true);
} else {
getPreferenceScreen().findPreference("restore").setSummary(getString(R.string.restore_summery) + " " + getString(R.string
.no_backup_found));
}
getPreferenceScreen().findPreference("manualSize").setOnPreferenceClickListener(this);
customImage = (CheckBoxPreference) getPreferenceManager().findPreference("customImage");
customImage.setOnPreferenceClickListener(this);
customIcon = getPreferenceManager().findPreference("customIcon");
customIcon.setOnPreferenceClickListener(this);
getPreferenceManager().findPreference("fa_always_showing").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("fa_horizontal").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("fa_background_alpha").setOnPreferenceClickListener(this);
// getPreferenceManager().findPreference("auto_order").setOnPreferenceClickListener(this);
customImage = (CheckBoxPreference) getPreferenceScreen().findPreference("customImage");
customIcon = getPreferenceScreen().findPreference("customIcon");
initListener();
primary.onColorSelect(this);
accent.onColorSelect(this);
ColorPreference fa_background = (ColorPreference) getPreferenceManager().findPreference("fa_background");
ColorPreference fa_background = (ColorPreference) getPreferenceScreen().findPreference("fa_background");
fa_background.onColorSelect(new ColorSelector() {
@Override
public void onColorSelected(int color) {
Expand All @@ -82,6 +72,20 @@ public void onColorSelected(int color) {
});
}

private void initListener() {
customImage.setOnPreferenceClickListener(this);
customIcon.setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("icon_alpha").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("fa_always_showing").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("fa_horizontal").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("fa_background_alpha").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("manualSize").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("icon_pack").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("backup").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("restore").setOnPreferenceClickListener(this);
getPreferenceScreen().findPreference("dark_theme").setOnPreferenceClickListener(this);
}

@Override
public boolean onPreferenceClick(Preference preference) {
String saveKey = preference.getKey();
Expand Down Expand Up @@ -127,6 +131,11 @@ public boolean onPreferenceClick(Preference preference) {
} else if (preference.getKey().equalsIgnoreCase("fa_always_showing")) {
restartService();
return true;
} else if (preference.getKey().equalsIgnoreCase("icon_alpha")) {
IconAlphaFragment iconAlphaFragment = new IconAlphaFragment();
iconAlphaFragment.setCancelable(false);
iconAlphaFragment.show(((AppCompatActivity) getActivity()).getSupportFragmentManager(), "ICON_ALPHA");
return true;
}
// else if (preference.getKey().equalsIgnoreCase("auto_order")) {
// Intent intent = new Intent(MyAppsReceiver.REARRANGED);
Expand Down Expand Up @@ -267,13 +276,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
@Override
public void onResume() {
super.onResume();
getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);

}

@Override
public void onPause() {
getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
super.onPause();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -428,4 +428,13 @@ public static void setHasSeenInAppNew(Context context) {
public static boolean hasSeenInAppNew(Context context) {
return PreferenceManager.getDefaultSharedPreferences(context).getInt("version_code", 0) == BuildConfig.VERSION_CODE;
}

public static int getIconTransparency(Context context) {
return PreferenceManager.getDefaultSharedPreferences(context).getInt("icon_alpha", 100);
}

public static void setIconTransparency(Context context, int alpha) {
PreferenceManager.getDefaultSharedPreferences(context).edit().putInt("icon_alpha", alpha).apply();
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.styleme.floating.toolbox.pro.global.model;

import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

import java.util.List;
import java.util.Map;
Expand All @@ -10,8 +11,10 @@
*/
public class BackupModel {
@Expose
@SerializedName("selectedApps")
private List<AppsModel> selectedApps;
@Expose
@SerializedName("prefs")
private Map<String, ?> prefs;

public List<AppsModel> getSelectedApps() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* Created by Kosh on 9/6/2015. copyrights are reserved
*/
public enum EventType {
DELETE, NEW, THEME, APPS_COUNT, MY_APPS_COUNT, SETTINGS_CHANGE, PREVIEW, ICON_PACK, FA_BACKGROUND, FA_SWITCH
DELETE, NEW, THEME, APPS_COUNT, MY_APPS_COUNT, SETTINGS_CHANGE, PREVIEW, ICON_PACK, FA_BACKGROUND, FA_SWITCH, ICON_ALPHA
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected void onPostExecute(Boolean success) {
}

@Override
protected Boolean doInBackground(BackupModel... params) {
protected Boolean doInBackground(BackupModel... params) pro{
try {
BackupModel backupModel = new BackupModel();
backupModel.setSelectedApps(new AppsModel().getAll());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public boolean onTouch(View v, MotionEvent event) {
onMyAppsLoader = new MyPopupAppsLoader(context, this);
onMyAppsLoader.registerListener(3, onLoadCompleteListener);
onMyAppsLoader.startLoading();
animateHidden();
}

private void hideRecycler() {
Expand Down Expand Up @@ -352,11 +353,11 @@ public void onReset() {

private void animateHidden() {
if (AppHelper.isAutoTransparent(context))
floatingImage.setAlpha(0.3F);
floatingImage.setImageAlpha(AppHelper.getIconTransparency(context));
}

private void animateShowing() {
floatingImage.setAlpha(1.0F);
floatingImage.setImageAlpha(255);
}

private double bounceValue(long step, long scale) {
Expand Down Expand Up @@ -404,6 +405,8 @@ public void run() {
}
} else if (eventsModel != null && eventsModel.getEventType() == EventType.FA_BACKGROUND) {
setupBackground();
} else if (eventsModel != null && eventsModel.getEventType() == EventType.ICON_ALPHA) {
animateHidden();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public boolean onTouch(View v, MotionEvent event) {
onMyAppsLoader = new MyPopupAppsLoader(context, this);
onMyAppsLoader.registerListener(2, onLoadCompleteListener);
onMyAppsLoader.startLoading();
animateHidden();
}

private void setupFloatingImage(boolean update) {
Expand Down Expand Up @@ -356,11 +357,11 @@ public void onReset() {

private void animateHidden() {
if (AppHelper.isAutoTransparent(context))
floatingImage.setAlpha(0.3F);
floatingImage.setImageAlpha(AppHelper.getIconTransparency(context));
}

private void animateShowing() {
floatingImage.setAlpha(1.0F);
floatingImage.setImageAlpha(255);
}

private double bounceValue(long step, long scale) {
Expand Down Expand Up @@ -445,6 +446,8 @@ public void run() {
popupWindow.show();
}
}
} else if (eventsModel != null && eventsModel.getEventType() == EventType.ICON_ALPHA) {
animateHidden();
}
}
}
24 changes: 0 additions & 24 deletions app/src/main/res/layouts/main_layout/layout/tryme.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ToolbarStyle">

<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolbarStyle"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">

<com.styleme.floating.toolbox.pro.widget.FontTextView
android:id="@+id/alphaValue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="16dp"
android:text="0"
android:textSize="22dp"
android:textStyle="bold"/>

<org.adw.library.widgets.discreteseekbar.DiscreteSeekBar
android:id="@+id/seek"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:dsb_max="255"
app:dsb_min="10"
app:dsb_progressColor="@color/accent"
app:dsb_rippleColor="@color/accent"
app:dsb_trackColor="@color/primary"/>
</LinearLayout>
</LinearLayout>
Loading

0 comments on commit 51c0301

Please sign in to comment.