Updated app-theme-helper, which fixes the Preference Switch bug.
This commit is contained in:
parent
dd98206ec7
commit
e67edfb7e6
3 changed files with 21 additions and 11 deletions
|
|
@ -114,6 +114,10 @@ dependencies {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compile('com.github.kabouzeid:app-theme-helper:0.7.11kmod@aar'){
|
||||||
|
transitive = true
|
||||||
|
}
|
||||||
|
|
||||||
compile 'com.android.support:support-v4:23.1.1'
|
compile 'com.android.support:support-v4:23.1.1'
|
||||||
compile 'com.android.support:support-v13:23.1.1'
|
compile 'com.android.support:support-v13:23.1.1'
|
||||||
compile 'com.android.support:appcompat-v7:23.1.1'
|
compile 'com.android.support:appcompat-v7:23.1.1'
|
||||||
|
|
@ -138,5 +142,4 @@ dependencies {
|
||||||
compile 'com.github.kabouzeid:AppIntro:3.3.0k'
|
compile 'com.github.kabouzeid:AppIntro:3.3.0k'
|
||||||
compile 'com.github.bumptech.glide:glide:3.6.1'
|
compile 'com.github.bumptech.glide:glide:3.6.1'
|
||||||
compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.2-kmod'
|
compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.2-kmod'
|
||||||
compile 'com.github.kabouzeid:app-theme-helper:0.7.8kmod'
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import android.preference.ListPreference;
|
||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.PreferenceFragment;
|
import android.preference.PreferenceFragment;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
|
import android.preference.TwoStatePreference;
|
||||||
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;
|
||||||
|
|
@ -21,7 +22,6 @@ import android.view.View;
|
||||||
import com.afollestad.materialdialogs.color.ColorChooserDialog;
|
import com.afollestad.materialdialogs.color.ColorChooserDialog;
|
||||||
import com.kabouzeid.appthemehelper.ThemeStore;
|
import com.kabouzeid.appthemehelper.ThemeStore;
|
||||||
import com.kabouzeid.appthemehelper.common.prefs.ATEColorPreference;
|
import com.kabouzeid.appthemehelper.common.prefs.ATEColorPreference;
|
||||||
import com.kabouzeid.appthemehelper.common.prefs.ATESwitchPreference;
|
|
||||||
import com.kabouzeid.appthemehelper.util.ColorUtil;
|
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;
|
||||||
|
|
@ -52,8 +52,12 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
|
||||||
//noinspection ConstantConditions
|
//noinspection ConstantConditions
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
if (savedInstanceState == null)
|
if (savedInstanceState == null) {
|
||||||
getFragmentManager().beginTransaction().replace(R.id.content_frame, new SettingsFragment()).commit();
|
getFragmentManager().beginTransaction().replace(R.id.content_frame, new SettingsFragment()).commit();
|
||||||
|
} else {
|
||||||
|
SettingsFragment frag = (SettingsFragment) getFragmentManager().findFragmentById(R.id.content_frame);
|
||||||
|
if (frag != null) frag.invalidateSettings();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -105,12 +109,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
view.findViewById(android.R.id.list).setPadding(0, 0, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
@ -121,7 +119,16 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
|
||||||
addPreferencesFromResource(R.xml.pref_images);
|
addPreferencesFromResource(R.xml.pref_images);
|
||||||
addPreferencesFromResource(R.xml.pref_lockscreen);
|
addPreferencesFromResource(R.xml.pref_lockscreen);
|
||||||
addPreferencesFromResource(R.xml.pref_audio);
|
addPreferencesFromResource(R.xml.pref_audio);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||||
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
view.findViewById(android.R.id.list).setPadding(0, 0, 0, 0);
|
||||||
|
invalidateSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void invalidateSettings() {
|
||||||
final Preference defaultStartPage = findPreference("default_start_page");
|
final Preference defaultStartPage = findPreference("default_start_page");
|
||||||
setSummary(defaultStartPage);
|
setSummary(defaultStartPage);
|
||||||
defaultStartPage.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
defaultStartPage.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
||||||
|
|
@ -188,7 +195,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ATESwitchPreference colorNavBar = (ATESwitchPreference) findPreference("should_color_navigation_bar");
|
TwoStatePreference colorNavBar = (TwoStatePreference) findPreference("should_color_navigation_bar");
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
|
||||||
colorNavBar.setEnabled(false);
|
colorNavBar.setEnabled(false);
|
||||||
colorNavBar.setSummary(R.string.pref_only_lollipop);
|
colorNavBar.setSummary(R.string.pref_only_lollipop);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.0.0-alpha7'
|
classpath 'com.android.tools.build:gradle:2.0.0-alpha8'
|
||||||
classpath 'com.github.triplet.gradle:play-publisher:1.1.3'
|
classpath 'com.github.triplet.gradle:play-publisher:1.1.3'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue