Use light colors even in dark mode

Signed-off-by: Percy Wegmann <percy@tailscale.com>
ox/styling_bak
Percy Wegmann 7 months ago
parent ed45a7650c
commit 7e5625d30c
No known key found for this signature in database
GPG Key ID: 29D8CDEB4C13D48B

@ -48,6 +48,12 @@
<intent-filter> <intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" /> <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tailscale" />
</intent-filter>
</activity> </activity>
<activity <activity
android:name="ShareActivity" android:name="ShareActivity"

@ -14,7 +14,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.TopAppBarColors import androidx.compose.material3.TopAppBarColors
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.Typography import androidx.compose.material3.Typography
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.lightColorScheme import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
@ -24,12 +23,7 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
@Composable @Composable
fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) { fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) {
val colors = val colors = LightColors
if (!useDarkTheme) {
LightColors
} else {
DarkColors
}
val typography = val typography =
Typography( Typography(
@ -83,16 +77,6 @@ private val LightColors =
scrim = Color(0xFF000000), // black scrim = Color(0xFF000000), // black
) )
private val DarkColors =
darkColorScheme(
primary = Color(0xFFFAF9F8),
onPrimary = Color(0xFFAFACAB),
secondary = Color(0xFF232222),
onSecondary = Color(0xFF2E2D2D),
secondaryContainer = Color(0xFF4B70CC),
surface = Color(0xFF33C27F),
)
val ColorScheme.warning: Color val ColorScheme.warning: Color
get() = Color(0xFFD97916) // yellow-300 get() = Color(0xFFD97916) // yellow-300

@ -85,7 +85,7 @@
<string name="logout_failed">Unable to logout at this time. Please try again.</string> <string name="logout_failed">Unable to logout at this time. Please try again.</string>
<string name="error">Error</string> <string name="error">Error</string>
<string name="accounts">Accounts</string> <string name="accounts">Accounts</string>
<string name="add_account">Add Another Account…</string> <string name="add_account">Add another account…</string>
<string name="reauthenticate">Reauthenticate</string> <string name="reauthenticate">Reauthenticate</string>
<string name="switch_user_failed">Unable to switch users. Please try again.</string> <string name="switch_user_failed">Unable to switch users. Please try again.</string>
<string name="add_profile_failed">Unable to add a new profile. Please try again.</string> <string name="add_profile_failed">Unable to add a new profile. Please try again.</string>

Loading…
Cancel
Save