Merge remote-tracking branch 'origin/master'

app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt

@@ -4,11 +4,14 @@ import androidx.compose.ui.graphics.Color
 
 val Black100 = Color(0xFF000000)
 val Black90 = Color(0xFF1F1F1F)
-val Black70 = Color(0xFF333333)
+val Black80 = Color(0xFF333333)
+val Black70 = Color(0xFF4B4B4B)
 
 val White100 = Color(0xFFFFFFFF)
 val White90 = Color(0xFFEBEBEB)
-val White70 = Color(0xFFD3D3D3)
+val White80 = Color(0xFFD3D3D3)
+val White70 = Color(0xFFBBBBBB)
+
 
 val TextOnColouredButton = Color(0xFF121212)
 val MiddleColor = Color(0xFF808080)
@@ -16,4 +19,7 @@ val MiddleColor = Color(0xFF808080)
 val dismissLight = Color(0xFF536DFE)
 val dismissDark = Color(0xFF448AFF)
 
+val InputPrimaryColor = Color(0xFF3F57E0)
+val InputSecondaryColor = Color(0x7E4154FF)
+
 val testColor = Color(0xFF00FF00)

app/src/main/java/com/schoolapp/cleverclass/ui/theme/Theme.kt

@@ -18,21 +18,23 @@ import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
     background = Black90,
-    primaryContainer = Black70,
+    primaryContainer = Black80,
+    secondaryContainer = Black70,
     onPrimaryContainer = White100,
     secondary = dismissDark,
     onBackground = White100,
-    outlineVariant = Black70,
+    outlineVariant = Black80,
     primary = Color(0xFF536DFE)
 )
 
 private val LightColorScheme = lightColorScheme(
     background = White90,
-    primaryContainer = White70,
+    primaryContainer = White80,
+    secondaryContainer = White70,
     onPrimaryContainer = Black100,
     secondary = dismissLight,
     onBackground = Black100,
-    outlineVariant = White70,
+    outlineVariant = White80,
     primary = Color(0xFF8396FF)
 )
 
@@ -56,7 +58,7 @@ fun CleverClassTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = Black70.toArgb()
+            window.statusBarColor = Black80.toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
         }
     }