diff options
Diffstat (limited to 'android-app/app/src/main/res')
4 files changed, 66 insertions, 20 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 ed1b7ce..99aa192 100644 --- a/android-app/app/src/main/res/layout/activity_main.xml +++ b/android-app/app/src/main/res/layout/activity_main.xml @@ -126,7 +126,7 @@ android:layout_height="wrap_content" app:behavior_hideable="false" app:behavior_peekHeight="120dp" - app:cardElevation="16dp" + app:cardElevation="4dp" app:strokeWidth="0dp" app:shapeAppearance="@style/ShapeAppearance.Nav.BottomSheet" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> diff --git a/android-app/app/src/main/res/layout/fragment_safety.xml b/android-app/app/src/main/res/layout/fragment_safety.xml index 78f8754..4a8efa9 100644 --- a/android-app/app/src/main/res/layout/fragment_safety.xml +++ b/android-app/app/src/main/res/layout/fragment_safety.xml @@ -4,7 +4,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorSurface"> + android:background="?attr/colorSurface" + android:clipToPadding="false" + android:paddingBottom="80dp"> <LinearLayout android:layout_width="match_parent" @@ -179,6 +181,7 @@ android:layout_marginEnd="8dp"> <TextView + android:id="@+id/tv_anchor_depth_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/anchor_depth_label" @@ -203,6 +206,7 @@ android:layout_marginStart="8dp"> <TextView + android:id="@+id/tv_anchor_rode_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/anchor_rode_label" diff --git a/android-app/app/src/main/res/layout/fragment_voice_log.xml b/android-app/app/src/main/res/layout/fragment_voice_log.xml index b1c440c..cacc6d6 100644 --- a/android-app/app/src/main/res/layout/fragment_voice_log.xml +++ b/android-app/app/src/main/res/layout/fragment_voice_log.xml @@ -3,7 +3,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:clipToPadding="false" + android:paddingBottom="80dp"> <LinearLayout android:layout_width="match_parent" @@ -11,13 +13,12 @@ android:orientation="vertical" android:padding="20dp"> - <!-- ── Log entry section — visible only while recording ── --> + <!-- ── Log entry section ── --> <LinearLayout android:id="@+id/layout_log_entry" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> + android:orientation="vertical"> <TextView android:layout_width="wrap_content" diff --git a/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml b/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml index ce52108..b7cf00e 100644 --- a/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml +++ b/android-app/app/src/main/res/layout/layout_layer_picker_sheet.xml @@ -51,7 +51,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -81,7 +81,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -111,7 +111,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -141,7 +141,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -196,7 +196,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -225,7 +225,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -254,7 +254,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -308,7 +308,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -337,7 +337,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -366,7 +366,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -420,7 +420,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -449,7 +449,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -503,7 +503,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" - app:layout_columnWeight="1" + android:layout_columnWeight="1" app:cardCornerRadius="12dp" app:strokeWidth="0dp"> <LinearLayout @@ -658,7 +658,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:layout_marginBottom="10dp"> <TextView android:layout_width="0dp" android:layout_height="wrap_content" @@ -693,5 +694,45 @@ </com.google.android.material.chip.ChipGroup> </LinearLayout> + <!-- Distance --> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical"> + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="Distance" + android:textSize="14sp" + android:textColor="@color/instrument_text_normal" /> + <com.google.android.material.chip.ChipGroup + android:id="@+id/chip_group_distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:singleSelection="true" + app:selectionRequired="true"> + <com.google.android.material.chip.Chip + android:id="@+id/chip_nm" + style="@style/Widget.Material3.Chip.Filter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="nm" /> + <com.google.android.material.chip.Chip + android:id="@+id/chip_km" + style="@style/Widget.Material3.Chip.Filter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="km" /> + <com.google.android.material.chip.Chip + android:id="@+id/chip_mi" + style="@style/Widget.Material3.Chip.Filter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="mi" /> + </com.google.android.material.chip.ChipGroup> + </LinearLayout> + </LinearLayout> </androidx.core.widget.NestedScrollView> |