Merge pull request #895 from vector-im/feature/bma/fixDarkWelcome

bmarty · web-flow · commit bb3aee6d7ea9 · 2023-07-18T11:19:10.000+02:00
Fix dark welcome
diff --git a/.idea/dictionaries/shared.xml b/.idea/dictionaries/shared.xml
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
@@ -135,7 +135,7 @@ private fun AnalyticsOptInHeader(
 @Composable
 private fun CheckIcon(modifier: Modifier = Modifier) {
     Icon(
-        modifier = Modifier
+        modifier = modifier
             .size(20.dp)
             .background(color = MaterialTheme.colorScheme.background, shape = CircleShape)
             .padding(2.dp),
diff --git a/features/analytics/test/src/main/kotlin/io/element/android/features/analytics/test/FakeAnalyticsService.kt b/features/analytics/test/src/main/kotlin/io/element/android/features/analytics/test/FakeAnalyticsService.kt
@@ -67,4 +67,8 @@ class FakeAnalyticsService(
 
     override fun trackError(throwable: Throwable) {
     }
+
+    override suspend fun reset() {
+        didAskUserConsentFlow.value = false
+    }
 }
diff --git a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueState.kt b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/state/FtueState.kt
@@ -20,4 +20,6 @@ import kotlinx.coroutines.flow.StateFlow
 
 interface FtueState {
     val shouldDisplayFlow: StateFlow<Boolean>
+
+    suspend fun reset()
 }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/state/DefaultFtueState.kt
@@ -39,6 +39,11 @@ class DefaultFtueState @Inject constructor(
 
     override val shouldDisplayFlow = MutableStateFlow(isAnyStepIncomplete())
 
+    override suspend fun reset() {
+        welcomeScreenState.reset()
+        analyticsService.reset()
+    }
+
     init {
         analyticsService.didAskUserConsent()
             .onEach { updateState() }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
@@ -75,13 +75,15 @@ fun WelcomeView(
                 Text(
                     modifier = Modifier.testTag(TestTags.welcomeScreenTitle),
                     text = stringResource(R.string.screen_welcome_title, applicationName),
-                    style = ElementTheme.typography.fontHeadingLgBold,
+                    style = ElementTheme.typography.fontHeadingMdBold,
+                    color = ElementTheme.colors.textPrimary,
                     textAlign = TextAlign.Center,
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
                     text = stringResource(R.string.screen_welcome_subtitle),
                     style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textPrimary,
                     textAlign = TextAlign.Center,
                 )
                 Spacer(modifier = Modifier.height(40.dp))
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/state/AndroidWelcomeScreenState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/state/AndroidWelcomeScreenState.kt
@@ -17,6 +17,7 @@
 package io.element.android.features.ftue.impl.welcome.state
 
 import android.content.SharedPreferences
+import androidx.core.content.edit
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.DefaultPreferences
@@ -27,7 +28,7 @@ import javax.inject.Inject
 @SingleIn(AppScope::class)
 class AndroidWelcomeScreenState @Inject constructor(
     @DefaultPreferences private val sharedPreferences: SharedPreferences,
-): WelcomeScreenState {
+) : WelcomeScreenState {
 
     companion object {
         private const val IS_WELCOME_SCREEN_SHOWN = "is_welcome_screen_shown"
@@ -40,4 +41,10 @@ class AndroidWelcomeScreenState @Inject constructor(
     override fun setWelcomeScreenShown() {
         sharedPreferences.edit().putBoolean(IS_WELCOME_SCREEN_SHOWN, true).apply()
     }
+
+    override fun reset() {
+        sharedPreferences.edit {
+            remove(IS_WELCOME_SCREEN_SHOWN)
+        }
+    }
 }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/state/WelcomeScreenState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/state/WelcomeScreenState.kt
@@ -19,4 +19,5 @@ package io.element.android.features.ftue.impl.welcome.state
 interface WelcomeScreenState {
     fun isWelcomeScreenNeeded(): Boolean
     fun setWelcomeScreenShown()
+    fun reset()
 }
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeState.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeState.kt
@@ -27,4 +27,8 @@ class FakeWelcomeState : WelcomeScreenState {
     override fun setWelcomeScreenShown() {
         isWelcomeScreenNeeded = false
     }
+
+    override fun reset() {
+        isWelcomeScreenNeeded = true
+    }
 }
diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts
@@ -44,6 +44,7 @@ dependencies {
     implementation(projects.libraries.uiStrings)
     implementation(projects.features.rageshake.api)
     implementation(projects.features.analytics.api)
+    implementation(projects.features.ftue.api)
     implementation(projects.libraries.matrixui)
     implementation(projects.features.logout.api)
     implementation(projects.services.toolbox.api)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import coil.Coil
 import coil.annotation.ExperimentalCoilApi
 import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.ftue.api.state.FtueState
 import io.element.android.features.preferences.impl.DefaultCacheService
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.ApplicationContext
@@ -43,6 +44,7 @@ class DefaultClearCacheUseCase @Inject constructor(
     private val coroutineDispatchers: CoroutineDispatchers,
     private val defaultCacheIndexProvider: DefaultCacheService,
     private val okHttpClient: Provider<OkHttpClient>,
+    private val ftueState: FtueState,
 ) : ClearCacheUseCase {
     override suspend fun invoke() = withContext(coroutineDispatchers.io) {
         // Clear Matrix cache
@@ -56,6 +58,8 @@ class DefaultClearCacheUseCase @Inject constructor(
         okHttpClient.get().cache?.delete()
         // Clear app cache
         context.cacheDir.deleteRecursively()
+        // Clear some settings
+        ftueState.reset()
         // Ensure the app is restarted
         defaultCacheIndexProvider.onClearedCache(matrixClient.sessionId)
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
@@ -62,7 +62,7 @@ fun ElementLogoAtom(
         ElementLogoAtomSize.Large -> 110.dp
         ElementLogoAtomSize.Medium -> 83.5.dp
     }
-    val cornerRadius = when(size) {
+    val cornerRadius = when (size) {
         ElementLogoAtomSize.Large -> 44.dp
         ElementLogoAtomSize.Medium -> 33.dp
     }
@@ -125,9 +125,12 @@ internal fun ElementLogoAtomPreview() {
     ElementPreview {
         Box(
             Modifier
-                .size(170.dp)
-                .background(ElementTheme.colors.bgSubtlePrimary))
-        ElementLogoAtom(ElementLogoAtomSize.Large)
+                .size(180.dp)
+                .background(ElementTheme.colors.bgSubtlePrimary),
+            contentAlignment = Alignment.Center
+        ) {
+            ElementLogoAtom(ElementLogoAtomSize.Large)
+        }
     }
 }
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListOrganism.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListOrganism.kt
@@ -31,6 +31,7 @@ import io.element.android.libraries.designsystem.atomic.atoms.InfoListItemMolecu
 import io.element.android.libraries.designsystem.atomic.atoms.InfoListItemPosition
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.theme.ElementTheme
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -54,7 +55,13 @@ fun InfoListOrganism(
                 else -> InfoListItemPosition.Middle
             }
             InfoListItemMolecule(
-                message = { Text(item.message, style = textStyle) },
+                message = {
+                    Text(
+                        text = item.message,
+                        style = textStyle,
+                        color = ElementTheme.colors.textPrimary,
+                    )
+                },
                 icon = {
                     if (item.iconId != null) {
                         Icon(resourceId = item.iconId, contentDescription = null, tint = iconTint)
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
@@ -58,4 +58,9 @@ interface AnalyticsService: AnalyticsTracker, ErrorTracker {
      * To be called when a session is destroyed.
      */
     suspend fun onSignOut()
+
+    /**
+     * Reset the analytics service (will ask for user consent again).
+     */
+    suspend fun reset()
 }
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt
@@ -78,6 +78,10 @@ class DefaultAnalyticsService @Inject constructor(
         analyticsStore.setDidAskUserConsent()
     }
 
+    override suspend fun reset() {
+        analyticsStore.setDidAskUserConsent(false)
+    }
+
     override fun getAnalyticsId(): Flow<String> {
         return analyticsStore.analyticsIdFlow
     }
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.ftue.impl.welcome_null_DefaultGroup_WelcomeViewPreview-D-0_1_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.ftue.impl.welcome_null_DefaultGroup_WelcomeViewPreview-D-0_1_null,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76a68f2fc93894d6f9d9caea02546766c55664c0e53ba9506c6c32df058f5823
-size 303608
+oid sha256:16de62092834bf803c8165e974f45e14ccfc0128a3e74295a58eef965abc10c5
+size 301336
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.ftue.impl.welcome_null_DefaultGroup_WelcomeViewPreview-N-0_2_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.ftue.impl.welcome_null_DefaultGroup_WelcomeViewPreview-N-0_2_null,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f24bb3e40dd8c02037bd9d4523726ec0a0b1a283d23a8ca143973b0e9ee673c6
-size 408318
+oid sha256:6838e81cc5f2755ff76de7254e2c8bb445b76662d7ba9b4c83443b2c2ed03029
+size 406044
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.libraries.designsystem.atomic.atoms_null_DefaultGroup_ElementLogoAtomPreview-D_0_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.libraries.designsystem.atomic.atoms_null_DefaultGroup_ElementLogoAtomPreview-D_0_null,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2947531c19a0ac9a7e35c3f2a394f6eb805427e1ad296d22b7d8b5cbb2428e07
-size 20947
+oid sha256:2b19b24fc94f200579827f66557a183842d5234881ed84fe2b8b74d935b90666
+size 22697
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.libraries.designsystem.atomic.atoms_null_DefaultGroup_ElementLogoAtomPreview-N_1_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.libraries.designsystem.atomic.atoms_null_DefaultGroup_ElementLogoAtomPreview-N_1_null,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f88eb992060d5b41ce3200bdc48d4fe6accaeda857d1ca08cb65ed8235798f7
-size 20266
+oid sha256:e35ea20cabe37c05a594bce1b6b4a3c2175470408c18db25874ad5db088f733f
+size 21219

Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,8 @@ class FakeAnalyticsService(`
`67`	`67`
`68`	`68`	`override fun trackError(throwable: Throwable) {`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ override suspend fun reset() {`
	`72`	`+ didAskUserConsentFlow.value = false`
	`73`	`+ }`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ import kotlinx.coroutines.flow.StateFlow`
`20`	`20`
`21`	`21`	`interface FtueState {`
`22`	`22`	`val shouldDisplayFlow: StateFlow<Boolean>`
	`23`	`+`
	`24`	`+ suspend fun reset()`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,5 @@ package io.element.android.features.ftue.impl.welcome.state`
`19`	`19`	`interface WelcomeScreenState {`
`20`	`20`	`fun isWelcomeScreenNeeded(): Boolean`
`21`	`21`	`fun setWelcomeScreenShown()`
	`22`	`+ fun reset()`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,8 @@ class FakeWelcomeState : WelcomeScreenState {`
`27`	`27`	`override fun setWelcomeScreenShown() {`
`28`	`28`	`isWelcomeScreenNeeded = false`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ override fun reset() {`
	`32`	`+ isWelcomeScreenNeeded = true`
	`33`	`+ }`
`30`	`34`	`}`