Remove bad usage of ElementSurface

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

@@ -18,6 +18,7 @@ package io.element.android.x
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -25,7 +26,6 @@ import androidx.core.view.WindowCompat
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
 import io.element.android.libraries.architecture.bindings
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
 import io.element.android.libraries.designsystem.theme.ElementTheme
 import io.element.android.libraries.di.DaggerComponentOwner
 import io.element.android.x.di.AppBindings
@@ -41,7 +41,7 @@ class MainActivity : NodeComponentActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
             ElementTheme {
-                ElementSurface(
+                Box(
                     modifier = Modifier.fillMaxSize(),
                 ) {
                     NodeHost(integrationPoint = appyxIntegrationPoint) {

features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt

@@ -33,9 +33,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -58,7 +56,6 @@ import io.element.android.libraries.designsystem.theme.ElementTheme
 import io.element.android.libraries.designsystem.theme.components.ElementButton
 import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 
@@ -67,14 +64,11 @@ fun ChangeServerView(
     state: ChangeServerState,
     modifier: Modifier = Modifier,
     onChangeServerSuccess: () -> Unit = {},
-) {
-    ElementSurface(
-        modifier = modifier,
 ) {
     val eventSink = state.eventSink
     val scrollState = rememberScrollState()
     Box(
-            modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .systemBarsPadding()
             .imePadding()
@@ -182,7 +176,6 @@ fun ChangeServerView(
         }
     }
 }
-}
 
 @Composable
 @Preview

features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt

@@ -18,6 +18,7 @@
 
 package io.element.android.features.login.root
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -59,7 +60,6 @@ import io.element.android.libraries.designsystem.theme.ElementTheme
 import io.element.android.libraries.designsystem.theme.components.ElementButton
 import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
 import io.element.android.libraries.matrix.core.SessionId
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
@@ -73,11 +73,8 @@ fun LoginRootScreen(
     onLoginWithSuccess: (SessionId) -> Unit = {},
 ) {
     val eventSink = state.eventSink
-    ElementSurface(
-        modifier = modifier,
-    ) {
     Box(
-            modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .systemBarsPadding()
             .imePadding()
@@ -222,7 +219,6 @@ fun LoginRootScreen(
         }
     }
 }
-}
 
 @Composable
 @Preview

features/onboarding/src/main/kotlin/io/element/android/features/onboarding/OnBoardingScreen.kt

@@ -47,9 +47,7 @@ import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.HorizontalPagerIndicator
 import com.google.accompanist.pager.rememberPagerState
-import io.element.android.libraries.designsystem.theme.ElementTheme
 import io.element.android.libraries.designsystem.theme.components.ElementButton
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import kotlinx.coroutines.delay
@@ -67,12 +65,8 @@ fun OnBoardingScreen(
     val carrouselState = remember { SplashCarouselStateFactory().create() }
     val nbOfPages = carrouselState.items.size
     var key by remember { mutableStateOf(false) }
-    ElementSurface(
-        modifier = modifier,
-        color = ElementTheme.colors.background,
-    ) {
     Box(
-            modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .systemBarsPadding()
             .padding(vertical = 16.dp)
@@ -124,7 +118,6 @@ fun OnBoardingScreen(
         }
     }
 }
-}
 
 @Composable
 fun OnBoardingPage(

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt

@@ -51,7 +51,6 @@ import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.theme.components.ElementButton
 import io.element.android.libraries.designsystem.theme.components.ElementCircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.ElementOutlinedTextField
-import io.element.android.libraries.designsystem.theme.components.ElementSurface
 import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.ui.strings.R as StringR
 
@@ -70,11 +69,8 @@ fun BugReportView(
         }
         return
     }
-    ElementSurface(
-        modifier = modifier,
-    ) {
     Box(
-            modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .systemBarsPadding()
             .imePadding()
@@ -205,7 +201,6 @@ fun BugReportView(
         }
     }
 }
-}
 
 @Composable
 @Preview