From c8242507b37c0f8c31a11375fe3c2741d312ff37 Mon Sep 17 00:00:00 2001
From: Infi <infi@infi.sh>
Date: Fri, 17 Feb 2023 22:29:10 +0100
Subject: [PATCH] fix: bring back blue theme and design tweaks

---
 .idea/inspectionProfiles/Project_Default.xml  |  3 +++
 .../components/generic/SheetClickable.kt      |  2 --
 .../settings/AppearanceSettingsScreen.kt      | 20 ++-----------------
 .../main/java/chat/revolt/ui/theme/Theme.kt   | 10 +++++-----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 12731b42..44ca2d9b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -7,6 +7,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
@@ -14,6 +15,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
@@ -29,6 +31,7 @@
     </inspection_tool>
     <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
diff --git a/app/src/main/java/chat/revolt/components/generic/SheetClickable.kt b/app/src/main/java/chat/revolt/components/generic/SheetClickable.kt
index 0e771b3d..0f362b2d 100644
--- a/app/src/main/java/chat/revolt/components/generic/SheetClickable.kt
+++ b/app/src/main/java/chat/revolt/components/generic/SheetClickable.kt
@@ -1,6 +1,5 @@
 package chat.revolt.components.generic
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -30,7 +29,6 @@ fun SheetClickable(
         Row(
             modifier = Modifier
                 .clip(MaterialTheme.shapes.medium)
-                .background(MaterialTheme.colorScheme.background)
                 .clickable(onClick = onClick)
                 .padding(all = 4.dp)
                 .fillMaxWidth()
diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
index 7779d379..05e787fd 100644
--- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
@@ -1,7 +1,6 @@
 package chat.revolt.screens.settings
 
 import android.widget.Toast
-import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -13,11 +12,9 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -78,25 +75,12 @@ fun AppearanceSettingsScreen(
                 modifier = Modifier.padding(bottom = 10.dp)
             )
 
-            Text(
-                text = "old revolt blue will come back soon i promise, needs a bit of optimisation first 🐈",
-                style = MaterialTheme.typography.headlineMedium.copy(
-                    color = MaterialTheme.colorScheme.background,
-                    fontWeight = FontWeight.Bold
-                ),
-                modifier = Modifier
-                    .padding(bottom = 10.dp)
-                    .clip(MaterialTheme.shapes.medium)
-                    .background(MaterialTheme.colorScheme.primary)
-                    .padding(10.dp)
-            )
-
             FlowRow(
                 mainAxisSpacing = 10.dp,
                 crossAxisSpacing = 10.dp,
             ) {
                 ThemeChip(
-                    color = Color(0xff1e1e1e),
+                    color = Color(0xff1c243c),
                     text = stringResource(id = R.string.settings_appearance_theme_revolt),
                     selected = GlobalState.theme == Theme.Revolt,
                     modifier = Modifier.weight(1f),
@@ -123,7 +107,7 @@ fun AppearanceSettingsScreen(
                 }
 
                 ThemeChip(
-                    color = if (isSystemInDarkTheme()) Color(0xff1e1e1e) else Color(0xfff7f7f7),
+                    color = if (isSystemInDarkTheme()) Color(0xff1c243c) else Color(0xfff7f7f7),
                     text = stringResource(id = R.string.settings_appearance_theme_none),
                     selected = GlobalState.theme == Theme.None,
                     modifier = Modifier.weight(1f),
diff --git a/app/src/main/java/chat/revolt/ui/theme/Theme.kt b/app/src/main/java/chat/revolt/ui/theme/Theme.kt
index 5790f111..2992b858 100644
--- a/app/src/main/java/chat/revolt/ui/theme/Theme.kt
+++ b/app/src/main/java/chat/revolt/ui/theme/Theme.kt
@@ -18,13 +18,13 @@ val RevoltColorScheme = darkColorScheme(
     onPrimary = Color(0xffffffff),
     secondary = Color(0xffe96a7a),
     onSecondary = Color(0xffffffff),
-    background = Color(0xff121212),
+    background = Color(0xff131722),
     onBackground = Color(0xffffffff),
-    surfaceVariant = Color(0xff1e1e1e),
+    surfaceVariant = Color(0xff191f30),
     onSurfaceVariant = Color(0xffffffff),
-    surface = Color(0xff2b2b2b),
+    surface = Color(0xff1c243c),
     onSurface = Color(0xffffffff),
-    surfaceTint = Color(0xffc0c0c0),
+    surfaceTint = Color(0xff5658b9),
 )
 
 val AmoledColorScheme = RevoltColorScheme.copy(
@@ -47,7 +47,7 @@ val LightColorScheme = lightColorScheme(
     onSurfaceVariant = Color(0xff000000),
     surface = Color(0xfff5f5f5),
     onSurface = Color(0xff000000),
-    surfaceTint = Color(0xff000000),
+    surfaceTint = Color(0xff5658b9),
 )
 
 enum class Theme {