Skip to content

Commit 5dcc88c

Browse files
WSTxdaWSTxda
committed
Code refactor
1 parent 9871b77 commit 5dcc88c

20 files changed

+72
-38
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools">
44

55
<!-- Used to check connection in OTA (UpdaterService.kt) implementation -->
6+
67
<uses-permission android:name="android.permission.INTERNET" />
78
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
89

@@ -19,6 +20,7 @@
1920
tools:targetApi="tiramisu">
2021

2122
<!-- Settings activity-->
23+
2224
<activity
2325
android:name="com.wstxda.gsl.activity.SettingsActivity"
2426
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
@@ -34,6 +36,7 @@
3436
</activity>
3537

3638
<!-- Settings activity for preferences actions -->
39+
3740
<activity-alias
3841
android:name="com.wstxda.gsl.activity.SettingsActivityLauncher"
3942
android:exported="false"
@@ -46,6 +49,7 @@
4649
</activity-alias>
4750

4851
<!-- Library activity for preferences -->
52+
4953
<activity
5054
android:name="com.wstxda.gsl.activity.LibraryActivity"
5155
android:configChanges="orientation|screenSize|keyboard|keyboardHidden"
@@ -61,6 +65,7 @@
6165
</activity>
6266

6367
<!-- Shortcuts activity's -->
68+
6469
<activity
6570
android:name="com.wstxda.gsl.shortcuts.AssistantShortcut"
6671
android:excludeFromRecents="true"
@@ -212,6 +217,7 @@
212217
</activity>
213218

214219
<!-- Digital assistant fallback service activity -->
220+
215221
<activity
216222
android:name="com.wstxda.gsl.services.AssistantFallbackService"
217223
android:excludeFromRecents="true"
@@ -225,6 +231,7 @@
225231
</activity>
226232

227233
<!-- Music search quick settings tile -->
234+
228235
<service
229236
android:name="com.wstxda.gsl.services.MusicSearchTileService"
230237
android:exported="true"

‎app/src/main/java/com/wstxda/gsl/fragments/preferences/DigitalAssistantPreference.kt‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@ import android.content.Context
44
import android.os.Build
55
import androidx.core.content.edit
66
import androidx.preference.PreferenceFragmentCompat
7-
import androidx.preference.PreferenceManager
7+
import com.wstxda.gsl.logic.PreferenceHelper
88
import com.wstxda.gsl.utils.Constants
99

1010
class DigitalAssistantPreference(private val fragment: PreferenceFragmentCompat) {
11-
private val prefs by lazy { PreferenceManager.getDefaultSharedPreferences(fragment.requireContext()) }
11+
12+
private val context: Context get() = fragment.requireContext()
13+
private val preferenceHelper by lazy { PreferenceHelper(context) }
1214

1315
fun checkDigitalAssistSetupStatus(): Boolean =
1416
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
15-
fragment.requireContext().getSystemService(android.app.role.RoleManager::class.java)
16-
.isRoleHeld(android.app.role.RoleManager.ROLE_ASSISTANT)
17+
context.getSystemService(android.app.role.RoleManager::class.java)
18+
?.isRoleHeld(android.app.role.RoleManager.ROLE_ASSISTANT) == true
1719
} else {
18-
prefs.getBoolean(Constants.IS_ASSIST_SETUP_DONE, false)
20+
preferenceHelper.getBoolean(Constants.IS_ASSIST_SETUP_DONE, false)
1921
}
2022

