From 8cdf818b538c93c989dd6d0c0e06d96a66118044 Mon Sep 17 00:00:00 2001 From: Mohit Date: Fri, 6 Mar 2020 16:13:07 +0530 Subject: [PATCH 1/2] Add About Content --- res/values/strings.xml | 13 ++++ res/xml/settings.xml | 65 +++++++++++++++++++ .../ui/activities/SettingsActivity.java | 39 ++++++----- 3 files changed, 101 insertions(+), 16 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 605dd8e9..a5feba94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -209,4 +209,17 @@ %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..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/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java index c1963fb1..871f6b27 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_VERSION = "build_version"; /** * {@inheritDoc} @@ -54,6 +57,9 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref deleteCache(); PreferenceUtils.getInstance(this).setOnSharedPreferenceChangeListener(this); + + findPreference(BUILD_VERSION).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 From 4c5c8d161a5aa8449b5cf7e350d50fef3333a0a3 Mon Sep 17 00:00:00 2001 From: Mohit Date: Tue, 24 Mar 2020 13:22:16 +0530 Subject: [PATCH 2/2] - Fixed Build Error --- .../lineageos/eleven/ui/activities/SettingsActivity.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java index 871f6b27..982922fb 100644 --- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java +++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java @@ -18,13 +18,13 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.Preference; 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; @@ -58,7 +58,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) { + } + } -- GitLab