Organize code

WSTxda · Sep 16, 2024 · 8245007 · 8245007
1 parent 5ad6198
commit 8245007
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 32 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,10 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:enableOnBackInvokedCallback="true"
         android:theme="@style/AppTheme"
         tools:targetApi="tiramisu">
 
@@ -36,13 +36,13 @@
         </activity-alias>
 
         <activity
-            android:name="com.wstxda.gsl.WeatherActivity"
+            android:name="com.wstxda.gsl.shortcut.WeatherActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
+            android:finishOnTaskLaunch="true"
             android:icon="@mipmap/ic_launcher_weather"
             android:label="@string/weather"
             android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
             android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -51,13 +51,13 @@
         </activity>
 
         <activity
-            android:name="com.wstxda.gsl.AssistantActivity"
+            android:name="com.wstxda.gsl.shortcut.AssistantActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
+            android:finishOnTaskLaunch="true"
             android:icon="@mipmap/ic_launcher_assistant"
             android:label="@string/assistant"
             android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
             android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -66,13 +66,13 @@
         </activity>
 
         <activity
-            android:name="com.wstxda.gsl.PasswordManagerActivity"
+            android:name="com.wstxda.gsl.shortcut.PasswordManagerActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
+            android:finishOnTaskLaunch="true"
             android:icon="@mipmap/ic_launcher_password"
             android:label="@string/password"
             android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
             android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -81,14 +81,14 @@
         </activity>
 
         <activity
-            android:name="com.wstxda.gsl.GameActivity"
-            android:exported="true"
+            android:name="com.wstxda.gsl.shortcut.GameActivity"
             android:enableOnBackInvokedCallback="true"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:finishOnTaskLaunch="true"
             android:icon="@mipmap/ic_launcher_game"
             android:label="@string/games"
             android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
             android:theme="@style/Theme.Transparent"
             tools:targetApi="tiramisu">
             <intent-filter>
@@ -102,13 +102,13 @@
         </activity>
 
         <activity
-            android:name="com.wstxda.gsl.MusicSearchActivity"
+            android:name="com.wstxda.gsl.shortcut.MusicSearchActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
+            android:finishOnTaskLaunch="true"
             android:icon="@mipmap/ic_launcher_music"
             android:label="@string/music_search"
             android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"
             android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/.../wstxda/gsl/SettingsPreferenceFragment.kt → ...stxda/gsl/fragment/PreferencesFragment.kt b/.../wstxda/gsl/SettingsPreferenceFragment.kt → ...stxda/gsl/fragment/PreferencesFragment.kt
@@ -1,4 +1,4 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.fragment
 
 import android.content.ComponentName
 import android.content.Intent
@@ -9,6 +9,13 @@ import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
+import com.wstxda.gsl.shortcut.AssistantActivity
+import com.wstxda.gsl.shortcut.GameActivity
+import com.wstxda.gsl.shortcut.MusicSearchActivity
+import com.wstxda.gsl.shortcut.PasswordManagerActivity
+import com.wstxda.gsl.R
+import com.wstxda.gsl.SettingsActivity
+import com.wstxda.gsl.shortcut.WeatherActivity
 
 class SettingsPreferenceFragment : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

diff --git a/.../java/com/wstxda/gsl/AssistantActivity.kt → .../wstxda/gsl/shortcut/AssistantActivity.kt b/.../java/com/wstxda/gsl/AssistantActivity.kt → .../wstxda/gsl/shortcut/AssistantActivity.kt
@@ -1,4 +1,4 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.shortcut
 
 import android.app.Activity
 import android.content.ActivityNotFoundException

diff --git a/.../main/java/com/wstxda/gsl/GameActivity.kt → ...a/com/wstxda/gsl/shortcut/GameActivity.kt b/.../main/java/com/wstxda/gsl/GameActivity.kt → ...a/com/wstxda/gsl/shortcut/GameActivity.kt
@@ -1,4 +1,4 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.shortcut
 
 import android.content.ActivityNotFoundException
 import android.content.ComponentName
