Fix: PermissionsFragment checklist UI, What's New dialog, ExecutionModeValidator, string resources

risunCode · risunCode · commit 3d6c516fc31f · 2025-12-07T19:17:54.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -51,7 +51,7 @@ ehthumbs.db
 Desktop.ini
 
 # Proposal docs (internal only)
-app-control-x-proposal/
+.app-control-x-proposal/
 
 # Kiro IDE (local steering rules)
 .kiro/
diff --git a/app/src/main/java/com/appcontrolx/service/ExecutionModeValidator.kt b/app/src/main/java/com/appcontrolx/service/ExecutionModeValidator.kt
@@ -0,0 +1,86 @@
+package com.appcontrolx.service
+
+import android.content.Context
+import com.appcontrolx.data.local.SettingsDataStore
+import com.appcontrolx.utils.Constants
+import kotlinx.coroutines.flow.first
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ExecutionModeValidator @Inject constructor(
+    private val context: Context,
+    private val permissionBridge: PermissionBridge,
+    private val settingsDataStore: SettingsDataStore
+) {
+    
+    /**
+     * Validate current execution mode and fallback to view-only if needed
+     */
+    suspend fun validateAndFallback(): ValidationResult {
+        val currentMode = settingsDataStore.executionMode.first()
+        
+        return when (currentMode) {
+            Constants.MODE_ROOT -> {
+                if (permissionBridge.isRootAvailable()) {
+                    ValidationResult.Valid(currentMode)
+                } else {
+                    settingsDataStore.setExecutionMode(Constants.MODE_NONE)
+                    ValidationResult.Fallback(Constants.MODE_NONE, "Root access is no longer available")
+                }
+            }
+            
+            Constants.MODE_SHIZUKU -> {
+                if (permissionBridge.isShizukuReady()) {
+                    ValidationResult.Valid(currentMode)
+                } else {
+                    settingsDataStore.setExecutionMode(Constants.MODE_NONE)
+                    ValidationResult.Fallback(Constants.MODE_NONE, "Shizuku is no longer available")
+                }
+            }
+            
+            else -> ValidationResult.Valid(currentMode)
+        }
+    }
+    
+    /**
+     * Check if we can switch to the requested mode
+     */
+    suspend fun canSwitchTo(mode: String): SwitchResult {
+        return when (mode) {
+            Constants.MODE_ROOT -> {
+                if (permissionBridge.checkRootNow()) {
+                    SwitchResult.Success
+                } else {
+                    SwitchResult.Failed("Root access denied or not available")
+                }
+            }
+            
+            Constants.MODE_SHIZUKU -> {
+                when {
+                    !permissionBridge.isShizukuAvailable() -> {
+                        SwitchResult.Failed("Shizuku is not installed or running")
+                    }
+                    !permissionBridge.isShizukuPermissionGranted() -> {
+                        SwitchResult.Failed("Shizuku permission not granted")
+                    }
+                    else -> SwitchResult.Success
+                }
+            }
+            
+            Constants.MODE_NONE -> SwitchResult.Success
+            
+            else -> SwitchResult.Failed("Unknown execution mode")
+        }
+    }
+    
+    sealed class ValidationResult {
+        data class Valid(val mode: String) : ValidationResult()
+        data class Fallback(val newMode: String, val reason: String) : ValidationResult()
+    }
+    
+    sealed class SwitchResult {
+        object Success : SwitchResult()
+        data class Failed(val reason: String) : SwitchResult()
+    }
+}
diff --git a/app/src/main/java/com/appcontrolx/ui/MainActivity.kt b/app/src/main/java/com/appcontrolx/ui/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.appcontrolx.ui
 
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
@@ -10,7 +11,6 @@ import com.appcontrolx.R
 import com.appcontrolx.databinding.ActivityMainBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import timber.log.Timber
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
@@ -22,7 +22,7 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
         
-        Timber.d("MainActivity created")
+        Log.d("MainActivity", "MainActivity created")
         setupNavigation()
         showWhatsNewIfNeeded()
     }
