fix: bring back blue theme and design tweaks

This commit is contained in:
Infi 2023-02-17 22:29:10 +01:00
parent 2b83dd95ca
commit c8242507b3
4 changed files with 10 additions and 25 deletions

View File

@ -7,6 +7,7 @@
</inspection_tool> </inspection_tool>
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true"> <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" /> <option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true"> <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" /> <option name="composableFile" value="true" />
@ -14,6 +15,7 @@
</inspection_tool> </inspection_tool>
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true"> <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" /> <option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true"> <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" /> <option name="composableFile" value="true" />
@ -29,6 +31,7 @@
</inspection_tool> </inspection_tool>
<inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true"> <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" /> <option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true"> <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" /> <option name="composableFile" value="true" />

View File

@ -1,6 +1,5 @@
package chat.revolt.components.generic package chat.revolt.components.generic
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -30,7 +29,6 @@ fun SheetClickable(
Row( Row(
modifier = Modifier modifier = Modifier
.clip(MaterialTheme.shapes.medium) .clip(MaterialTheme.shapes.medium)
.background(MaterialTheme.colorScheme.background)
.clickable(onClick = onClick) .clickable(onClick = onClick)
.padding(all = 4.dp) .padding(all = 4.dp)
.fillMaxWidth() .fillMaxWidth()

View File

@ -1,7 +1,6 @@
package chat.revolt.screens.settings package chat.revolt.screens.settings
import android.widget.Toast import android.widget.Toast
import androidx.compose.foundation.background
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
@ -13,11 +12,9 @@ import androidx.compose.material3.Text
import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
@ -78,25 +75,12 @@ fun AppearanceSettingsScreen(
modifier = Modifier.padding(bottom = 10.dp) 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( FlowRow(
mainAxisSpacing = 10.dp, mainAxisSpacing = 10.dp,
crossAxisSpacing = 10.dp, crossAxisSpacing = 10.dp,
) { ) {
ThemeChip( ThemeChip(
color = Color(0xff1e1e1e), color = Color(0xff1c243c),
text = stringResource(id = R.string.settings_appearance_theme_revolt), text = stringResource(id = R.string.settings_appearance_theme_revolt),
selected = GlobalState.theme == Theme.Revolt, selected = GlobalState.theme == Theme.Revolt,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
@ -123,7 +107,7 @@ fun AppearanceSettingsScreen(
} }
ThemeChip( 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), text = stringResource(id = R.string.settings_appearance_theme_none),
selected = GlobalState.theme == Theme.None, selected = GlobalState.theme == Theme.None,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),

View File

@ -18,13 +18,13 @@ val RevoltColorScheme = darkColorScheme(
onPrimary = Color(0xffffffff), onPrimary = Color(0xffffffff),
secondary = Color(0xffe96a7a), secondary = Color(0xffe96a7a),
onSecondary = Color(0xffffffff), onSecondary = Color(0xffffffff),
background = Color(0xff121212), background = Color(0xff131722),
onBackground = Color(0xffffffff), onBackground = Color(0xffffffff),
surfaceVariant = Color(0xff1e1e1e), surfaceVariant = Color(0xff191f30),
onSurfaceVariant = Color(0xffffffff), onSurfaceVariant = Color(0xffffffff),
surface = Color(0xff2b2b2b), surface = Color(0xff1c243c),
onSurface = Color(0xffffffff), onSurface = Color(0xffffffff),
surfaceTint = Color(0xffc0c0c0), surfaceTint = Color(0xff5658b9),
) )
val AmoledColorScheme = RevoltColorScheme.copy( val AmoledColorScheme = RevoltColorScheme.copy(
@ -47,7 +47,7 @@ val LightColorScheme = lightColorScheme(
onSurfaceVariant = Color(0xff000000), onSurfaceVariant = Color(0xff000000),
surface = Color(0xfff5f5f5), surface = Color(0xfff5f5f5),
onSurface = Color(0xff000000), onSurface = Color(0xff000000),
surfaceTint = Color(0xff000000), surfaceTint = Color(0xff5658b9),
) )
enum class Theme { enum class Theme {