Add debugTools screen, add option to show onboarding

egorikftp · egorikftp · commit 07b1ec1f97c6 · 2024-10-23T09:44:49.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -7,6 +7,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.xml]
+indent_size = 4
+
 [{*.kt,*.kts}]
 indent_size = 4
 ij_kotlin_imports_layout = *
diff --git a/app/ios/grodno-roads-ios/AppDelegate.swift b/app/ios/grodno-roads-ios/AppDelegate.swift
@@ -32,16 +32,3 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         return true
     }
 }
-
-/// For debug purposes. Example: show onboarding on each launch.
-fileprivate func resetSettings() {
-    guard
-        let docs = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first,
-        let settings = try? FileManager.default.contentsOfDirectory(
-            at: docs, includingPropertiesForKeys: nil
-        ).first(where: { $0.lastPathComponent.contains("settings") })
-    else {
-        return
-    }
-    try? FileManager.default.removeItem(at: settings)
-}
diff --git a/kmp/compose/common-ui/src/commonMain/kotlin/com/egoriku/grodnoroads/foundation/common/ui/SettingsTopBar.kt b/kmp/compose/common-ui/src/commonMain/kotlin/com/egoriku/grodnoroads/foundation/common/ui/SettingsTopBar.kt
@@ -22,8 +22,8 @@ import com.egoriku.grodnoroads.foundation.preview.PreviewGrodnoRoads
 fun SettingsTopBar(
     title: String,
     onBack: () -> Unit,
-    scrollBehavior: TopAppBarScrollBehavior,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    scrollBehavior: TopAppBarScrollBehavior? = null
 ) {
     CenterAlignedTopAppBar(
         modifier = modifier,
@@ -51,7 +51,6 @@ fun SettingsTopBar(
 private fun SettingsTopBarPreview() = GrodnoRoadsM3ThemePreview {
     SettingsTopBar(
         title = "Test",
-        onBack = {},
-        scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+        onBack = {}
     )
 }
diff --git a/kmp/compose/foundation/icons/src/commonMain/kotlin/com/egoriku/grodnoroads/foundation/icons/outlined/Adb.kt b/kmp/compose/foundation/icons/src/commonMain/kotlin/com/egoriku/grodnoroads/foundation/icons/outlined/Adb.kt
@@ -0,0 +1,64 @@
+package com.egoriku.grodnoroads.foundation.icons.outlined
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+import com.egoriku.grodnoroads.foundation.icons.GrodnoRoads
+
+val GrodnoRoads.Outlined.Adb: ImageVector
+    get() {
+        if (_Adb != null) {
+            return _Adb!!
+        }
+        _Adb = ImageVector.Builder(
+            name = "Outlined.Adb",
+            defaultWidth = 24.dp,
+            defaultHeight = 24.dp,
+            viewportWidth = 24f,
+            viewportHeight = 24f
+        ).apply {
+            path(fill = SolidColor(Color(0xFFE676FF))) {
+                moveTo(5f, 16f)
+                curveToRelative(0f, 3.87f, 3.13f, 7f, 7f, 7f)
+                reflectiveCurveToRelative(7f, -3.13f, 7f, -7f)
+                verticalLineToRelative(-4f)
+                lineTo(5f, 12f)
+                verticalLineToRelative(4f)
+                close()
+                moveTo(16.12f, 4.37f)
+                lineToRelative(2.1f, -2.1f)
+                lineToRelative(-0.82f, -0.83f)
+                lineToRelative(-2.3f, 2.31f)
+                curveTo(14.16f, 3.28f, 13.12f, 3f, 12f, 3f)
+                reflectiveCurveToRelative(-2.16f, 0.28f, -3.09f, 0.75f)
+                lineTo(6.6f, 1.44f)
+                lineToRelative(-0.82f, 0.83f)
+                lineToRelative(2.1f, 2.1f)
+                curveTo(6.14f, 5.64f, 5f, 7.68f, 5f, 10f)
+                verticalLineToRelative(1f)
+                horizontalLineToRelative(14f)
+                verticalLineToRelative(-1f)
+                curveToRelative(0f, -2.32f, -1.14f, -4.36f, -2.88f, -5.63f)
+                close()
+                moveTo(9f, 9f)
+                curveToRelative(-0.55f, 0f, -1f, -0.45f, -1f, -1f)
+                reflectiveCurveToRelative(0.45f, -1f, 1f, -1f)
+                reflectiveCurveToRelative(1f, 0.45f, 1f, 1f)
+                reflectiveCurveToRelative(-0.45f, 1f, -1f, 1f)
+                close()
+                moveTo(15f, 9f)
+                curveToRelative(-0.55f, 0f, -1f, -0.45f, -1f, -1f)
+                reflectiveCurveToRelative(0.45f, -1f, 1f, -1f)
+                reflectiveCurveToRelative(1f, 0.45f, 1f, 1f)
+                reflectiveCurveToRelative(-0.45f, 1f, -1f, 1f)
+                close()
+            }
+        }.build()
+
+        return _Adb!!
+    }
+
+@Suppress("ObjectPropertyName")
+private var _Adb: ImageVector? = null
diff --git a/kmp/compose/resources/src/commonMain/composeResources/values-be-rBY/strings.xml b/kmp/compose/resources/src/commonMain/composeResources/values-be-rBY/strings.xml
@@ -33,11 +33,13 @@
     <string name="social_telegram_channel">Канал</string>
     <string name="social_share_app">Падзяліцца</string>
     <string name="app_version">Версія: %1$s</string>
+
     <string name="settings_section_appearance">Знешні выгляд</string>
     <string name="settings_section_map">Мапа</string>
     <string name="settings_section_alerts">Абвесткі</string>
     <string name="settings_section_changelog">Гісторыя зменаў</string>
     <string name="settings_section_faq">Часта задаюць пытанні</string>
+    <string name="settings_section_debug_tools">Інструменты адладкі</string>
 
     <!-- Settings categories -->
     <string name="settings_category_main">Асноўныя</string>
diff --git a/kmp/compose/resources/src/commonMain/composeResources/values-ru/strings.xml b/kmp/compose/resources/src/commonMain/composeResources/values-ru/strings.xml
@@ -41,6 +41,7 @@
     <string name="settings_section_alerts">Оповещения</string>
     <string name="settings_section_changelog">История изменений</string>
     <string name="settings_section_faq">Часто задаваемые вопросы</string>
+    <string name="settings_section_debug_tools">Инструменты отладки</string>
 
     <!-- Settings categories -->
     <string name="settings_category_main">Основные</string>
diff --git a/kmp/compose/resources/src/commonMain/composeResources/values/strings.xml b/kmp/compose/resources/src/commonMain/composeResources/values/strings.xml
@@ -43,6 +43,7 @@
     <string name="settings_section_alerts">Alerts</string>
     <string name="settings_section_changelog">Changelog</string>
     <string name="settings_section_faq">FAQ</string>
+    <string name="settings_section_debug_tools">Debug Tools</string>
 
     <!-- Settings categories -->
     <string name="settings_category_main">Main</string>
diff --git a/kmp/features/appSettings/src/commonMain/kotlin/com/egoriku/grodnoroads/appsettings/screen/AppSettingsScreen.kt b/kmp/features/appSettings/src/commonMain/kotlin/com/egoriku/grodnoroads/appsettings/screen/AppSettingsScreen.kt
@@ -34,10 +34,12 @@ import com.egoriku.grodnoroads.compose.resources.settings_category_other
 import com.egoriku.grodnoroads.compose.resources.settings_section_alerts
 import com.egoriku.grodnoroads.compose.resources.settings_section_appearance
 import com.egoriku.grodnoroads.compose.resources.settings_section_changelog
+import com.egoriku.grodnoroads.compose.resources.settings_section_debug_tools
 import com.egoriku.grodnoroads.compose.resources.settings_section_faq
 import com.egoriku.grodnoroads.compose.resources.settings_section_map
 import com.egoriku.grodnoroads.compose.resources.tab_settings
 import com.egoriku.grodnoroads.foundation.icons.GrodnoRoads
+import com.egoriku.grodnoroads.foundation.icons.outlined.Adb
 import com.egoriku.grodnoroads.foundation.icons.outlined.Appearance
 import com.egoriku.grodnoroads.foundation.icons.outlined.Changelog
 import com.egoriku.grodnoroads.foundation.icons.outlined.Faq
@@ -46,6 +48,7 @@ import com.egoriku.grodnoroads.foundation.icons.outlined.NotificationBadge
 import com.egoriku.grodnoroads.foundation.preview.GrodnoRoadsM3ThemePreview
 import com.egoriku.grodnoroads.foundation.preview.PreviewGrodnoRoads
 import com.egoriku.grodnoroads.foundation.uikit.WeightSpacer
+import com.egoriku.grodnoroads.shared.components.DebugConfig
 import com.egoriku.grodnoroads.shared.models.Page
 import org.jetbrains.compose.resources.stringResource
 
@@ -144,6 +147,14 @@ private fun SettingsUi(
                         paddingValues = PaddingValues(horizontal = 20.dp),
                         onClick = { onSettingClick(Page.FAQ) }
                     )
+                    if (DebugConfig.isDebug) {
+                        SettingsListItem(
+                            imageVector = GrodnoRoads.Outlined.Adb,
+                            name = stringResource(Res.string.settings_section_debug_tools),
+                            paddingValues = PaddingValues(horizontal = 20.dp),
+                            onClick = { onSettingClick(Page.DebugTools) }
+                        )
+                    }
                 }
             }
             WeightSpacer()
diff --git a/kmp/features/mainflow/build.gradle.kts b/kmp/features/mainflow/build.gradle.kts
@@ -20,6 +20,7 @@ kotlin {
             implementation(projects.kmp.features.settings.alerts)
             implementation(projects.kmp.features.settings.appearance)
             implementation(projects.kmp.features.settings.changelog)
+            implementation(projects.kmp.features.settings.debugTools)
             implementation(projects.kmp.features.settings.faq)
             implementation(projects.kmp.features.settings.map)
             implementation(projects.kmp.compose.foundation.uikit)
diff --git a/kmp/features/mainflow/src/commonMain/kotlin/com/egoriku/grodnoroads/mainflow/domain/MainFlowComponent.kt b/kmp/features/mainflow/src/commonMain/kotlin/com/egoriku/grodnoroads/mainflow/domain/MainFlowComponent.kt
@@ -6,6 +6,7 @@ import com.arkivanov.essenty.backhandler.BackHandlerOwner
 import com.egoriku.grodnoroads.settings.alerts.domain.component.AlertsComponent
 import com.egoriku.grodnoroads.settings.appearance.domain.component.AppearanceComponent
 import com.egoriku.grodnoroads.settings.changelog.domain.component.ChangelogComponent
+import com.egoriku.grodnoroads.settings.debugtools.domain.DebugToolsComponent
 import com.egoriku.grodnoroads.settings.faq.domain.component.FaqComponent
 import com.egoriku.grodnoroads.settings.map.domain.component.MapSettingsComponent
 import kotlinx.coroutines.flow.StateFlow
@@ -19,9 +20,10 @@ interface MainFlowComponent : BackHandlerOwner {
     sealed class Child {
         data class Tabs(val component: TabsComponent) : Child()
 
-        data class Appearance(val component: AppearanceComponent) : Child()
         data class Alerts(val component: AlertsComponent) : Child()
+        data class Appearance(val component: AppearanceComponent) : Child()
         data class Changelog(val component: ChangelogComponent) : Child()
+        data class DebugTools(val component: DebugToolsComponent) : Child()
         data class FAQ(val component: FaqComponent) : Child()
         data class MapSettings(val component: MapSettingsComponent) : Child()
     }
diff --git a/kmp/features/mainflow/src/commonMain/kotlin/com/egoriku/grodnoroads/mainflow/domain/MainFlowComponentImpl.kt b/kmp/features/mainflow/src/commonMain/kotlin/com/egoriku/grodnoroads/mainflow/domain/MainFlowComponentImpl.kt
@@ -11,6 +11,7 @@ import com.egoriku.grodnoroads.mainflow.domain.MainFlowComponent.Child
 import com.egoriku.grodnoroads.settings.alerts.domain.component.buildAlertsComponent
 import com.egoriku.grodnoroads.settings.appearance.domain.component.buildAppearanceComponent
 import com.egoriku.grodnoroads.settings.changelog.domain.component.buildChangelogComponent
+import com.egoriku.grodnoroads.settings.debugtools.domain.buildDebugToolsComponent
 import com.egoriku.grodnoroads.settings.faq.domain.component.buildFaqComponent
 import com.egoriku.grodnoroads.settings.map.domain.component.buildMapSettingsComponent
 import com.egoriku.grodnoroads.shared.models.Page
@@ -55,13 +56,15 @@ internal class MainFlowComponentImpl(
         is Config.Changelog -> Child.Changelog(buildChangelogComponent(componentContext))
         is Config.FAQ -> Child.FAQ(buildFaqComponent(componentContext))
         is Config.MapSettings -> Child.MapSettings(buildMapSettingsComponent(componentContext))
+        is Config.DebugTools -> Child.DebugTools(buildDebugToolsComponent(componentContext))
     }
 
     private fun open(page: Page) {
         when (page) {
             Page.Alerts -> navigation.pushNew(Config.Alerts)
             Page.Appearance -> navigation.pushNew(Config.Appearance)
             Page.Changelog -> navigation.pushNew(Config.Changelog)
+            Page.DebugTools -> navigation.pushNew(Config.DebugTools)
             Page.FAQ -> navigation.pushNew(Config.FAQ)
             Page.MapSettings -> navigation.pushNew(Config.MapSettings)
         }
@@ -86,5 +89,8 @@ internal class MainFlowComponentImpl(
 
         @Serializable
         data object FAQ : Config
+
+        @Serializable
+        data object DebugTools : Config
     }
 }
diff --git a/kmp/features/mainflow/src/commonMain/kotlin/com/egoriku/grodnoroads/mainflow/screen/MainFlowScreen.kt b/kmp/features/mainflow/src/commonMain/kotlin/com/egoriku/grodnoroads/mainflow/screen/MainFlowScreen.kt
@@ -11,6 +11,7 @@ import com.egoriku.grodnoroads.mainflow.domain.MainFlowComponent.Child
 import com.egoriku.grodnoroads.settings.alerts.screen.AlertsScreen
 import com.egoriku.grodnoroads.settings.appearance.screen.AppearanceScreen
 import com.egoriku.grodnoroads.settings.changelog.screen.ChangelogScreen
+import com.egoriku.grodnoroads.settings.debugtools.domain.DebugToolsScreen
 import com.egoriku.grodnoroads.settings.faq.screen.FaqScreen
 import com.egoriku.grodnoroads.settings.map.screen.MapSettingsScreen
 
@@ -47,6 +48,10 @@ fun MainFlowScreen(mainFlowComponent: MainFlowComponent) {
                 mapSettingsComponent = child.component,
                 onBack = mainFlowComponent::onBack
             )
+            is Child.DebugTools -> DebugToolsScreen(
+                debugToolsComponent = child.component,
+                onBack = mainFlowComponent::onBack
+            )
         }
     }
 }
