diff options
Diffstat (limited to 'android-app/app/src/main')
| -rw-r--r-- | android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt | 8 | ||||
| -rw-r--r-- | android-app/app/src/main/res/layout/layout_instruments_sheet.xml | 57 |
2 files changed, 5 insertions, 60 deletions
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt index bc9c7e5..6197475 100644 --- a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt +++ b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt @@ -92,14 +92,6 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener { setupHandlers() setupMap() - findViewById<MaterialButton>(R.id.btn_nav_pretrip).setOnClickListener { - showReport(org.terst.nav.tripreport.PreTripReportFragment()) - } - - findViewById<MaterialButton>(R.id.btn_nav_tripreport).setOnClickListener { - showReport(org.terst.nav.tripreport.TripReportFragment()) - } - fabRecordTrack.setOnClickListener { if (viewModel.isRecording.value) viewModel.stopTrack() else viewModel.startTrack() } 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 16410c0..8c41ff3 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 @@ -5,7 +5,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:background="?attr/colorSurface"> + android:background="?attr/colorSurface" + android:clickable="true" + android:focusable="true"> <View android:id="@+id/drag_handle" @@ -159,7 +161,8 @@ android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="@id/label_conditions" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent"> <LinearLayout android:layout_width="0dp" @@ -196,55 +199,5 @@ </LinearLayout> - <!-- Reports Section --> - <View - android:id="@+id/reports_divider" - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="@color/md_theme_outline" - android:layout_marginTop="20dp" - app:layout_constraintTop_toBottomOf="@id/conditions_row" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> - - <TextView - android:id="@+id/label_reports" - style="@style/InstrumentLabel" - android:text="TRIP REPORTS & PLANNING" - android:layout_marginTop="12dp" - app:layout_constraintTop_toBottomOf="@id/reports_divider" - app:layout_constraintStart_toStartOf="parent" /> - - <LinearLayout - android:id="@+id/reports_row" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginTop="12dp" - app:layout_constraintTop_toBottomOf="@id/label_reports" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"> - - <com.google.android.material.button.MaterialButton - android:id="@+id/btn_nav_pretrip" - style="@style/Widget.Material3.Button.TonalButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="PRE-TRIP PLAN" - android:layout_marginEnd="8dp" - android:textSize="12sp" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/btn_nav_tripreport" - style="@style/Widget.Material3.Button.TonalButton" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="GENERATE REPORT" - android:textSize="12sp" /> - - </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout> |