@@ -48,15 +48,16 @@ class MainActivity : AppCompatActivity() {
     
     private fun showWhatsNewDialog() {
         val whatsNew = """
-            |• MVVM Architecture with Hilt DI
-            |• Crash reporting with Firebase
-            |• Optimized release build
-            |• Smart app caching
-            |• Status badges
-            |• Tools tab with hidden settings
-            |• Activity Launcher
-            |• Batch operations
-            |• Enhanced security
+            |🏗️ MVVM Architecture + Hilt DI
+            |🔥 Firebase Crashlytics integration
+            |⚡ Optimized release build (ProGuard)
+            |📊 Beautiful About page with stats
+            |🚀 Activity Launcher with expandable groups
+            |🎯 Enhanced batch operations
+            |🔒 Runtime root/shizuku validation
+            |🛡️ Enhanced security & input validation
+            |🎨 Dark/Light theme toggle
+            |✨ Clean UI improvements
         """.trimMargin()
         
         MaterialAlertDialogBuilder(this)
diff --git a/app/src/main/java/com/appcontrolx/ui/setup/PermissionsFragment.kt b/app/src/main/java/com/appcontrolx/ui/setup/PermissionsFragment.kt
@@ -112,26 +112,37 @@ class PermissionsFragment : Fragment() {
             
             if (hasRoot) {
                 selectMode(Constants.MODE_ROOT)
+                binding.btnCheckRoot.text = getString(R.string.status_access_granted)
+                binding.btnCheckRoot.isEnabled = false // Keep disabled when granted
                 Toast.makeText(context, R.string.root_granted, Toast.LENGTH_SHORT).show()
             } else {
+                binding.btnCheckRoot.isEnabled = true
+                binding.btnCheckRoot.text = getString(R.string.btn_check)
                 Toast.makeText(context, R.string.root_denied, Toast.LENGTH_SHORT).show()
             }
             
-            binding.btnCheckRoot.isEnabled = true
-            binding.btnCheckRoot.text = getString(R.string.btn_check)
             updateUI()
         }
     }
     
     private fun checkShizukuAccess() {
+        binding.btnCheckShizuku.isEnabled = false
+        binding.btnCheckShizuku.text = getString(R.string.btn_checking)
+        
         if (permissionBridge.isShizukuAvailable()) {
             if (permissionBridge.isShizukuPermissionGranted()) {
                 shizukuGranted = true
                 selectMode(Constants.MODE_SHIZUKU)
+                binding.btnCheckShizuku.text = getString(R.string.status_access_granted)
+                // Keep disabled when granted
             } else {
                 permissionBridge.requestShizukuPermission()
+                binding.btnCheckShizuku.isEnabled = true
+                binding.btnCheckShizuku.text = getString(R.string.btn_check)
             }
         } else {
+            binding.btnCheckShizuku.isEnabled = true
+            binding.btnCheckShizuku.text = getString(R.string.btn_check)
             Toast.makeText(context, R.string.error_shizuku_not_available, Toast.LENGTH_SHORT).show()
         }
         updateUI()
@@ -201,14 +212,20 @@ class PermissionsFragment : Fragment() {
         binding.tvQueryAppsStatus.setTextColor(resources.getColor(R.color.status_positive, null))
         binding.btnQueryApps.visibility = View.GONE
         
-        // Root status
+        // Root status & button
         binding.tvRootStatus.text = if (rootGranted) 
             getString(R.string.status_granted) else getString(R.string.status_not_granted)
         binding.tvRootStatus.setTextColor(resources.getColor(
             if (rootGranted) R.color.status_positive else R.color.status_neutral, null))
-        binding.ivRootCheck.visibility = if (binding.cardRoot.isChecked) View.VISIBLE else View.GONE
         
-        // Shizuku status
+        // Root: show check icon on right when selected, update button text
+        binding.ivRootCheck.visibility = if (rootGranted && binding.cardRoot.isChecked) View.VISIBLE else View.GONE
+        if (rootGranted) {
+            binding.btnCheckRoot.text = getString(R.string.status_access_granted)
+            binding.btnCheckRoot.isEnabled = false
+        }
+        
+        // Shizuku status & button
         val shizukuAvailable = permissionBridge.isShizukuAvailable()
         binding.tvShizukuStatus.text = when {
             shizukuGranted -> getString(R.string.status_granted)
@@ -217,9 +234,15 @@ class PermissionsFragment : Fragment() {
         }
         binding.tvShizukuStatus.setTextColor(resources.getColor(
             if (shizukuGranted) R.color.status_positive else R.color.status_neutral, null))
-        binding.ivShizukuCheck.visibility = if (binding.cardShizuku.isChecked) View.VISIBLE else View.GONE
         
-        // View only check
+        // Shizuku: show check icon on right when selected, update button text
+        binding.ivShizukuCheck.visibility = if (shizukuGranted && binding.cardShizuku.isChecked) View.VISIBLE else View.GONE
+        if (shizukuGranted) {
+            binding.btnCheckShizuku.text = getString(R.string.status_access_granted)
+            binding.btnCheckShizuku.isEnabled = false
+        }
+        
+        // View only: always show check when selected (no permission needed)
         binding.ivViewOnlyCheck.visibility = if (binding.cardViewOnly.isChecked) View.VISIBLE else View.GONE
         
         // Continue button - enabled if a mode is selected
@@ -229,7 +252,8 @@ class PermissionsFragment : Fragment() {
     
     private fun setupContinueButton() {
         binding.btnContinue.setOnClickListener {
-            (activity as? SetupActivity)?.completeSetup()
+            // Go to Disclaimer page (next step)
+            (activity as? SetupActivity)?.nextStep()
         }
     }
     
diff --git a/app/src/main/java/com/appcontrolx/ui/setup/SetupActivity.kt b/app/src/main/java/com/appcontrolx/ui/setup/SetupActivity.kt
@@ -37,9 +37,10 @@ class SetupActivity : AppCompatActivity() {
     }
     
     private fun setupViewPager() {
+        // Order: Permissions first, then Disclaimer (warning)
         val fragments = listOf<Fragment>(
-            DisclaimerFragment(),
-            PermissionsFragment()
+            PermissionsFragment(),
+            DisclaimerFragment()
         )
         
         binding.viewPager.adapter = SetupPagerAdapter(this, fragments)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@
     <string name="btn_start">Start</string>
     <string name="btn_check">Check</string>
     <string name="btn_checking">Checking...</string>
+    <string name="status_access_granted">Access Granted</string>
     <string name="btn_get">Get</string>
     <string name="btn_grant">Grant</string>
     <string name="root_granted">Root access granted!</string>

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,10 @@ class SetupActivity : AppCompatActivity() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private fun setupViewPager() {`
	`40`	`+ // Order: Permissions first, then Disclaimer (warning)`
`40`	`41`	`val fragments = listOf<Fragment>(`
`41`		`- DisclaimerFragment(),`
`42`		`- PermissionsFragment()`
	`42`	`+ PermissionsFragment(),`
	`43`	`+ DisclaimerFragment()`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`binding.viewPager.adapter = SetupPagerAdapter(this, fragments)`