diff --git a/kmp/features/onboarding/src/commonMain/kotlin/com/egoriku/grodnoroads/onboarding/domain/store/OnboardingStoreFactory.kt b/kmp/features/onboarding/src/commonMain/kotlin/com/egoriku/grodnoroads/onboarding/domain/store/OnboardingStoreFactory.kt
@@ -14,7 +14,7 @@ import com.egoriku.grodnoroads.onboarding.domain.store.OnboardingStore.Label
 import com.egoriku.grodnoroads.onboarding.domain.store.OnboardingStore.Message
 import com.egoriku.grodnoroads.shared.persistent.map.location.defaultCity
 import com.egoriku.grodnoroads.shared.persistent.map.location.updateDefaultCity
-import com.egoriku.grodnoroads.shared.persistent.onboarding.completeOnboarding
+import com.egoriku.grodnoroads.shared.persistent.onboarding.showOnboarding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
@@ -42,7 +42,7 @@ internal class OnboardingStoreFactory(
                 onIntent<CompleteOnboarding> {
                     launch {
                         dataStore.edit {
-                            completeOnboarding()
+                            showOnboarding(false)
                         }
                         publish(Label.FinishOnboarding)
                     }
diff --git a/kmp/features/root/build.gradle.kts b/kmp/features/root/build.gradle.kts
@@ -44,6 +44,7 @@ kotlin {
             export(projects.kmp.features.settings.alerts)
             export(projects.kmp.features.settings.appearance)
             export(projects.kmp.features.settings.changelog)
+            export(projects.kmp.features.settings.debugTools)
             export(projects.kmp.features.settings.faq)
             export(projects.kmp.features.settings.map)
             export(projects.kmp.features.tabs)
@@ -68,6 +69,7 @@ kotlin {
             api(projects.kmp.features.settings.alerts)
             api(projects.kmp.features.settings.appearance)
             api(projects.kmp.features.settings.changelog)
+            api(projects.kmp.features.settings.debugTools)
             api(projects.kmp.features.settings.faq)
             api(projects.kmp.features.settings.map)
             api(projects.kmp.features.tabs)
diff --git a/kmp/features/settings/debugTools/build.gradle.kts b/kmp/features/settings/debugTools/build.gradle.kts
@@ -0,0 +1,29 @@
+import com.egoriku.grodnoroads.extension.applyTargets
+import com.egoriku.grodnoroads.extension.commonDependencies
+
+plugins {
+    alias(libs.plugins.grodnoroads.kmp.library)
+    alias(libs.plugins.grodnoroads.kmp.compose)
+}
+
+android {
+    namespace = "com.egoriku.grodnoroads.settings.debugtools"
+}
+
+kotlin {
+    applyTargets()
+
+    sourceSets {
+        commonDependencies {
+            implementation(projects.kmp.compose.commonUi)
+            implementation(projects.kmp.compose.foundation.icons)
+            implementation(projects.kmp.compose.foundation.uikit)
+            implementation(projects.kmp.compose.resources)
+            implementation(projects.kmp.shared.persistent)
+            implementation(projects.kmp.libraries.extensions)
+
+            implementation(libs.decompose)
+            implementation(libs.koin.core)
+        }
+    }
+}
diff --git a/kmp/features/settings/debugTools/src/commonMain/kotlin/com/egoriku/grodnoroads/settings/debugtools/domain/DebugToolsComponent.kt b/kmp/features/settings/debugTools/src/commonMain/kotlin/com/egoriku/grodnoroads/settings/debugtools/domain/DebugToolsComponent.kt
@@ -0,0 +1,9 @@
+package com.egoriku.grodnoroads.settings.debugtools.domain
+
+import androidx.compose.runtime.Stable
+
+@Stable
+interface DebugToolsComponent {
+
+    fun showOnboarding()
+}
diff --git a/kmp/features/settings/debugTools/src/commonMain/kotlin/com/egoriku/grodnoroads/settings/debugtools/domain/DebugToolsComponentImpl.kt b/kmp/features/settings/debugTools/src/commonMain/kotlin/com/egoriku/grodnoroads/settings/debugtools/domain/DebugToolsComponentImpl.kt
@@ -0,0 +1,34 @@
+package com.egoriku.grodnoroads.settings.debugtools.domain
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import com.arkivanov.decompose.ComponentContext
+import com.egoriku.grodnoroads.datastore.edit
+import com.egoriku.grodnoroads.extensions.decompose.coroutineScope
+import com.egoriku.grodnoroads.shared.persistent.onboarding.showOnboarding
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+fun buildDebugToolsComponent(
+    componentContext: ComponentContext
+): DebugToolsComponent = DebugToolsComponentImpl(componentContext)
+
+internal class DebugToolsComponentImpl(
+    componentContext: ComponentContext
+) : DebugToolsComponent,
+    ComponentContext by componentContext,
+    KoinComponent {
+
+    private val dataStore: DataStore<Preferences> by inject()
+
+    private val coroutineScope = coroutineScope()
+
+    override fun showOnboarding() {
+        coroutineScope.launch {
+            dataStore.edit {
+                showOnboarding(true)
+            }
+        }
+    }
+}
diff --git a/kmp/features/settings/debugTools/src/commonMain/kotlin/com/egoriku/grodnoroads/settings/debugtools/domain/DebugToolsScreen.kt b/kmp/features/settings/debugTools/src/commonMain/kotlin/com/egoriku/grodnoroads/settings/debugtools/domain/DebugToolsScreen.kt
diff --git a/kmp/shared/components/build.gradle.kts b/kmp/shared/components/build.gradle.kts
diff --git a/kmp/shared/components/src/androidMain/kotlin/com/egoriku/grodnoroads/shared/components/DebugConfig.android.kt b/kmp/shared/components/src/androidMain/kotlin/com/egoriku/grodnoroads/shared/components/DebugConfig.android.kt
diff --git a/kmp/shared/components/src/commonMain/kotlin/com/egoriku/grodnoroads/shared/components/DebugConfig.kt b/kmp/shared/components/src/commonMain/kotlin/com/egoriku/grodnoroads/shared/components/DebugConfig.kt
diff --git a/kmp/shared/components/src/iosMain/kotlin/com/egoriku/grodnoroads/shared/components/DebugConfig.ios.kt b/kmp/shared/components/src/iosMain/kotlin/com/egoriku/grodnoroads/shared/components/DebugConfig.ios.kt
diff --git a/kmp/shared/models/src/commonMain/kotlin/com/egoriku/grodnoroads/shared/models/Page.kt b/kmp/shared/models/src/commonMain/kotlin/com/egoriku/grodnoroads/shared/models/Page.kt
diff --git a/kmp/shared/persistent/src/commonMain/kotlin/com/egoriku/grodnoroads/shared/persistent/onboarding/OnboardingPreferences.kt b/kmp/shared/persistent/src/commonMain/kotlin/com/egoriku/grodnoroads/shared/persistent/onboarding/OnboardingPreferences.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
