Include "Contact" and "Documentation" buttons also on Troubleshooting…

… screen
Waboodoo · Dec 21, 2023 · 5c80fe4 · 5c80fe4
1 parent 5248f2d
commit 5c80fe4
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/...rtcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/about/AboutContent.kt b/...rtcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/about/AboutContent.kt
@@ -5,10 +5,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Article
+import androidx.compose.material.icons.automirrored.outlined.Article
+import androidx.compose.material.icons.automirrored.outlined.LiveHelp
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.Email
-import androidx.compose.material.icons.outlined.LiveHelp
 import androidx.compose.material.icons.outlined.People
 import androidx.compose.material.icons.outlined.Translate
 import androidx.compose.runtime.Composable
@@ -47,7 +47,7 @@ fun AboutContent(
         )
 
         SettingsButton(
-            icon = Icons.Outlined.LiveHelp,
+            icon = Icons.AutoMirrored.Outlined.LiveHelp,
             title = stringResource(R.string.settings_documentation),
             subtitle = stringResource(R.string.settings_documentation_summary),
             onClick = onDocumentationButtonClicked,
@@ -105,7 +105,7 @@ fun AboutContent(
         )
 
         SettingsButton(
-            icon = Icons.Outlined.Article,
+            icon = Icons.AutoMirrored.Outlined.Article,
             title = stringResource(R.string.settings_privacy_policy),
             subtitle = stringResource(R.string.settings_privacy_policy_summary),
             onClick = onPrivacyPolicyButtonClicked,

diff --git a/...kotlin/ch/rmy/android/http_shortcuts/activities/troubleshooting/TroubleShootingContent.kt b/...kotlin/ch/rmy/android/http_shortcuts/activities/troubleshooting/TroubleShootingContent.kt
@@ -5,11 +5,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.LiveHelp
 import androidx.compose.material.icons.outlined.BatteryFull
 import androidx.compose.material.icons.outlined.Cookie
+import androidx.compose.material.icons.outlined.Email
 import androidx.compose.material.icons.outlined.History
 import androidx.compose.material.icons.outlined.Layers
 import androidx.compose.material.icons.outlined.Schedule
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -28,6 +31,8 @@ fun TroubleShootingContent(
     onAllowOverlayButtonClicked: () -> Unit,
     onAllowXiaomiOverlayButtonClicked: () -> Unit,
     onBatteryOptimizationButtonClicked: () -> Unit,
+    onDocumentationButtonClicked: () -> Unit,
+    onContactButtonClicked: () -> Unit,
 ) {
     Column(
         modifier = Modifier
@@ -78,5 +83,21 @@ fun TroubleShootingContent(
                 onClick = onBatteryOptimizationButtonClicked,
             )
         }
+
+        HorizontalDivider()
+
+        SettingsButton(
+            icon = Icons.AutoMirrored.Outlined.LiveHelp,
+            title = stringResource(R.string.settings_documentation),
+            subtitle = stringResource(R.string.settings_documentation_summary),
+            onClick = onDocumentationButtonClicked,
+        )
+
+        SettingsButton(
+            icon = Icons.Outlined.Email,
+            title = stringResource(R.string.settings_mail),
+            subtitle = stringResource(R.string.settings_mail_summary),
+            onClick = onContactButtonClicked,
+        )
     }
 }
diff --git a/.../kotlin/ch/rmy/android/http_shortcuts/activities/troubleshooting/TroubleShootingScreen.kt b/.../kotlin/ch/rmy/android/http_shortcuts/activities/troubleshooting/TroubleShootingScreen.kt
@@ -24,6 +24,8 @@ fun TroubleShootingScreen() {
             onAllowOverlayButtonClicked = viewModel::onAllowOverlayButtonClicked,
             onAllowXiaomiOverlayButtonClicked = viewModel::onAllowXiaomiOverlayButtonClicked,
             onBatteryOptimizationButtonClicked = viewModel::onBatteryOptimizationButtonClicked,
+            onDocumentationButtonClicked = viewModel::onDocumentationButtonClicked,
+            onContactButtonClicked = viewModel::onContactButtonClicked,
         )
     }
 

diff --git a/...tlin/ch/rmy/android/http_shortcuts/activities/troubleshooting/TroubleShootingViewModel.kt b/...tlin/ch/rmy/android/http_shortcuts/activities/troubleshooting/TroubleShootingViewModel.kt
@@ -8,6 +8,7 @@ import ch.rmy.android.http_shortcuts.http.CookieManager
 import ch.rmy.android.http_shortcuts.logging.Logging
 import ch.rmy.android.http_shortcuts.navigation.NavigationDestination
 import ch.rmy.android.http_shortcuts.utils.AppOverlayUtil
+import ch.rmy.android.http_shortcuts.utils.ExternalURLs
 import ch.rmy.android.http_shortcuts.utils.RestrictionsUtil
 import ch.rmy.android.http_shortcuts.utils.Settings
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -76,6 +77,14 @@ constructor(
         sendIntent(restrictionsUtil.getRequestIgnoreBatteryOptimizationIntent() ?: skipAction())
     }
 
+    fun onDocumentationButtonClicked() = runAction {
+        openURL(ExternalURLs.DOCUMENTATION_PAGE)
+    }
+
+    fun onContactButtonClicked() = runAction {
+        navigate(NavigationDestination.Contact)
+    }
+
     fun onDialogDismissalRequested() = runAction {
         updateDialogState(null)
     }