@@ -9,6 +9,8 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.wstxda.gsl.shortcut.utils.GamePackagesBrands
+import com.wstxda.gsl.R
 
 class GameActivity : AppCompatActivity() {
 
@@ -39,7 +41,7 @@ class GameActivity : AppCompatActivity() {
         val useGameManager = sharedPreferences.getBoolean(GAME_MANAGER_PREF_KEY, false)
 
         if (useGameManager) {
-            val gameManager = GameManagerBrands(this)
+            val gameManager = GamePackagesBrands(this)
             if (!gameManager.launchGameManager()) {
                 showGameManagerNotFoundMessage()
             }

diff --git a/...ava/com/wstxda/gsl/MusicSearchActivity.kt → ...stxda/gsl/shortcut/MusicSearchActivity.kt b/...ava/com/wstxda/gsl/MusicSearchActivity.kt → ...stxda/gsl/shortcut/MusicSearchActivity.kt
@@ -1,10 +1,11 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.shortcut
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
+import com.wstxda.gsl.R
 
 class MusicSearchActivity : Activity() {
 

diff --git a/...com/wstxda/gsl/PasswordManagerActivity.kt → ...a/gsl/shortcut/PasswordManagerActivity.kt b/...com/wstxda/gsl/PasswordManagerActivity.kt → ...a/gsl/shortcut/PasswordManagerActivity.kt
@@ -1,4 +1,4 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.shortcut
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -8,6 +8,7 @@ import android.os.Bundle
 import androidx.preference.PreferenceManager
 import android.widget.Toast
 import androidx.annotation.StringRes
+import com.wstxda.gsl.R
 
 class PasswordManagerActivity : Activity() {
 

diff --git a/...in/java/com/wstxda/gsl/WeatherActivity.kt → ...om/wstxda/gsl/shortcut/WeatherActivity.kt b/...in/java/com/wstxda/gsl/WeatherActivity.kt → ...om/wstxda/gsl/shortcut/WeatherActivity.kt
@@ -1,11 +1,12 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.shortcut
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.ComponentName
 import android.content.Intent
 import android.net.Uri
 import android.widget.Toast
+import com.wstxda.gsl.R
 
 class WeatherActivity : Activity() {
 

diff --git a/.../java/com/wstxda/gsl/GameManagerBrands.kt → .../gsl/shortcut/utils/GamePackagesBrands.kt b/.../java/com/wstxda/gsl/GameManagerBrands.kt → .../gsl/shortcut/utils/GamePackagesBrands.kt
@@ -1,11 +1,11 @@
-package com.wstxda.gsl
+package com.wstxda.gsl.shortcut.utils
 
 import android.content.ActivityNotFoundException
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 
-class GameManagerBrands(private val context: Context) {
+class GamePackagesBrands(private val context: Context) {
 
     private val gameManagerIntents = listOf(
 

diff --git a/...res/layout/preference_app_icon_switch.xml → ...es/layout/preference_shortcuts_switch.xml b/...res/layout/preference_app_icon_switch.xml → ...es/layout/preference_shortcuts_switch.xml
diff --git a/app/src/main/res/navigation/nav_settings.xml b/app/src/main/res/navigation/nav_settings.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/settingsPreferenceFragment"
-        android:name="com.wstxda.gsl.SettingsPreferenceFragment"
+        android:name="com.wstxda.gsl.fragment.SettingsPreferenceFragment"
         android:label="@string/app_settings"
         tools:layout="@layout/activity_settings" />
 </navigation>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -11,7 +11,7 @@
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_assistant"
         android:key="assistant_activity"
-        android:layout="@layout/preference_app_icon_switch"
+        android:layout="@layout/preference_shortcuts_switch"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
         android:title="@string/assistant"
@@ -21,7 +21,7 @@
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_weather"
         android:key="weather_activity"
-        android:layout="@layout/preference_app_icon_switch"
+        android:layout="@layout/preference_shortcuts_switch"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
         android:title="@string/weather"
@@ -31,7 +31,7 @@
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_password"
         android:key="password_manager_activity"
-        android:layout="@layout/preference_app_icon_switch"
+        android:layout="@layout/preference_shortcuts_switch"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
         android:title="@string/password"
@@ -41,7 +41,7 @@
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_game"
         android:key="game_activity"
-        android:layout="@layout/preference_app_icon_switch"
+        android:layout="@layout/preference_shortcuts_switch"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
         android:title="@string/games"
@@ -51,7 +51,7 @@
         android:defaultValue="true"
         android:icon="@mipmap/ic_launcher_music"
         android:key="music_search_activity"
-        android:layout="@layout/preference_app_icon_switch"
+        android:layout="@layout/preference_shortcuts_switch"
         android:summaryOff="@string/pref_shortcut_disabled"
         android:summaryOn="@string/pref_shortcut_enabled"
         android:title="@string/music_search_quick_settings"