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

Added gradle dependency

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-01 23:11:01 +01:00
commit fb15d29974
3 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -129,6 +129,7 @@ dependencies {
compile 'com.android.support:design:23.1.1' compile 'com.android.support:design:23.1.1'
compile 'com.android.support:support-annotations:23.1.1' compile 'com.android.support:support-annotations:23.1.1'
compile 'com.android.support:percent:23.1.1' compile 'com.android.support:percent:23.1.1'
compile 'com.android.support:preference-v7:23.1.1'
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0' compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
compile 'asia.ivity.android:drag-sort-listview:1.0' compile 'asia.ivity.android:drag-sort-listview:1.0'
compile 'com.github.semoncat.seekarc:library:0.1' compile 'com.github.semoncat.seekarc:library:0.1'

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

@ -6,23 +6,21 @@ import android.content.pm.ResolveInfo;
import android.media.audiofx.AudioEffect; import android.media.audiofx.AudioEffect;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
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;
import android.support.annotation.StyleRes; import android.support.annotation.StyleRes;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.TwoStatePreference;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; 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.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;
@ -53,9 +51,9 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) { if (savedInstanceState == null) {
getFragmentManager().beginTransaction().replace(R.id.content_frame, new SettingsFragment()).commit(); getSupportFragmentManager().beginTransaction().replace(R.id.content_frame, new SettingsFragment()).commit();
} else { } else {
SettingsFragment frag = (SettingsFragment) getFragmentManager().findFragmentById(R.id.content_frame); SettingsFragment frag = (SettingsFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame);
if (frag != null) frag.invalidateSettings(); if (frag != null) frag.invalidateSettings();
} }
} }
@ -86,7 +84,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
public static class SettingsFragment extends PreferenceFragment { public static class SettingsFragment extends PreferenceFragmentCompat {
private static void setSummary(@NonNull Preference preference) { private static void setSummary(@NonNull Preference preference) {
setSummary(preference, PreferenceManager setSummary(preference, PreferenceManager
@ -110,9 +108,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
} }
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreatePreferences(Bundle bundle, String s) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.pref_general); addPreferencesFromResource(R.xml.pref_general);
addPreferencesFromResource(R.xml.pref_colors); addPreferencesFromResource(R.xml.pref_colors);
addPreferencesFromResource(R.xml.pref_now_playing_screen); addPreferencesFromResource(R.xml.pref_now_playing_screen);
@ -163,37 +159,37 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
} }
}); });
ATEColorPreference primaryColorPref = (ATEColorPreference) findPreference("primary_color"); // ATEColorPreference primaryColorPref = (ATEColorPreference) findPreference("primary_color");
final int primaryColor = ThemeStore.primaryColor(getActivity()); // final int primaryColor = ThemeStore.primaryColor(getActivity());
primaryColorPref.setColor(primaryColor, ColorUtil.darkenColor(primaryColor)); // primaryColorPref.setColor(primaryColor, ColorUtil.darkenColor(primaryColor));
primaryColorPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { // primaryColorPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override // @Override
public boolean onPreferenceClick(@NonNull Preference preference) { // public boolean onPreferenceClick(@NonNull Preference preference) {
new ColorChooserDialog.Builder(((SettingsActivity) getActivity()), R.string.primary_color) // new ColorChooserDialog.Builder(((SettingsActivity) getActivity()), R.string.primary_color)
.accentMode(false) // .accentMode(false)
.allowUserColorInput(true) // .allowUserColorInput(true)
.allowUserColorInputAlpha(false) // .allowUserColorInputAlpha(false)
.preselect(primaryColor) // .preselect(primaryColor)
.show(); // .show();
return true; // return true;
} // }
}); // });
//
ATEColorPreference accentColorPref = (ATEColorPreference) findPreference("accent_color"); // ATEColorPreference accentColorPref = (ATEColorPreference) findPreference("accent_color");
final int accentColor = ThemeStore.accentColor(getActivity()); // final int accentColor = ThemeStore.accentColor(getActivity());
accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor)); // accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor));
accentColorPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { // accentColorPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override // @Override
public boolean onPreferenceClick(@NonNull Preference preference) { // public boolean onPreferenceClick(@NonNull Preference preference) {
new ColorChooserDialog.Builder(((SettingsActivity) getActivity()), R.string.accent_color) // new ColorChooserDialog.Builder(((SettingsActivity) getActivity()), R.string.accent_color)
.accentMode(true) // .accentMode(true)
.allowUserColorInput(true) // .allowUserColorInput(true)
.allowUserColorInputAlpha(false) // .allowUserColorInputAlpha(false)
.preselect(accentColor) // .preselect(accentColor)
.show(); // .show();
return true; // return true;
} // }
}); // });
TwoStatePreference colorNavBar = (TwoStatePreference) 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) {

4
app/src/main/res/xml/pref_colors.xml
View file

@ -1,4 +1,4 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <android. xmlns:android="http://schemas.android.com/apk/res/android">
<com.kabouzeid.appthemehelper.common.prefs.ATEPreferenceCategory android:title="@string/pref_header_colors"> <com.kabouzeid.appthemehelper.common.prefs.ATEPreferenceCategory android:title="@string/pref_header_colors">
@ -29,4 +29,4 @@
</com.kabouzeid.appthemehelper.common.prefs.ATEPreferenceCategory> </com.kabouzeid.appthemehelper.common.prefs.ATEPreferenceCategory>
</PreferenceScreen> </android.>