Fix theming dark/light

app/src/main/java/io/element/android/x/MainActivity.kt

@@ -6,10 +6,8 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.rememberNavHostEngine
 import io.element.android.x.designsystem.ElementXTheme
@@ -23,7 +21,7 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            ElementXTheme(darkTheme = false) {
+            ElementXTheme {
                 MainScreen(viewModel = viewModel)
             }
         }

features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListScreen.kt

@@ -28,7 +28,6 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.compose.collectAsState
 import com.airbnb.mvrx.compose.mavericksViewModel
 import io.element.android.x.core.data.LogCompositions
-import io.element.android.x.designsystem.LightGrey
 import io.element.android.x.features.roomlist.model.MatrixUser
 import io.element.android.x.features.roomlist.model.RoomListRoomSummary
 import io.element.android.x.features.roomlist.model.RoomListViewState
@@ -141,28 +140,27 @@ private fun RoomItem(
                 Text(
                     fontSize = 16.sp,
                     fontWeight = FontWeight.Bold,
-                    color = Color.Black,
                     text = room.name,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
                 Text(
                     text = room.lastMessage?.toString().orEmpty(),
-                    color = LightGrey,
+                    color = MaterialTheme.colorScheme.secondary,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
             }
             Column(
-                Modifier.padding(horizontal = 8.dp)
             ) {
                 Text(
                     fontSize = 12.sp,
                     text = room.timestamp ?: "",
-                    color = LightGrey,
+                    color = MaterialTheme.colorScheme.secondary,
                 )
                 Spacer(modifier.size(4.dp))
-                val unreadIndicatorColor = if(room.hasUnread) Color.Black else Color.Transparent
+                val unreadIndicatorColor =
+                    if (room.hasUnread) MaterialTheme.colorScheme.primary else Color.Transparent
                 Box(
                     modifier = Modifier
                         .size(12.dp)

libraries/designsystem/src/main/java/io/element/android/x/designsystem/Color.kt

@@ -2,12 +2,5 @@ package io.element.android.x.designsystem
 
 import androidx.compose.ui.graphics.Color
 
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
-
 val LightGrey = Color(0x993C3C43)
+val DarkGrey = Color(0x99EBEBF5)

libraries/designsystem/src/main/java/io/element/android/x/designsystem/Theme.kt

@@ -6,21 +6,30 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
+    primary = Color.White,
+    secondary = DarkGrey,
+    tertiary = Color.White,
+    background = Color.Black,
+    onBackground = Color.White,
+    surface = Color.Black,
+    onSurface = Color.White
 )
 
 private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
+    primary = Color.Black,
+    secondary = LightGrey,
+    tertiary = Color.Black,
+    background = Color.White,
+    onBackground = Color.Black,
+    surface = Color.White,
+    onSurface = Color.Black
 
     /* Other default colors to override
     background = Color(0xFFFFFBFE),
@@ -33,6 +42,7 @@ private val LightColorScheme = lightColorScheme(
     */
 )
 
+
 @Composable
 fun ElementXTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),