From 8643fbd05b63d34a6bd72f68ed6227c0d6d7d233 Mon Sep 17 00:00:00 2001 From: Mohit Date: Fri, 6 Mar 2020 16:22:44 +0530 Subject: [PATCH 1/3] Add About Content --- res/values/strings.xml | 13 ++++ res/xml/settings.xml | 65 +++++++++++++++++++ .../ui/activities/SettingsActivity.java | 7 ++ 3 files changed, 85 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7e96954e..2de571ee 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -207,4 +207,17 @@ All \"%s\" playlists %1$s %2$s + + 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..c3ad0e31 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -75,4 +75,69 @@ android:summary="@string/settings_delete_cache_summary" android:title="@string/settings_delete_cache_title" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java index cf33054c..400b2a48 100644 --- a/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java +++ b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java @@ -30,6 +30,8 @@ import com.cyanogenmod.eleven.cache.ImageFetcher; import com.cyanogenmod.eleven.utils.MusicUtils; import com.cyanogenmod.eleven.utils.PreferenceUtils; +import org.lineageos.eleven.BuildConfig; + /** * Settings. * @@ -38,6 +40,8 @@ import com.cyanogenmod.eleven.utils.PreferenceUtils; @SuppressWarnings("deprecation") public class SettingsActivity extends PreferenceActivity implements OnSharedPreferenceChangeListener{ + private final static String BUILD_VERSION = "build_version"; + /** * {@inheritDoc} */ @@ -57,6 +61,9 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref deleteCache(); PreferenceUtils.getInstance(this).setOnSharedPreferenceChangeListener(this); + + findPreference(BUILD_VERSION).setSummary(BuildConfig.VERSION_NAME); + } /** -- GitLab From 5e83cb91b324b24e0ae17bdaff9c5a94e100784e Mon Sep 17 00:00:00 2001 From: Mohit Date: Tue, 24 Mar 2020 13:34:26 +0530 Subject: [PATCH 2/3] - Fixed Build Error --- .../ui/activities/SettingsActivity.java | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java index 400b2a48..57f02bff 100644 --- a/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java +++ b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java @@ -21,6 +21,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; +import android.content.pm.PackageManager; import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.view.MenuItem; @@ -38,7 +39,7 @@ import org.lineageos.eleven.BuildConfig; * @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_VERSION = "build_version"; @@ -62,7 +63,12 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref PreferenceUtils.getInstance(this).setOnSharedPreferenceChangeListener(this); - findPreference(BUILD_VERSION).setSummary(BuildConfig.VERSION_NAME); + try { + String versionName = getPackageManager().getPackageInfo(getPackageName(), 0).versionName; + findPreference(BUILD_VERSION).setSummary(versionName); + } catch (PackageManager.NameNotFoundException e) { + } + } @@ -91,19 +97,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; } }); @@ -111,11 +117,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 From 835f6a9f6f0562e342bf5ecdf26632ab22c318f8 Mon Sep 17 00:00:00 2001 From: Mohit Date: Tue, 24 Mar 2020 15:40:34 +0530 Subject: [PATCH 3/3] - Fixed Build Error --- src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java index 57f02bff..cf01d36b 100644 --- a/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java +++ b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java @@ -31,7 +31,6 @@ import com.cyanogenmod.eleven.cache.ImageFetcher; import com.cyanogenmod.eleven.utils.MusicUtils; import com.cyanogenmod.eleven.utils.PreferenceUtils; -import org.lineageos.eleven.BuildConfig; /** * Settings. -- GitLab