Code review fixes

Author: martenrebane

app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt

@@ -36,6 +36,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -91,7 +92,7 @@ fun InitScreen(
             Text(
                 text = stringResource(id = R.string.digidoc_all_caps),
                 style = MaterialTheme.typography.displayLarge,
-                color = MaterialTheme.colorScheme.onPrimary,
+                color = Color.White,
                 modifier =
                     modifier
                         .padding(bottom = LPadding)
@@ -111,7 +112,7 @@ fun InitScreen(
         Text(
             text = stringResource(id = R.string.ria),
             style = MaterialTheme.typography.displaySmall,
-            color = MaterialTheme.colorScheme.onPrimary,
+            color = Color.White,
             modifier =
                 modifier
                     .padding(bottom = MPadding)

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/LanguageButton.kt

@@ -30,7 +30,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -81,11 +81,9 @@ fun LanguageButton(
         shape = RectangleShape,
         onClick = onClickItem,
         colors =
-            ButtonColors(
+            ButtonDefaults.buttonColors(
                 containerColor = Color.Transparent,
-                contentColor = MaterialTheme.colorScheme.onPrimary,
-                disabledContainerColor = Color.Transparent,
-                disabledContentColor = Color.Transparent,
+                contentColor = Color.White
             ),
         contentPadding =
             PaddingValues(

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/PrimaryButton.kt

@@ -31,7 +31,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -85,23 +85,16 @@ fun PrimaryButton(
         contentPadding = PaddingValues(zeroPadding),
         enabled = enabled,
         colors =
-            ButtonColors(
+            ButtonDefaults.buttonColors(
                 containerColor = containerColor,
                 contentColor = contentColor,
-                disabledContainerColor = MaterialTheme.colorScheme.background,
-                disabledContentColor = MaterialTheme.colorScheme.tertiary,
             ),
         border =
             if (isSubButton) {
                 BorderStroke(
                     width = SBorder,
                     color = contentColor,
                 )
-            } else if (!enabled) {
-                BorderStroke(
-                    width = SBorder,
-                    color = MaterialTheme.colorScheme.tertiary,
-                )
             } else {
                 BorderStroke(noBorderStroke, Transparent)
             },

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/PrimaryOutlinedButton.kt

@@ -32,7 +32,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
@@ -91,11 +91,9 @@ fun PrimaryOutlinedButton(
         contentPadding = PaddingValues(zeroPadding),
         enabled = enabled,
         colors =
-            ButtonColors(
+            ButtonDefaults.buttonColors(
                 containerColor = containerColor,
                 contentColor = contentColor,
-                disabledContainerColor = MaterialTheme.colorScheme.background,
-                disabledContentColor = MaterialTheme.colorScheme.tertiary,
             ),
         onClick = onClickItem,
     ) {

app/src/main/kotlin/ee/ria/DigiDoc/ui/theme/Theme.kt

@@ -69,7 +69,7 @@ private val DarkColorScheme =
         outlineVariant = DarkOutlineVariant,
         surface = DarkSurface,
         surfaceContainer = DarkSurfaceContainer,
-        surfaceContainerLowest = DarkSurfaceContainerLow,
+        surfaceContainerLowest = DarkSurfaceContainerLowest,
         surfaceContainerLow = DarkSurfaceContainerLow,
         surfaceContainerHigh = DarkSurfaceContainerHigh,
         surfaceContainerHighest = DarkSurfaceContainerHighest,
@@ -99,7 +99,7 @@ private val LightColorScheme =
         outlineVariant = LightOutlineVariant,
         surface = LightSurface,
         surfaceContainer = LightSurfaceContainer,
-        surfaceContainerLowest = LightSurfaceContainerLow,
+        surfaceContainerLowest = LightSurfaceContainerLowest,
         surfaceContainerLow = LightSurfaceContainerLow,
         surfaceContainerHigh = LightSurfaceContainerHigh,
         surfaceContainerHighest = LightSurfaceContainerHighest,