21-
fun setDigitalAssistSetupStatus(context: Context, isSetupDone: Boolean) {
22-
PreferenceManager.getDefaultSharedPreferences(context).edit {
23+
fun setDigitalAssistSetupStatus(isSetupDone: Boolean) {
24+
val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context)
25+
prefs.edit {
2326
putBoolean(Constants.IS_ASSIST_SETUP_DONE, isSetupDone)
2427
}
2528
}

‎app/src/main/java/com/wstxda/gsl/logic/RootChecker.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.wstxda.gsl.logic
22

33
import android.util.Log
4+
import kotlin.getOrElse
5+
import kotlin.runCatching
46

57
object RootChecker {
68
private const val TAG = "RootChecker"

‎app/src/main/java/com/wstxda/gsl/ui/DigitalAssistantSetupDialog.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.os.Bundle
77
import android.provider.Settings
88
import androidx.activity.result.ActivityResultLauncher
99
import androidx.fragment.app.DialogFragment
10+
import androidx.fragment.app.FragmentManager
1011
import androidx.preference.PreferenceFragmentCompat
1112
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1213
import com.wstxda.gsl.databinding.AssistantSetupDialogBinding
@@ -21,8 +22,8 @@ class DigitalAssistantSetupDialog : DialogFragment() {
2122

2223
companion object {
2324
fun show(
24-
fragmentManager: androidx.fragment.app.FragmentManager,
25-
launcher: ActivityResultLauncher<Intent>
25+
fragmentManager: FragmentManager,
26+
launcher: ActivityResultLauncher<Intent>,
2627
) {
2728
if (fragmentManager.findFragmentByTag(Constants.DIGITAL_ASSISTANT_DIALOG) != null) return
2829
DigitalAssistantSetupDialog().apply { this.launcher = launcher }
@@ -36,9 +37,7 @@ class DigitalAssistantSetupDialog : DialogFragment() {
3637
binding.positiveButton.setOnClickListener {
3738
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
3839
(parentFragment as? PreferenceFragmentCompat)?.let {
39-
DigitalAssistantPreference(it).setDigitalAssistSetupStatus(
40-
requireContext(), true
41-
)
40+
DigitalAssistantPreference(it).setDigitalAssistSetupStatus(true)
4241
}
4342
}
4443
runCatching {

‎app/src/main/java/com/wstxda/gsl/utils/Constants.kt‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,37 @@ import android.net.Uri
44
import androidx.core.net.toUri
55

66
object Constants {
7+
8+
// Preferences keys
9+
10+
const val MUSIC_SEARCH_TILE_KEY = "add_music_search_tile"
11+
712
const val DIGITAL_ASSISTANT_SETUP_PREF_KEY = "digital_assistant_setup"
813
const val DIGITAL_ASSISTANT_SHORTCUT_PREF_KEY = "digital_assistant_shortcut"
914
const val GAME_MANAGER_PREF_KEY = "device_game_manager"
1015
const val PASSWORD_MANAGER_ROOT_PREF_KEY = "password_manager_root"
1116
const val LIBRARY_PREF_KEY = "library"
1217
const val THEME_PREF_KEY = "select_theme"
1318

19+
// Theme values
20+
1421
const val THEME_SYSTEM = "system"
1522
const val THEME_LIGHT = "light"
1623
const val THEME_DARK = "dark"
1724

18-
const val MUSIC_SEARCH_TILE_KEY = "add_music_search_tile"
25+
// Dialog fragments
1926

2027
const val DIGITAL_ASSISTANT_DIALOG = "DigitalAssistantSetupDialog"
28+
29+
// Constants for preferences
30+
2131
const val IS_ASSIST_SETUP_DONE = "is_assist_setup_done"
2232

33+
// GitHub API releases URL
34+
2335
const val GITHUB_RELEASE_URL = "https://api.github.com/repos/WSTxda/Google-Shortcuts-Launcher/releases/latest"
2436

37+
// Files shortcut storage URI
38+
2539
val STORAGE_URI: Uri = "content://com.android.externalstorage.documents/root/primary".toUri()
2640
}

‎app/src/main/java/com/wstxda/gsl/utils/GamesBrandsPackages.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.wstxda.gsl.utils
22

33
object GamesBrandsPackages {
44
val gamesLaunchersIntents = listOf(
5+
56
// AOSP ROMs
67
"io.chaldeaprjkt.gamespace" to "io.chaldeaprjkt.gamespace.settings.SettingsActivity",
78

‎app/src/main/java/com/wstxda/gsl/utils/IncognitoBrowsersPackages.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.wstxda.gsl.utils
22

33
object IncognitoBrowsersPackages {
44
val incognitoLauncherIntents = listOf(
5+
56
// Google Chrome
67
"com.android.chrome" to "org.chromium.chrome.browser.incognito.IncognitoTabLauncher",
78
"com.chrome.canary" to "org.chromium.chrome.browser.incognito.IncognitoTabLauncher",

app/src/main/res/drawable/dialog_singlechoice_icon.xml renamed to app/src/main/res/drawable/ic_dialog_singlechoice.xml

File renamed without changes.

‎app/src/main/res/drawable/ic_license.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
android:width="24dp"
33
android:height="24dp"
4-
android:tint="?attr/colorControlNormal"
54
android:viewportWidth="960"
6-
android:viewportHeight="960">
5+
android:viewportHeight="960"
6+
android:tint="?attr/colorControlNormal">
77
<path
88
android:fillColor="@android:color/white"
9-
android:pathData="M480,520Q430,520 395,485Q360,450 360,400Q360,350 395,315Q430,280 480,280Q530,280 565,315Q600,350 600,400Q600,450 565,485Q530,520 480,520ZM240,920L240,611Q202,569 181,515Q160,461 160,400Q160,266 253,173Q346,80 480,80Q614,80 707,173Q800,266 800,400Q800,461 779,515Q758,569 720,611L720,920L480,840L240,920ZM480,640Q580,640 650,570Q720,500 720,400Q720,300 650,230Q580,160 480,160Q380,160 310,230Q240,300 240,400Q240,500 310,570Q380,640 480,640ZM320,801L480,760L640,801L640,677Q605,697 564.5,708.5Q524,720 480,720Q436,720 395.5,708.5Q355,697 320,677L320,801ZM480,739L480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739L480,739L480,739Z" />
9+
android:pathData="M480,520Q430,520 395,485Q360,450 360,400Q360,350 395,315Q430,280 480,280Q530,280 565,315Q600,350 600,400Q600,450 565,485Q530,520 480,520ZM480,840L293,902Q273,909 256.5,897Q240,885 240,865L240,611Q202,569 181,515Q160,461 160,400Q160,266 253,173Q346,80 480,80Q614,80 707,173Q800,266 800,400Q800,461 779,515Q758,569 720,611L720,865Q720,885 703.5,897Q687,909 667,902L480,840ZM480,640Q580,640 650,570Q720,500 720,400Q720,300 650,230Q580,160 480,160Q380,160 310,230Q240,300 240,400Q240,500 310,570Q380,640 480,640ZM320,801L480,760L640,801L640,677Q605,697 564.5,708.5Q524,720 480,720Q436,720 395.5,708.5Q355,697 320,677L320,801ZM480,739L480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739L480,739L480,739Z"/>
1010
</vector>

‎app/src/main/res/layout/mtrl_alert_select_dialog_singlechoice.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:layout_width="fill_parent"
55
android:layout_height="wrap_content"
66
android:background="@drawable/single_choice_background"
7-
android:drawableEnd="@drawable/dialog_singlechoice_icon"
7+
android:drawableEnd="@drawable/ic_dialog_singlechoice"
88
android:drawablePadding="8.0dip"
99
android:drawableTint="?colorOnSurface"
1010
android:ellipsize="marquee"

0 commit comments

Comments
 (0)