From 81ead929b3e222d1fd3ddf142f3485a4cb719dce Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications Date: Tue, 30 Jul 2024 20:58:18 +0530 Subject: [PATCH 01/13] Add `Hide icon from launcher` option --- .../org/microg/gms/settings/SettingsContract.kt | 2 ++ .../org/microg/gms/settings/SettingsProvider.kt | 11 +++++++++++ .../src/main/kotlin/org/microg/gms/ui/Utils.kt | 12 ++++++++++++ .../main/res/drawable/ic_hide_launcher_icon.xml | 17 +++++++++++++++++ play-services-core/src/main/AndroidManifest.xml | 4 +++- .../microg/gms/auth/login/LoginActivity.java | 2 ++ .../microg/gms/checkin/CheckinPreferences.kt | 6 ++++++ .../org/microg/gms/ui/SettingsFragment.kt | 10 ++++++++++ .../src/main/res/values/strings.xml | 1 + .../src/main/res/xml/preferences_start.xml | 5 +++++ 10 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 play-services-base/core/src/main/res/drawable/ic_hide_launcher_icon.xml 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 index 69fdb357c4..23c6079ade 100644 --- 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,6 +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" val PROJECTION = arrayOf( ENABLED, @@ -43,6 +44,7 @@ object SettingsContract { SECURITY_TOKEN, VERSION_INFO, DEVICE_DATA_VERSION_INFO, + HIDE_LAUNCHER_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 index ea8fe5417f..a1198ddaab 100644 --- 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,6 +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) else -> throw IllegalArgumentException() } } @@ -134,6 +135,10 @@ class SettingsProvider : ContentProvider() { // special case: not saved in checkInPrefs updateCheckInEnabled(value as Boolean) } + if (key == CheckIn.HIDE_LAUNCHER_ICON) { + // special case: not saved in checkInPrefs + updateHideLauncherIcon(value as Boolean) + } when (key) { CheckIn.ANDROID_ID -> editor.putLong(key, value as Long) CheckIn.DIGEST -> editor.putString(key, value as String?) @@ -152,6 +157,12 @@ class SettingsProvider : ContentProvider() { .apply() } + private fun updateHideLauncherIcon(enabled: Boolean) { + preferences.edit() + .putBoolean(CheckIn.HIDE_LAUNCHER_ICON, enabled) + .apply() + } + private fun queryGcm(p: Array): Cursor = MatrixCursor(p).addRow(p) { key -> when (key) { Gcm.ENABLE_GCM -> getSettingsBoolean(key, false) 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 index d97e233f26..9a5b9cfc38 100644 --- 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 @@ -5,6 +5,7 @@ package org.microg.gms.ui +import android.content.ComponentName import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageManager @@ -45,6 +46,17 @@ fun NavController.navigate(context: Context, @IdRes resId: Int, args: Bundle? = } else null) } +fun Context.hideIcon(hide: Boolean) { + packageManager.setComponentEnabledSetting( + ComponentName.createRelative(this, "org.microg.gms.ui.SettingsActivity"), + when (hide) { + true -> PackageManager.COMPONENT_ENABLED_STATE_DISABLED + false -> PackageManager.COMPONENT_ENABLED_STATE_ENABLED + }, + PackageManager.DONT_KILL_APP + ) +} + val Context.systemAnimationsEnabled: Boolean get() { val duration: Float diff --git a/play-services-base/core/src/main/res/drawable/ic_hide_launcher_icon.xml b/play-services-base/core/src/main/res/drawable/ic_hide_launcher_icon.xml new file mode 100644 index 0000000000..99c6888e68 --- /dev/null +++ b/play-services-base/core/src/main/res/drawable/ic_hide_launcher_icon.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 2ccf69c711..9bd720873d 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -600,7 +600,9 @@ android:label="@string/gms_settings_name" android:process=":ui" android:roundIcon="@mipmap/ic_app_settings" - android:taskAffinity="org.microg.gms.settings"> + android:taskAffinity="org.microg.gms.settings" + android:enabled="false" + android:exported="true"> (SettingsContract.CheckIn.HIDE_LAUNCHER_ICON)!!.apply { + setOnPreferenceChangeListener { _, newValue -> + requireActivity().hideIcon(newValue as Boolean) + true + } + + } for (entry in getAllSettingsProviders(requireContext()).flatMap { it.getEntriesStatic(requireContext()) }) { entry.createPreference() diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index bbe47e70a9..3ff1430560 100644 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -171,6 +171,7 @@ This can take a couple of minutes." About microG Services Version information and used libraries + Hide icon from launcher Error unregistering No longer installed diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 8f71c018f9..654bafbbe2 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -65,6 +65,11 @@ android:title="@string/service_name_location"/> + Date: Tue, 30 Jul 2024 22:16:19 +0530 Subject: [PATCH 02/13] improve naming --- .../kotlin/org/microg/gms/settings/SettingsContract.kt | 4 ++-- .../kotlin/org/microg/gms/settings/SettingsProvider.kt | 10 +++++----- .../core/src/main/kotlin/org/microg/gms/ui/Utils.kt | 2 +- ...{ic_hide_launcher_icon.xml => ic_hide_app_icon.xml} | 0 .../java/org/microg/gms/auth/login/LoginActivity.java | 2 +- .../org/microg/gms/checkin/CheckinPreferences.kt | 4 ++-- .../main/kotlin/org/microg/gms/ui/SettingsFragment.kt | 6 +++--- play-services-core/src/main/res/values/strings.xml | 3 ++- .../src/main/res/xml/preferences_start.xml | 6 +++--- 9 files changed, 19 insertions(+), 18 deletions(-) rename play-services-base/core/src/main/res/drawable/{ic_hide_launcher_icon.xml => ic_hide_app_icon.xml} (100%) 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 index 23c6079ade..eea4efcbbf 100644 --- 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 index a1198ddaab..0b271d2eb5 100644 --- 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 index 9a5b9cfc38..a0ecd88e1e 100644 --- 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/play-services-base/core/src/main/res/drawable/ic_hide_launcher_icon.xml b/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml similarity index 100% rename from play-services-base/core/src/main/res/drawable/ic_hide_launcher_icon.xml rename to play-services-base/core/src/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 index 402e6eb257..e5e6434956 100644 --- 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 index 83092620be..701e71041a 100644 --- 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 index e303a68d26..682f533ce4 100644 --- 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(SettingsContract.CheckIn.HIDE_LAUNCHER_ICON)!!.apply { + + findPreference(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 index 3ff1430560..ecceb5b4dc 100644 --- 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." About microG Services Version information and used libraries - Hide icon from launcher + Hide app icon + Hides app icon from the launcher Error unregistering No longer installed diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 654bafbbe2..6f58794578 100644 --- 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 @@ Date: Thu, 1 Aug 2024 12:38:18 +0530 Subject: [PATCH 03/13] refactor preferences_start.xml for hide icon --- play-services-core/src/main/res/xml/preferences_start.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 6f58794578..e9f0dc1894 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -66,10 +66,11 @@ + android:key="hideAppIcon" + android:title="@string/pref_hide_app_icon_title" + app:summary="@string/pref_hide_app_icon_summary" /> Date: Thu, 1 Aug 2024 14:03:56 +0530 Subject: [PATCH 04/13] refactor: Hide app icon --- .../kotlin/org/microg/gms/settings/SettingsProvider.kt | 2 +- play-services-core/src/main/AndroidManifest.xml | 8 ++++---- .../src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt | 5 +++-- play-services-core/src/main/res/values/strings.xml | 4 ++-- play-services-core/src/main/res/xml/preferences_start.xml | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) 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 index 0b271d2eb5..1bca41c83b 100644 --- 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_APP_ICON -> getSettingsBoolean(key, true) + CheckIn.HIDE_APP_ICON -> getSettingsBoolean(key, false) else -> throw IllegalArgumentException() } } diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 9bd720873d..15c1c27a04 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -600,9 +600,7 @@ android:label="@string/gms_settings_name" android:process=":ui" android:roundIcon="@mipmap/ic_app_settings" - android:taskAffinity="org.microg.gms.settings" - android:enabled="false" - android:exported="true"> + android:taskAffinity="org.microg.gms.settings"> + android:taskAffinity="org.microg.gms.settings" + android:enabled="false" + android:exported="true"> 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 index 682f533ce4..eac5ed9c4f 100644 --- 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 @@ -11,13 +11,13 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.preference.Preference import androidx.preference.PreferenceCategory +import androidx.preference.SwitchPreferenceCompat import com.google.android.gms.R import org.microg.gms.checkin.CheckinPreferences import org.microg.gms.gcm.GcmDatabase import org.microg.gms.gcm.GcmPrefs -import org.microg.gms.vending.VendingPreferences import org.microg.gms.safetynet.SafetyNetPreferences -import androidx.preference.SwitchPreferenceCompat +import org.microg.gms.settings.SettingsContract import org.microg.gms.ui.settings.SettingsProvider import org.microg.gms.ui.settings.getAllSettingsProviders import org.microg.gms.vending.VendingPreferences @@ -139,6 +139,7 @@ class SettingsFragment : ResourceSettingsFragment() { companion object { const val PREF_ABOUT = "pref_about" + const val PREF_HIDE_APP_ICON = "pref_hide_app_icon" const val PREF_GCM = "pref_gcm" const val PREF_SNET = "pref_snet" const val PREF_LOCATION = "pref_location" diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index ecceb5b4dc..e08e8d1c89 100644 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -169,10 +169,10 @@ This can take a couple of minutes." Ask before registering a new app to receive push notifications Ping interval: %1$s - About microG Services - Version information and used libraries Hide app icon Hides app icon from the launcher + About microG Services + Version information and used libraries Error unregistering No longer installed diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index e9f0dc1894..a03956b08a 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -68,7 +68,7 @@ Date: Thu, 1 Aug 2024 15:07:27 +0530 Subject: [PATCH 05/13] remove unnecessary change --- .../src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt | 1 - 1 file changed, 1 deletion(-) 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 index eac5ed9c4f..17c74d0cf8 100644 --- 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 @@ -139,7 +139,6 @@ class SettingsFragment : ResourceSettingsFragment() { companion object { const val PREF_ABOUT = "pref_about" - const val PREF_HIDE_APP_ICON = "pref_hide_app_icon" const val PREF_GCM = "pref_gcm" const val PREF_SNET = "pref_snet" const val PREF_LOCATION = "pref_location" From 2f64e6236b49151fbea3f49d841dee511d65a10d Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications Date: Fri, 2 Aug 2024 19:02:10 +0530 Subject: [PATCH 06/13] improve code clarity and maintainability --- .../core/src/main/kotlin/org/microg/gms/ui/Utils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index a0ecd88e1e..974963b54e 100644 --- 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 @@ -47,8 +47,9 @@ fun NavController.navigate(context: Context, @IdRes resId: Int, args: Bundle? = } fun Context.hideAppIcon(hide: Boolean) { + val componentName = ComponentName("org.microg.gms.ui", "org.microg.gms.ui.SettingsActivity") packageManager.setComponentEnabledSetting( - ComponentName.createRelative(this, "org.microg.gms.ui.SettingsActivity"), + componentName, when (hide) { true -> PackageManager.COMPONENT_ENABLED_STATE_DISABLED false -> PackageManager.COMPONENT_ENABLED_STATE_ENABLED From 27488e0dab99a4a8e1d518b97649d534901b167f Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications Date: Sat, 3 Aug 2024 02:30:27 +0530 Subject: [PATCH 07/13] fix icon color --- .../core/src/main/res/drawable/ic_hide_app_icon.xml | 4 ++-- play-services-core/src/main/res/xml/preferences_start.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml b/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml index 99c6888e68..6487c63cb5 100644 --- a/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml +++ b/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml @@ -10,8 +10,8 @@ android:height="24dp" android:viewportWidth="48" android:viewportHeight="48" - android:tint="?attr/colorAccent"> + android:tint="?attr/colorControlNormal"> + android:pathData="M39.6,43.85 L35.9,40.2Q33.4,42 30.4,43Q27.4,44 24,44Q19.75,44 16.1,42.475Q12.45,40.95 9.75,38.25Q7.05,35.55 5.525,31.9Q4,28.25 4,24Q4,20.6 5,17.6Q6,14.6 7.8,12.1L4.1,8.4Q3.65,7.95 3.675,7.35Q3.7,6.75 4.15,6.3Q4.6,5.85 5.225,5.85Q5.85,5.85 6.3,6.3L41.75,41.75Q42.2,42.2 42.2,42.8Q42.2,43.4 41.75,43.85Q41.3,44.3 40.675,44.3Q40.05,44.3 39.6,43.85ZM24,41Q26.75,41 29.2,40.225Q31.65,39.45 33.75,38.05L9.95,14.25Q8.55,16.35 7.775,18.8Q7,21.25 7,24Q7,31.25 11.875,36.125Q16.75,41 24,41ZM40.2,35.9 L38.05,33.75Q39.45,31.65 40.225,29.2Q41,26.75 41,24Q41,16.75 36.125,11.875Q31.25,7 24,7Q21.25,7 18.8,7.775Q16.35,8.55 14.25,9.95L12.1,7.8Q14.6,6 17.6,5Q20.6,4 24,4Q28.2,4 31.85,5.55Q35.5,7.1 38.2,9.8Q40.9,12.5 42.45,16.15Q44,19.8 44,24Q44,27.4 43,30.4Q42,33.4 40.2,35.9ZM26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85Q26.15,21.85 26.15,21.85ZM21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Q21.85,26.15 21.85,26.15Z" /> \ No newline at end of file diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index a03956b08a..88f25a82e6 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -69,11 +69,11 @@ android:defaultValue="false" android:icon="@drawable/ic_hide_app_icon" android:key="pref_hide_app_icon" - android:title="@string/pref_hide_app_icon_title" - app:summary="@string/pref_hide_app_icon_summary" /> + android:summary="@string/pref_hide_app_icon_summary" + android:title="@string/pref_hide_app_icon_title" /> - + \ No newline at end of file From 7ea14edc615a5233c8b793b8238321ba1bf8d957 Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications Date: Sat, 3 Aug 2024 13:46:09 +0530 Subject: [PATCH 08/13] adjust icon thickness --- .../core/src/main/res/drawable/ic_hide_app_icon.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml b/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml index 6487c63cb5..87e132f89b 100644 --- a/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml +++ b/play-services-base/core/src/main/res/drawable/ic_hide_app_icon.xml @@ -13,5 +13,7 @@ android:tint="?attr/colorControlNormal"> \ No newline at end of file From cdefa137fc27f72fff2a59f1cbc597bd6969e89c Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications Date: Sun, 4 Aug 2024 01:13:07 +0530 Subject: [PATCH 09/13] improve naming --- .../main/kotlin/org/microg/gms/settings/SettingsProvider.kt | 4 ++-- .../main/kotlin/org/microg/gms/checkin/CheckinPreferences.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 index 1bca41c83b..629f2e70ca 100644 --- 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 @@ -157,9 +157,9 @@ class SettingsProvider : ContentProvider() { .apply() } - private fun updateHideAppIcon(enabled: Boolean) { + private fun updateHideAppIcon(hide: Boolean) { preferences.edit() - .putBoolean(CheckIn.HIDE_APP_ICON, enabled) + .putBoolean(CheckIn.HIDE_APP_ICON, hide) .apply() } 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 index 701e71041a..1d3a0c9b01 100644 --- 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 hideAppIcon(context: Context, enabled: Boolean) { + fun hideAppIcon(context: Context, hide: Boolean) { SettingsContract.setSettings(context, CheckIn.getContentUri(context)) { - put(CheckIn.HIDE_APP_ICON, enabled) + put(CheckIn.HIDE_APP_ICON, hide) } } From 3094aff1c6c6142b612a16ba79936e5849100db2 Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications Date: Mon, 5 Aug 2024 01:19:37 +0530 Subject: [PATCH 10/13] change key value --- play-services-core/src/main/res/xml/preferences_start.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 88f25a82e6..d93475607b 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -68,7 +68,7 @@ Date: Thu, 3 Oct 2024 00:02:41 +0530 Subject: [PATCH 11/13] change state to true --- play-services-core/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 15c1c27a04..d36bf2eb1e 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -630,7 +630,7 @@ android:process=":ui" android:targetActivity="org.microg.gms.ui.MainSettingsActivity" android:taskAffinity="org.microg.gms.settings" - android:enabled="false" + android:enabled="true" android:exported="true"> From ddacc9c979a2be287501be664bd927e8686917ec Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications <117499019+ILoveOpenSourceApplications@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:41:01 +0530 Subject: [PATCH 12/13] remove unnecessary import --- .../src/main/java/org/microg/gms/auth/login/LoginActivity.java | 1 - 1 file changed, 1 deletion(-) 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 index e5e6434956..81c34340d3 100644 --- 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,6 @@ 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.hideAppIcon; import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; import static org.microg.gms.common.Constants.GMS_VERSION_CODE; From c1060b1deca633b4ffecbe374a1311a8a957cbe8 Mon Sep 17 00:00:00 2001 From: ILoveOpenSourceApplications <117499019+ILoveOpenSourceApplications@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:49:02 +0530 Subject: [PATCH 13/13] Revert "change key value" This reverts commit 3094aff1c6c6142b612a16ba79936e5849100db2. --- play-services-core/src/main/res/xml/preferences_start.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index d93475607b..88f25a82e6 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -68,7 +68,7 @@