denozord/strongswan-ext
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: drop reui palette, align splash/window/system bars with Compose surface

Browse Source 
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
DenozordecandClaude Opus 5.5 committed 2026-10-09 23:39:35 +07:00
1 parent fda3ec158c
commit 5f6726f173
3 files changed
+49 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/frontends/android/app/src/main/res/values-night/colors.xml
+13 -18
View File
@@ -1,21 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- ReUI-like semantic tokens (dark). -->
<color name="reui_background">#0A0A0A</color>
<color name="splash_background">#17171A</color>
<color name="reui_foreground">#FAFAFA</color>
<color name="reui_muted">#A3A3A3</color>
<color name="reui_muted_bg">#262626</color>
<color name="reui_border">#333333</color>
<color name="reui_frame">#171717</color>
<color name="reui_primary">#FAFAFA</color>
<color name="reui_on_primary">#171717</color>
<color name="reui_success">#4ADE80</color>
<color name="reui_success_bg">#14532D</color>
<color name="reui_warning">#FBBF24</color>
<color name="reui_warning_bg">#78350F</color>
<color name="reui_destructive">#F87171</color>
<color name="reui_destructive_bg">#7F1D1D</color>
<color name="reui_info">#60A5FA</color>
<color name="reui_info_bg">#1E3A8A</color>
<!-- Mirrors the Compose scheme in ui/compose/theme/ShxTheme.kt (dark). -->
<color name="shx_primary">#9C7CFF</color>
<color name="shx_on_primary">#150F35</color>
<color name="shx_surface">#141318</color>
<color name="shx_on_surface">#E5E1E9</color>
<color name="shx_outline">#48454E</color>
<color name="shx_error">#FF8A8C</color>
<color name="shx_on_error">#490005</color>
<color name="splash_background">@color/shx_surface</color>
<color name="error_text">#F87171</color>
<color name="warning_text">#FBBF24</color>
<color name="success_text">#28A671</color>
</resources>
src/frontends/android/app/src/main/res/values/colors.xml
+14 -28
View File
@@ -1,32 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- ReUI-like semantic tokens (light). Aliases keep existing resource names. -->
<color name="reui_background">#FAFAFA</color>
<color name="splash_background">#F7F7F8</color>
<color name="reui_foreground">#0A0A0A</color>
<color name="reui_muted">#737373</color>
<color name="reui_muted_bg">#F5F5F5</color>
<color name="reui_border">#E5E5E5</color>
<color name="reui_frame">#FFFFFF</color>
<color name="reui_primary">#171717</color>
<color name="reui_on_primary">#FAFAFA</color>
<color name="reui_success">#15803D</color>
<color name="reui_success_bg">#DCFCE7</color>
<color name="reui_warning">#B45309</color>
<color name="reui_warning_bg">#FEF3C7</color>
<color name="reui_destructive">#DC2626</color>
<color name="reui_destructive_bg">#FEE2E2</color>
<color name="reui_info">#1D4ED8</color>
<color name="reui_info_bg">#DBEAFE</color>
<!-- Mirrors the Compose scheme in ui/compose/theme/ShxTheme.kt (light), so the
splash, window background and system bars match the first Compose frame. -->
<color name="shx_primary">#6D4AFF</color>
<color name="shx_on_primary">#FFFFFF</color>
<color name="shx_surface">#FCF8FF</color>
<color name="shx_on_surface">#1C1B20</color>
<color name="shx_outline">#C9C5D0</color>
<color name="shx_error">#D8303C</color>
<color name="shx_on_error">#FFFFFF</color>
<color name="splash_background">@color/shx_surface</color>
<color name="accent">@color/reui_primary</color>
<color name="primary">@color/reui_primary</color>
<color name="primary_dark">@color/reui_foreground</color>
<color name="error_text">@color/reui_destructive</color>
<color name="warning_text">@color/reui_warning</color>
<color name="success_text">@color/reui_success</color>
<color name="panel_background">@color/reui_frame</color>
<color name="panel_separator">@color/reui_border</color>
<color name="checked">@color/reui_muted_bg</color>
<color name="pressed">@color/reui_muted_bg</color>
<!-- Notification accent colors (CharonVpnService) -->
<color name="error_text">#DC2626</color>
<color name="warning_text">#B45309</color>
<color name="success_text">#148A45</color>
</resources>
src/frontends/android/app/src/main/res/values/styles.xml
+22 -22
View File
@@ -2,39 +2,39 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="ApplicationTheme" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/reui_primary</item>
<item name="colorOnPrimary">@color/reui_on_primary</item>
<item name="colorSecondary">@color/reui_muted</item>
<item name="colorOnSecondary">@color/reui_foreground</item>
<item name="colorSurface">@color/reui_background</item>
<item name="colorOnSurface">@color/reui_foreground</item>
<item name="colorError">@color/reui_destructive</item>
<item name="colorOnError">@color/reui_on_primary</item>
<item name="android:colorBackground">@color/reui_background</item>
<item name="colorOnBackground">@color/reui_foreground</item>
<item name="colorOutline">@color/reui_border</item>
<item name="android:statusBarColor">@color/reui_background</item>
<item name="android:navigationBarColor">@color/reui_background</item>
<item name="android:windowBackground">@color/reui_background</item>
<item name="colorAccent">@color/reui_primary</item>
<item name="colorPrimaryDark">@color/reui_foreground</item>
<item name="colorPrimary">@color/shx_primary</item>
<item name="colorOnPrimary">@color/shx_on_primary</item>
<item name="colorSecondary">@color/shx_primary</item>
<item name="colorOnSecondary">@color/shx_on_primary</item>
<item name="colorSurface">@color/shx_surface</item>
<item name="colorOnSurface">@color/shx_on_surface</item>
<item name="colorError">@color/shx_error</item>
<item name="colorOnError">@color/shx_on_error</item>
<item name="android:colorBackground">@color/shx_surface</item>
<item name="colorOnBackground">@color/shx_on_surface</item>
<item name="colorOutline">@color/shx_outline</item>
<item name="android:statusBarColor">@color/shx_surface</item>
<item name="android:navigationBarColor">@color/shx_surface</item>
<item name="android:windowBackground">@color/shx_surface</item>
<item name="colorAccent">@color/shx_primary</item>
<item name="colorPrimaryDark">@color/shx_on_surface</item>
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="android:windowLightStatusBar">@bool/window_light_status_bar</item>
</style>
<style name="ApplicationTheme.ActionBar" parent="Theme.Material3.DayNight">
<item name="colorPrimary">@color/reui_primary</item>
<item name="colorOnPrimary">@color/reui_on_primary</item>
<item name="android:statusBarColor">@color/reui_background</item>
<item name="android:navigationBarColor">@color/reui_background</item>
<item name="android:windowBackground">@color/reui_background</item>
<item name="colorPrimary">@color/shx_primary</item>
<item name="colorOnPrimary">@color/shx_on_primary</item>
<item name="android:statusBarColor">@color/shx_surface</item>
<item name="android:navigationBarColor">@color/shx_surface</item>
<item name="android:windowBackground">@color/shx_surface</item>
<item name="android:windowLightStatusBar">@bool/window_light_status_bar</item>
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
</style>
<style name="AlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="colorAccent">@color/reui_primary</item>
<item name="colorAccent">@color/shx_primary</item>
</style>
<style name="ShxSplashTheme" parent="Theme.SplashScreen">