From 66081142c739aadca0842c89c80978cb89224670 Mon Sep 17 00:00:00 2001 From: Mohit Date: Fri, 6 Mar 2020 15:49:41 +0530 Subject: [PATCH] Add About Content --- res/values/strings.xml | 19 ++- res/xml/settings.xml | 119 ++++++++++++++---- .../ui/activities/SettingsActivity.java | 39 +++--- 3 files changed, 130 insertions(+), 47 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 605dd8e9..51faf610 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,5 +1,4 @@ - - - \'%s\' set as ringtone + \'%s\' set as ringtone Playlist renamed @@ -209,4 +208,16 @@ %1$s %2$s Music playback + + Music is forked from LineageOS Music + Authors + Source code + Licence + Music information + Music is an Open Source Music Player for Android + Privacy policy + Terms of service + About + Build Version + diff --git a/res/xml/settings.xml b/res/xml/settings.xml index dec96c91..9b7ed84e 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -1,5 +1,4 @@ - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + android:summary="@string/settings_show_lyrics_summary" + android:title="@string/settings_show_lyrics_title" /> + android:summary="@string/settings_shake_to_play_summary" + android:title="@string/settings_shake_to_play" /> + android:summary="@string/settings_lockscreen_album_art_summary" + android:title="@string/settings_lockscreen_album_art" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java index c1963fb1..02c12952 100644 --- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java +++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java @@ -24,6 +24,7 @@ import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; import android.view.MenuItem; +import org.lineageos.eleven.BuildConfig; import org.lineageos.eleven.R; import org.lineageos.eleven.cache.ImageFetcher; import org.lineageos.eleven.utils.MusicUtils; @@ -35,7 +36,9 @@ import org.lineageos.eleven.utils.PreferenceUtils; * @author Andrew Neal (andrewdneal@gmail.com) */ @SuppressWarnings("deprecation") -public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener{ +public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener { + + private final static String BUILD_VERION = "build_version"; /** * {@inheritDoc} @@ -54,6 +57,9 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref deleteCache(); PreferenceUtils.getInstance(this).setOnSharedPreferenceChangeListener(this); + + findPreference(BUILD_VERION).setSummary(BuildConfig.VERSION_NAME); + } /** @@ -81,19 +87,19 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref @Override public boolean onPreferenceClick(final Preference preference) { new AlertDialog.Builder(SettingsActivity.this).setMessage(R.string.delete_warning) - .setPositiveButton(android.R.string.ok, new OnClickListener() { - @Override - public void onClick(final DialogInterface dialog, final int which) { - ImageFetcher.getInstance(SettingsActivity.this).clearCaches(); - } - }) - .setNegativeButton(R.string.cancel, new OnClickListener() { - @Override - public void onClick(final DialogInterface dialog, final int which) { - dialog.dismiss(); - } - }) - .create().show(); + .setPositiveButton(android.R.string.ok, new OnClickListener() { + @Override + public void onClick(final DialogInterface dialog, final int which) { + ImageFetcher.getInstance(SettingsActivity.this).clearCaches(); + } + }) + .setNegativeButton(R.string.cancel, new OnClickListener() { + @Override + public void onClick(final DialogInterface dialog, final int which) { + dialog.dismiss(); + } + }) + .create().show(); return true; } }); @@ -101,11 +107,12 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, - String key) { + String key) { if (key.equals(PreferenceUtils.SHOW_VISUALIZER) && sharedPreferences.getBoolean(key, false) && !PreferenceUtils.canRecordAudio(this)) { PreferenceUtils.requestRecordAudio(this); - } if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) { + } + if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) { MusicUtils.setShakeToPlayEnabled(sharedPreferences.getBoolean(key, false)); } else if (key.equals(PreferenceUtils.SHOW_ALBUM_ART_ON_LOCKSCREEN)) { MusicUtils.setShowAlbumArtOnLockscreen(sharedPreferences.getBoolean(key, true)); -- GitLab