improve naming

microg · Jul 30, 2024 · 39c349b · 39c349b
1 parent 81ead92
commit 39c349b
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt
@@ -34,7 +34,7 @@ object SettingsContract {
         const val SECURITY_TOKEN = "securityToken"
         const val VERSION_INFO = "versionInfo"
         const val DEVICE_DATA_VERSION_INFO = "deviceDataVersionInfo"
-        const val HIDE_LAUNCHER_ICON = "hideLauncherIcon"
+        const val HIDE_APP_ICON = "hideAppIcon"
 
         val PROJECTION = arrayOf(
             ENABLED,
@@ -44,7 +44,7 @@ object SettingsContract {
             SECURITY_TOKEN,
             VERSION_INFO,
             DEVICE_DATA_VERSION_INFO,
-            HIDE_LAUNCHER_ICON,
+            HIDE_APP_ICON,
         )
         const val PREFERENCES_NAME = "checkin"
         const val INITIAL_DIGEST = "1-929a0dca0eee55513280171a8585da7dcd3700f8"

diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt
@@ -117,7 +117,7 @@ class SettingsProvider : ContentProvider() {
             CheckIn.SECURITY_TOKEN -> checkInPrefs.getLong(key, 0)
             CheckIn.VERSION_INFO -> checkInPrefs.getString(key, "") ?: ""
             CheckIn.DEVICE_DATA_VERSION_INFO -> checkInPrefs.getString(key, "") ?: ""
-            CheckIn.HIDE_LAUNCHER_ICON -> getSettingsBoolean(key, true)
+            CheckIn.HIDE_APP_ICON -> getSettingsBoolean(key, true)
             else -> throw IllegalArgumentException()
         }
     }
@@ -135,9 +135,9 @@ class SettingsProvider : ContentProvider() {
                 // special case: not saved in checkInPrefs
                 updateCheckInEnabled(value as Boolean)
             }
-            if (key == CheckIn.HIDE_LAUNCHER_ICON) {
+            if (key == CheckIn.HIDE_APP_ICON) {
                 // special case: not saved in checkInPrefs
-                updateHideLauncherIcon(value as Boolean)
+                updateHideAppIcon(value as Boolean)
             }
             when (key) {
                 CheckIn.ANDROID_ID -> editor.putLong(key, value as Long)
@@ -157,9 +157,9 @@ class SettingsProvider : ContentProvider() {
             .apply()
     }
 
-    private fun updateHideLauncherIcon(enabled: Boolean) {
+    private fun updateHideAppIcon(enabled: Boolean) {
         preferences.edit()
-            .putBoolean(CheckIn.HIDE_LAUNCHER_ICON, enabled)
+            .putBoolean(CheckIn.HIDE_APP_ICON, enabled)
             .apply()
     }
 

diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/ui/Utils.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/ui/Utils.kt
@@ -46,7 +46,7 @@ fun NavController.navigate(context: Context, @IdRes resId: Int, args: Bundle? =
     } else null)
 }
 
-fun Context.hideIcon(hide: Boolean) {
+fun Context.hideAppIcon(hide: Boolean) {
     packageManager.setComponentEnabledSetting(
         ComponentName.createRelative(this, "org.microg.gms.ui.SettingsActivity"),
         when (hide) {

diff --git a/...in/res/drawable/ic_hide_launcher_icon.xml → ...rc/main/res/drawable/ic_hide_app_icon.xml b/...in/res/drawable/ic_hide_launcher_icon.xml → ...rc/main/res/drawable/ic_hide_app_icon.xml
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -76,7 +76,7 @@
 import static android.view.View.VISIBLE;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 import static org.microg.gms.auth.AuthPrefs.isAuthVisible;
-import static org.microg.gms.checkin.CheckinPreferences.hideLauncherIcon;
+import static org.microg.gms.checkin.CheckinPreferences.hideAppIcon;
 import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME;
 import static org.microg.gms.common.Constants.GMS_VERSION_CODE;
 

diff --git a/play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPreferences.kt b/play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPreferences.kt
@@ -29,9 +29,9 @@ object CheckinPreferences {
         }
     }
     @JvmStatic
-    fun hideLauncherIcon(context: Context, enabled: Boolean) {
+    fun hideAppIcon(context: Context, enabled: Boolean) {
         SettingsContract.setSettings(context, CheckIn.getContentUri(context)) {
-            put(CheckIn.HIDE_LAUNCHER_ICON, enabled)
+            put(CheckIn.HIDE_APP_ICON, enabled)
         }
     }
 

diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
@@ -61,10 +61,10 @@ class SettingsFragment : ResourceSettingsFragment() {
             }
             summary = getString(org.microg.tools.ui.R.string.about_version_str, AboutFragment.getSelfVersion(context))
         }
-        
-        findPreference<SwitchPreferenceCompat>(SettingsContract.CheckIn.HIDE_LAUNCHER_ICON)!!.apply {
+
+        findPreference<SwitchPreferenceCompat>(SettingsContract.CheckIn.HIDE_APP_ICON)!!.apply {
             setOnPreferenceChangeListener { _, newValue ->
-                requireActivity().hideIcon(newValue as Boolean)
+                requireActivity().hideAppIcon(newValue as Boolean)
                 true
             }
 

diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
@@ -171,7 +171,8 @@ This can take a couple of minutes."</string>
 
     <string name="pref_about_title">About microG Services</string>
     <string name="pref_about_summary">Version information and used libraries</string>
-    <string name="pref_hide_launcher_icon">Hide icon from launcher</string>
+    <string name="pref_hide_app_icon_title">Hide app icon</string>
+    <string name="pref_hide_app_icon_summary">Hides app icon from the launcher</string>
 
     <string name="gcm_app_error_unregistering">Error unregistering</string>
     <string name="gcm_app_not_installed_anymore">No longer installed</string>

diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -66,9 +66,9 @@
     </PreferenceCategory>
     <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="prefcat_footer">
         <SwitchPreferenceCompat
-            android:key="hideLauncherIcon"
-            android:title="@string/pref_hide_launcher_icon"
-            android:icon="@drawable/ic_hide_launcher_icon"
+            android:key="hideAppIcon"
+            android:title="@string/pref_hide_app_icon"
+            android:icon="@drawable/ic_hide_app_icon"
             android:defaultValue="false"/>
         <Preference
             android:icon="@drawable/ic_info_outline"