tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temporary fixed critical update bug.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-04 00:24:53 +01:00
commit ea78a3e117
3 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
View file

@ -9,7 +9,6 @@ import android.os.Bundle;
import android.support.annotation.ColorInt; import android.support.annotation.ColorInt;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.StyleRes;
import android.support.v7.preference.ListPreference; import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceManager;
@ -26,6 +25,7 @@ import com.kabouzeid.appthemehelper.util.ColorUtil;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import butterknife.Bind; import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -144,7 +144,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
public boolean onPreferenceChange(Preference preference, @NonNull Object o) { public boolean onPreferenceChange(Preference preference, @NonNull Object o) {
setSummary(generalTheme, o); setSummary(generalTheme, o);
ThemeStore.editTheme(getActivity()) ThemeStore.editTheme(getActivity())
.activityTheme(getThemeResFromPrefValue((String) o)) .activityTheme(PreferenceUtil.getThemeResFromPrefValue((String) o))
.commit(); .commit();
getActivity().recreate(); getActivity().recreate();
return true; return true;
@ -231,18 +231,5 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
ResolveInfo ri = pm.resolveActivity(effects, 0); ResolveInfo ri = pm.resolveActivity(effects, 0);
return ri != null; return ri != null;
} }
@StyleRes
public int getThemeResFromPrefValue(String themePrefValue) {
switch (themePrefValue) {
case "dark":
return R.style.Theme_Phonograph;
case "black":
return R.style.Theme_Phonograph_Black;
case "light":
default:
return R.style.Theme_Phonograph_Light;
}
}
} }
} }

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
View file

@ -12,6 +12,7 @@ import com.kabouzeid.appthemehelper.common.ATHToolbarActivity;
import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.ColorUtil;
import com.kabouzeid.appthemehelper.util.MaterialDialogsUtil; import com.kabouzeid.appthemehelper.util.MaterialDialogsUtil;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
/** /**
@ -30,6 +31,7 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity {
.accentColorRes(R.color.pink_A400) .accentColorRes(R.color.pink_A400)
.commit(); .commit();
} }
getSharedPreferences("[[kabouzeid_app-theme-helper]]", 0).edit().putInt("activity_theme", PreferenceUtil.getInstance(this).getGeneralTheme()).commit(); // TEMPORARY FIX
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this); MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this);
} }

27
app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
View file

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.StyleRes;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -100,20 +101,20 @@ public final class PreferenceUtil {
} }
public int getGeneralTheme() { public int getGeneralTheme() {
try { return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, ""));
int value = Integer.parseInt(mPreferences.getString(GENERAL_THEME, "0")); }
switch (value) {
case 0:
return R.style.Theme_Phonograph_Light;
case 1:
return R.style.Theme_Phonograph;
case 2:
return R.style.Theme_Phonograph_Black;
}
} catch (NumberFormatException ignored) {
}
return R.style.Theme_Phonograph_Light; @StyleRes
public static int getThemeResFromPrefValue(String themePrefValue) {
switch (themePrefValue) {
case "dark":
return R.style.Theme_Phonograph;
case "black":
return R.style.Theme_Phonograph_Black;
case "light":
default:
return R.style.Theme_Phonograph_Light;
}
} }
public int getThemeColorPrimary(Context context) { public int getThemeColorPrimary(Context context) {