diff options
Diffstat (limited to 'android-app/app/src/main/res/layout')
| -rw-r--r-- | android-app/app/src/main/res/layout/activity_main.xml | 6 | ||||
| -rw-r--r-- | android-app/app/src/main/res/layout/layout_instruments_sheet.xml | 6 |
2 files changed, 7 insertions, 5 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" |