From 14e108b6c46e27b943421ee0c32d1ff2f6da4f4e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 15:22:55 +0100
Subject: [PATCH] Simpler code

---
 .../features/signedout/impl/SignedOutView.kt  | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
index 5732346220..8efabcf945 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
@@ -17,13 +17,11 @@
 package io.element.android.features.signedout.impl
 
 import androidx.activity.compose.BackHandler
-import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountCircle
@@ -41,7 +39,6 @@ import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
-import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.theme.ElementTheme
@@ -95,38 +92,24 @@ private fun SignedOutContent(
             items = persistentListOf(
                 InfoListItem(
                     message = stringResource(id = R.string.screen_signed_out_reason_1),
-                    iconComposable = { Icon(CommonDrawables.ic_lock_outline) },
+                    iconId = CommonDrawables.ic_lock_outline,
                 ),
                 InfoListItem(
                     message = stringResource(id = R.string.screen_signed_out_reason_2),
-                    iconComposable = { Icon(CommonDrawables.ic_devices) },
+                    iconId = CommonDrawables.ic_devices,
                 ),
                 InfoListItem(
                     message = stringResource(id = R.string.screen_signed_out_reason_3),
-                    iconComposable = { Icon(CommonDrawables.ic_do_disturb_alt) },
+                    iconId = CommonDrawables.ic_do_disturb_alt,
                 ),
             ),
             textStyle = ElementTheme.typography.fontBodyMdMedium,
-            iconTint = ElementTheme.colors.textPrimary,
+            iconTint = ElementTheme.colors.iconSecondary,
             backgroundColor = ElementTheme.colors.temporaryColorBgSpecial
         )
     }
 }
 
-@Composable
-private fun Icon(
-    @DrawableRes iconResourceId: Int,
-    modifier: Modifier = Modifier,
-) {
-    Icon(
-        modifier = modifier
-            .size(20.dp),
-        resourceId = iconResourceId,
-        contentDescription = null,
-        tint = ElementTheme.colors.iconSecondary,
-    )
-}
-
 @Composable
 private fun SignedOutFooter(
     modifier: Modifier = Modifier,