diff options
Diffstat (limited to 'android-app/app')
5 files changed, 67 insertions, 24 deletions
diff --git a/android-app/app/src/main/res/layout/activity_main.xml b/android-app/app/src/main/res/layout/activity_main.xml index 1bb88b3..5f1c8c2 100644 --- a/android-app/app/src/main/res/layout/activity_main.xml +++ b/android-app/app/src/main/res/layout/activity_main.xml @@ -82,14 +82,14 @@ </androidx.constraintlayout.widget.ConstraintLayout> <!-- Collapsible Instrument Bottom Sheet --> - <androidx.cardview.widget.CardView + <com.google.android.material.card.MaterialCardView android:id="@+id/instrument_bottom_sheet" android:layout_width="match_parent" android:layout_height="wrap_content" app:behavior_hideable="false" app:behavior_peekHeight="120dp" app:cardElevation="16dp" - app:cardCornerRadius="24dp" + app:shapeAppearance="@style/ShapeAppearance.Nav.BottomSheet" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> <include @@ -97,7 +97,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - </androidx.cardview.widget.CardView> + </com.google.android.material.card.MaterialCardView> <!-- Record Track Button --> <com.google.android.material.floatingactionbutton.FloatingActionButton diff --git a/android-app/app/src/main/res/layout/layout_instruments_sheet.xml b/android-app/app/src/main/res/layout/layout_instruments_sheet.xml index edf0928..e14b468 100644 --- a/android-app/app/src/main/res/layout/layout_instruments_sheet.xml +++ b/android-app/app/src/main/res/layout/layout_instruments_sheet.xml @@ -159,9 +159,10 @@ </LinearLayout> - <!-- Animated wave divider --> + <!-- Animated wave divider — always ocean-coloured, never inverted --> <org.terst.nav.ui.WaveView android:id="@+id/wave_divider" + android:forceDarkAllowed="false" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginStart="-16dp" @@ -170,12 +171,13 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> - <!-- Forecast section (ocean) --> + <!-- Forecast section (ocean — intentionally always dark, do not invert) --> <LinearLayout android:id="@+id/forecast_row" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" + android:forceDarkAllowed="false" android:background="#0D2137" android:paddingTop="14dp" android:paddingBottom="20dp" diff --git a/android-app/app/src/main/res/values-night/colors.xml b/android-app/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..4d9faee --- /dev/null +++ b/android-app/app/src/main/res/values-night/colors.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <!-- M3 Dark Palette (night mode) --> + <color name="md_theme_primary">#A8C8FF</color> + <color name="md_theme_onPrimary">#00315E</color> + <color name="md_theme_primaryContainer">#004886</color> + <color name="md_theme_onPrimaryContainer">#D6E3FF</color> + + <color name="md_theme_secondary">#BBC7DB</color> + <color name="md_theme_onSecondary">#253140</color> + <color name="md_theme_secondaryContainer">#3B4858</color> + <color name="md_theme_onSecondaryContainer">#DAE2F9</color> + + <color name="md_theme_error">#FFB4AB</color> + <color name="md_theme_onError">#690005</color> + <color name="md_theme_errorContainer">#93000A</color> + <color name="md_theme_onErrorContainer">#FFDAD6</color> + + <color name="md_theme_background">#1C1B1F</color> + <color name="md_theme_onBackground">#E6E1E5</color> + <color name="md_theme_surface">#1C1B1F</color> + <color name="md_theme_onSurface">#E6E1E5</color> + <color name="md_theme_surfaceVariant">#49454F</color> + <color name="md_theme_onSurfaceVariant">#CAC4D0</color> + <color name="md_theme_outline">#938F99</color> + + <!-- Instrument: dark-mode values --> + <color name="instrument_text_normal">#E6E1E5</color> + <color name="instrument_text_secondary">#9A94A0</color> + <color name="instrument_background">#1C1B1F</color> + <color name="instrument_card_background">#2B2930</color> +</resources> diff --git a/android-app/app/src/main/res/values/colors.xml b/android-app/app/src/main/res/values/colors.xml index eb62cb2..a470c0c 100755 --- a/android-app/app/src/main/res/values/colors.xml +++ b/android-app/app/src/main/res/values/colors.xml @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- M3 Color Palette --> + <!-- M3 Color Palette (light mode — dark mode overrides in values-night/colors.xml) --> <color name="md_theme_primary">#005FB0</color> <color name="md_theme_onPrimary">#FFFFFF</color> <color name="md_theme_primaryContainer">#D6E3FF</color> <color name="md_theme_onPrimaryContainer">#001B3E</color> - + <color name="md_theme_secondary">#565F71</color> <color name="md_theme_onSecondary">#FFFFFF</color> <color name="md_theme_secondaryContainer">#DAE2F9</color> <color name="md_theme_onSecondaryContainer">#131C2C</color> - + <color name="md_theme_error">#BA1A1A</color> <color name="md_theme_onError">#FFFFFF</color> <color name="md_theme_errorContainer">#FFDAD6</color> <color name="md_theme_onErrorContainer">#410002</color> - - <color name="md_theme_background">#1C1B1F</color> - <color name="md_theme_onBackground">#E6E1E5</color> - <color name="md_theme_surface">#1C1B1F</color> - <color name="md_theme_onSurface">#E6E1E5</color> - <color name="md_theme_surfaceVariant">#49454F</color> - <color name="md_theme_onSurfaceVariant">#CAC4D0</color> - <color name="md_theme_outline">#938F99</color> + + <color name="md_theme_background">#FFFBFE</color> + <color name="md_theme_onBackground">#1C1B1F</color> + <color name="md_theme_surface">#FFFBFE</color> + <color name="md_theme_onSurface">#1C1B1F</color> + <color name="md_theme_surfaceVariant">#E7E0EB</color> + <color name="md_theme_onSurfaceVariant">#49454F</color> + <color name="md_theme_outline">#7A757F</color> <!-- Legacy / Functional Colors --> <color name="black">#FF000000</color> @@ -31,13 +31,13 @@ <color name="primary_dark">#002171</color> <color name="accent">#FF6D00</color> - <!-- Instrument Specific --> - <color name="instrument_text_normal">#E6E1E5</color> - <color name="instrument_text_secondary">#9A94A0</color> - <color name="instrument_text_alarm">#FF5449</color> - <color name="instrument_text_stale">#49454F</color> - <color name="instrument_background">#1C1B1F</color> - <color name="instrument_card_background">#2B2930</color> + <!-- Instrument Specific (light-mode values; dark overrides in values-night/) --> + <color name="instrument_text_normal">#1C1B1F</color> + <color name="instrument_text_secondary">#6F6878</color> + <color name="instrument_text_alarm">#BA1A1A</color> + <color name="instrument_text_stale">#9A94A0</color> + <color name="instrument_background">#FFFBFE</color> + <color name="instrument_card_background">#F2EDF7</color> <color name="mob_button_background">#BA1A1A</color> <color name="anchor_button_background">#005FB0</color> diff --git a/android-app/app/src/main/res/values/themes.xml b/android-app/app/src/main/res/values/themes.xml index 8baa509..a48a721 100755 --- a/android-app/app/src/main/res/values/themes.xml +++ b/android-app/app/src/main/res/values/themes.xml @@ -63,7 +63,7 @@ <style name="InstrumentUnit" parent="android:Widget.TextView"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textColor">#6B6070</item> + <item name="android:textColor">?attr/colorOnSurfaceVariant</item> <item name="android:textSize">@dimen/text_size_instrument_unit</item> <item name="android:textStyle">normal</item> <item name="android:layout_marginStart">2dp</item> @@ -119,6 +119,15 @@ <item name="android:layout_marginStart">4dp</item> </style> + <!-- Bottom sheet top-only rounded corners --> + <style name="ShapeAppearance.Nav.BottomSheet"> + <item name="cornerFamily">rounded</item> + <item name="cornerSizeTopLeft">24dp</item> + <item name="cornerSizeTopRight">24dp</item> + <item name="cornerSizeBottomLeft">0dp</item> + <item name="cornerSizeBottomRight">0dp</item> + </style> + <style name="InstrumentCard" parent="Widget.Material3.CardView.Elevated"> <item name="cardBackgroundColor">@color/instrument_card_background</item> <item name="cardCornerRadius">12dp</item> |