bugfix [#29]: launcher shortcuts

Lennoard · Lennoard · commit e0483bea1b3b · 2022-02-20T15:31:34.000-03:00
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/Actions.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/helpers/Actions.kt
@@ -1,9 +1,8 @@
 package com.androidvip.sysctlgui.helpers
 
 enum class Actions {
-    KernelParamsListFragment,
-    KernelParamBrowserFragment,
-    SettingsFragment,
+    BrowseParams,
     ExportParams,
+    OpenSettings,
     EditParam
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/StartActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/StartActivity.kt
@@ -91,17 +91,16 @@ class StartActivity : AppCompatActivity() {
     }
 
     private fun navigate() {
-        when (this.intent.action) {
-            Actions.KernelParamBrowserFragment.name -> {
-                // TODO
-            }
-
-            Actions.KernelParamsListFragment.name -> {
-                // TODO
-            }
-
-            Actions.SettingsFragment.name -> {
-                // TODO
+        val shortcutNames = arrayOf(
+            Actions.BrowseParams.name,
+            Actions.ExportParams.name,
+            Actions.OpenSettings.name
+        )
+        val nextIntent = when (intent.action) {
+            in shortcutNames -> {
+                Intent(this, MainActivity2::class.java).apply {
+                    putExtra(MainActivity2.EXTRA_DESTINATION, intent.action)
+                }
             }
 
             Actions.EditParam.name -> {
@@ -116,13 +115,14 @@ class StartActivity : AppCompatActivity() {
                             RemovableParamAdapter.EXTRA_EDIT_SAVED_PARAM, false
                         )
                     )
-                    startActivity(this)
                 }
             }
 
             else -> {
-                startActivity(Intent(this, MainActivity2::class.java))
+                Intent(this, MainActivity2::class.java)
             }
         }
+
+        startActivity(nextIntent)
     }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity2.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity2.kt
@@ -9,6 +9,7 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.databinding.ActivityMain2Binding
+import com.androidvip.sysctlgui.helpers.Actions
 
 class MainActivity2 : AppCompatActivity() {
     private lateinit var binding: ActivityMain2Binding
@@ -22,6 +23,7 @@ class MainActivity2 : AppCompatActivity() {
         setSupportActionBar(binding.toolbar)
 
         setUpNavigation()
+        navigateFromIntent()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -50,6 +52,22 @@ class MainActivity2 : AppCompatActivity() {
         navView.setupWithNavController(navController)
     }
 
+    private fun navigateFromIntent() {
+        val fragmentName = intent.getStringExtra(EXTRA_DESTINATION) ?: return
+        when (fragmentName) {
+            Actions.BrowseParams.name -> R.id.navigationBrowse
+            Actions.ExportParams.name -> R.id.navigationExport
+            Actions.OpenSettings.name -> R.id.navigationSettings
+            else -> null
+        }?.let { id ->
+            navHost.navController.navigate(id)
+        }
+    }
+
     private val navHost: NavHostFragment
         get() = supportFragmentManager.findFragmentById(R.id.navHostFragment) as NavHostFragment
+
+    companion object {
+        internal const val EXTRA_DESTINATION = "destination"
+    }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/KernelParamListFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/list/KernelParamListFragment.kt
@@ -13,7 +13,6 @@ import com.androidvip.sysctlgui.databinding.FragmentKernelParamListBinding
 import com.androidvip.sysctlgui.domain.models.ViewState
 import com.androidvip.sysctlgui.getColorRoles
 import com.androidvip.sysctlgui.ui.base.BaseSearchFragment
-import com.androidvip.sysctlgui.ui.base.BaseViewBindingFragment
 import com.androidvip.sysctlgui.ui.params.OnParamItemClickedListener
 import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
 import com.androidvip.sysctlgui.ui.params.user.RemovableParamAdapter
diff --git a/app/src/main/res/drawable/ic_edit_outline_dark.xml b/app/src/main/res/drawable/ic_edit_outline_dark.xml
diff --git a/app/src/main/res/drawable/ic_export_outline_dark.xml b/app/src/main/res/drawable/ic_export_outline_dark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/gray_900"
+        android:pathData="M14 2H6C4.89 2 4 2.9 4 4V20C4 21.11 4.89 22 6 22H18C19.11 22 20 21.11 20 20V8L14 2M18 20H6V4H13V9H18V20M15 11.93V19H7.93L10.05 16.88L7.22 14.05L10.05 11.22L12.88 14.05L15 11.93Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_outline_dark.xml b/app/src/main/res/drawable/ic_folder_outline_dark.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#232F34"
+        android:fillColor="@color/gray_900"
         android:pathData="M9.17,6l2,2H20v10H4V6h5.17M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_outline_dark.xml b/app/src/main/res/drawable/ic_settings_outline_dark.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#232F34"
+        android:fillColor="@color/gray_900"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
@@ -1,30 +1,31 @@
 <shortcuts xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
+
     <shortcut
-        android:shortcutId="KernelParamsList"
+        android:shortcutId="KernelParamBrowser"
         android:enabled="true"
-        android:icon="@drawable/ic_edit_outline_dark"
-        android:shortcutShortLabel="@string/show_variables"
-        android:shortcutLongLabel="@string/show_variables_sum"
+        android:icon="@drawable/ic_folder_outline_dark"
+        android:shortcutShortLabel="@string/browse_variables"
+        android:shortcutLongLabel="@string/browse_variables_sum"
         tools:targetApi="n_mr1">
         <intent
-            android:action="KernelParamsListFragment"
+            android:action="BrowseParams"
             android:targetPackage="com.androidvip.sysctlgui"
-            android:targetClass="com.androidvip.sysctlgui.ui.SplashActivity" />
+            android:targetClass="com.androidvip.sysctlgui.ui.StartActivity" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
     <shortcut
-        android:shortcutId="KernelParamBrowser"
+        android:shortcutId="ExportOptions"
         android:enabled="true"
-        android:icon="@drawable/ic_folder_outline_dark"
-        android:shortcutShortLabel="@string/browse_variables"
-        android:shortcutLongLabel="@string/browse_variables_sum"
+        android:icon="@drawable/ic_export_outline_dark"
+        android:shortcutShortLabel="@string/export_options"
+        android:shortcutLongLabel="@string/export_options_sum"
         tools:targetApi="n_mr1">
         <intent
-            android:action="KernelParamBrowserFragment"
+            android:action="ExportParams"
             android:targetPackage="com.androidvip.sysctlgui"
-            android:targetClass="com.androidvip.sysctlgui.ui.SplashActivity" />
+            android:targetClass="com.androidvip.sysctlgui.ui.StartActivity" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
@@ -36,9 +37,9 @@
         android:shortcutLongLabel="@string/settings"
         tools:targetApi="n_mr1">
         <intent
-            android:action="SettingsFragment"
+            android:action="OpenSettings"
             android:targetPackage="com.androidvip.sysctlgui"
-            android:targetClass="com.androidvip.sysctlgui.ui.SplashActivity" />
+            android:targetClass="com.androidvip.sysctlgui.ui.StartActivity" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
-</shortcuts>
+</shortcuts>

Original file line number	Diff line number	Diff line change
`@@ -91,17 +91,16 @@ class StartActivity : AppCompatActivity() {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`private fun navigate() {`
`94`		`- when (this.intent.action) {`
`95`		`- Actions.KernelParamBrowserFragment.name -> {`
`96`		`- // TODO`
`97`		`- }`
`98`		`-`
`99`		`- Actions.KernelParamsListFragment.name -> {`
`100`		`- // TODO`
`101`		`- }`
`102`		`-`
`103`		`- Actions.SettingsFragment.name -> {`
`104`		`- // TODO`
	`94`	`+ val shortcutNames = arrayOf(`
	`95`	`+ Actions.BrowseParams.name,`
	`96`	`+ Actions.ExportParams.name,`
	`97`	`+ Actions.OpenSettings.name`
	`98`	`+ )`
	`99`	`+ val nextIntent = when (intent.action) {`
	`100`	`+ in shortcutNames -> {`
	`101`	`+ Intent(this, MainActivity2::class.java).apply {`
	`102`	`+ putExtra(MainActivity2.EXTRA_DESTINATION, intent.action)`
	`103`	`+ }`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`Actions.EditParam.name -> {`
`@@ -116,13 +115,14 @@ class StartActivity : AppCompatActivity() {`
`116`	`115`	`RemovableParamAdapter.EXTRA_EDIT_SAVED_PARAM, false`
`117`	`116`	`)`
`118`	`117`	`)`
`119`		`- startActivity(this)`
`120`	`118`	`}`
`121`	`119`	`}`
`122`	`120`
`123`	`121`	`else -> {`
`124`		`- startActivity(Intent(this, MainActivity2::class.java))`
	`122`	`+ Intent(this, MainActivity2::class.java)`
`125`	`123`	`}`
`126`	`124`	`}`
	`125`	`+`
	`126`	`+ startActivity(nextIntent)`
`127`	`127`	`}`
`128`	`128`	`}`