diff options
Diffstat (limited to 'android-app/app/build/intermediates/packaged_res/debug')
2 files changed, 114 insertions, 14 deletions
diff --git a/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml b/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml index 746fe32..54ad0cd 100644 --- a/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml +++ b/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml @@ -227,6 +227,51 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" /> + <!-- Barometer Instrument --> + <TextView + android:id="@+id/label_barometer" + style="@style/InstrumentLabel" + android:text="@string/instrument_label_barometer" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/value_vmg" + app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33" + app:layout_constraintHorizontal_bias="0.5" /> + <TextView + android:id="@+id/value_baro" + style="@style/InstrumentPrimaryValue" + tools:text="1013.2" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/label_barometer" + app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33" + app:layout_constraintHorizontal_bias="0.5" /> + <TextView + android:id="@+id/label_baro_unit" + style="@style/InstrumentSecondaryLabel" + android:text="hPa" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/value_baro" + app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_33" + app:layout_constraintHorizontal_bias="0.5" /> + + <!-- Barometer Trend --> + <TextView + android:id="@+id/label_trend" + style="@style/InstrumentLabel" + android:text="@string/instrument_label_trend" + app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33" + app:layout_constraintTop_toBottomOf="@+id/value_depth" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" /> + + <org.terst.nav.BarometerTrendView + android:id="@+id/barometer_trend_view" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintStart_toStartOf="@+id/guideline_vertical_33" + app:layout_constraintTop_toBottomOf="@+id/label_trend" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@+id/label_baro_unit" /> + <!-- Polar Diagram View --> <org.terst.nav.PolarDiagramView android:id="@+id/polar_diagram_view" @@ -236,13 +281,25 @@ app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/label_vmg" + app:layout_constraintTop_toBottomOf="@+id/label_baro_unit" app:layout_constraintBottom_toBottomOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab_tidal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:clickable="true" + android:focusable="true" + android:contentDescription="Toggle Tidal Current Overlay" + app:srcCompat="@android:drawable/ic_menu_directions" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@+id/fab_toggle_instruments" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab_toggle_instruments" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -457,4 +514,29 @@ </androidx.constraintlayout.widget.ConstraintLayout> + <!-- Voice Log FAB --> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab_voice_log" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:clickable="true" + android:focusable="true" + android:contentDescription="Open Voice Log" + android:src="@android:drawable/ic_btn_speak_now" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@+id/fab_tidal" /> + + <!-- Voice Log Fragment Container --> + <FrameLayout + android:id="@+id/voice_log_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/white" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml b/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml index 31750e7..b7b57ff 100644 --- a/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml +++ b/android-app/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:ns1="http://schemas.android.com/tools"> + <color name="accent">#FF6D00</color> <color name="anchor_button_background">#3F51B5</color> <color name="black">#FF000000</color> <color name="instrument_background">#E61E1E1E</color> <color name="instrument_text_alarm">#FFFF0000</color> <color name="instrument_text_normal">#FFFFFFFF</color> + <color name="instrument_text_secondary">#B3FFFFFF</color> <color name="instrument_text_stale">#FFFFFF00</color> <color name="mob_button_background">#FFD70000</color> <color name="night_background">#FF000000</color> @@ -14,12 +16,20 @@ <color name="night_red_primary">#FFFF0000</color> <color name="night_red_variant">#FFBB0000</color> <color name="night_surface">#FF110000</color> + <color name="on_primary">#FFFFFF</color> + <color name="primary">#0D47A1</color> + <color name="primary_dark">#002171</color> <color name="purple_200">#FFBB86FC</color> <color name="purple_500">#FF6200EE</color> <color name="purple_700">#FF3700B3</color> + <color name="surface">#FFFFFF</color> <color name="teal_200">#FF03DAC5</color> <color name="teal_700">#FF018786</color> <color name="white">#FFFFFFFF</color> + <color name="wind_arrow">#FFFFFFFF</color> + <color name="wind_medium">#FF9800</color> + <color name="wind_slow">#4CAF50</color> + <color name="wind_strong">#F44336</color> <dimen name="instrument_margin">8dp</dimen> <dimen name="instrument_padding">4dp</dimen> <dimen name="text_size_instrument_label">14sp</dimen> @@ -29,9 +39,11 @@ <string name="anchor_active_format">Anchor Set at %1$.4f, %2$.4f\nRadius: %3$.1fm\nDistance: %4$.1fm (%5$.1fm from limit)</string> <string name="anchor_config_title">Anchor Watch</string> <string name="anchor_inactive">Anchor Watch Inactive</string> - <string name="app_name">AndroidApp</string> + <string name="app_name">nav</string> <string name="button_set_anchor">SET ANCHOR</string> <string name="button_stop_anchor">STOP WATCH</string> + <string name="error_location">Could not get location. Showing default position.</string> + <string name="error_weather">Failed to load weather data.</string> <string name="fab_anchor_content_description">Toggle Anchor Watch Configuration</string> <string name="fab_mob_content_description">Activate Man Overboard (MOB) alarm</string> <string name="gcm_defaultSenderId" translatable="false">47890525607</string> @@ -40,6 +52,7 @@ <string name="google_crash_reporting_api_key" translatable="false">AIzaSyBSVnBEvHJ7Cv5x2CiJn2YO8XXUOAJ88wQ</string> <string name="google_storage_bucket" translatable="false">nav-test-c2872.firebasestorage.app</string> <string name="instrument_label_aws">AWS</string> + <string name="instrument_label_barometer">BAROMETER</string> <string name="instrument_label_boatspeed">BOAT SPEED</string> <string name="instrument_label_bsp">BSP</string> <string name="instrument_label_cog">COG</string> @@ -48,13 +61,19 @@ <string name="instrument_label_hdg">HDG</string> <string name="instrument_label_polar_pct">POLAR %</string> <string name="instrument_label_sog">SOG</string> + <string name="instrument_label_trend">TREND</string> <string name="instrument_label_tws">TWS</string> <string name="instrument_label_vmg">VMG</string> <string name="instrument_label_wind">WIND</string> + <string name="loading_weather">Fetching weather…</string> <string name="mob_button_recovered">RECOVERED</string> <string name="mob_label_distance">DISTANCE TO MOB</string> <string name="mob_label_elapsed_time">ELAPSED TIME</string> + <string name="nav_forecast">Forecast</string> + <string name="nav_map">Map</string> + <string name="permission_rationale">Location is needed to show weather for your current position.</string> <string name="placeholder_aws_value">--.-</string> + <string name="placeholder_baro_value">----.-</string> <string name="placeholder_bsp_value">--.-</string> <string name="placeholder_cog_value">---</string> <string name="placeholder_depth_value">--.-</string> @@ -63,7 +82,10 @@ <string name="placeholder_sog_value">--.-</string> <string name="placeholder_tws_value">--.-</string> <string name="placeholder_vmg_value">--.-</string> + <string name="precip_fmt">%d%%</string> <string name="project_id" translatable="false">nav-test-c2872</string> + <string name="temp_fmt">%.0f °C</string> + <string name="wind_speed_fmt">%.0f kt</string> <style name="InstrumentLabel" parent="Widget.AppCompat.TextView"> <item name="android:layout_width">0dp</item> <item name="android:layout_height">wrap_content</item> @@ -89,35 +111,31 @@ <item name="android:textColor">@color/instrument_text_normal</item> <item name="android:textSize">@dimen/text_size_instrument_secondary</item> </style> - <style name="Theme.AndroidApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - + <style name="Theme.Nav" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <item name="colorPrimary">@color/purple_200</item> <item name="colorPrimaryVariant">@color/purple_700</item> <item name="colorOnPrimary">@color/black</item> - <item name="colorSecondary">@color/teal_200</item> <item name="colorSecondaryVariant">@color/teal_200</item> <item name="colorOnSecondary">@color/black</item> - <item name="android:statusBarColor" ns1:targetApi="l">?attr/colorPrimaryVariant</item> - </style> - <style name="Theme.AndroidApp.NightVision" parent="Theme.MaterialComponents.NoActionBar"> - + <style name="Theme.Nav.NightVision" parent="Theme.MaterialComponents.NoActionBar"> <item name="colorPrimary">@color/night_red_primary</item> <item name="colorPrimaryVariant">@color/night_red_variant</item> <item name="colorOnPrimary">@color/night_on_red</item> - <item name="colorSecondary">@color/night_red_primary</item> <item name="colorSecondaryVariant">@color/night_red_variant</item> <item name="colorOnSecondary">@color/night_on_red</item> - <item name="android:colorBackground">@color/night_background</item> - <item name="colorSurface">@color/night_surface</item> <item name="colorOnSurface">@color/night_on_surface</item> - <item name="android:statusBarColor" ns1:targetApi="l">@color/night_background</item> - + </style> + <style name="Theme.NavApp" parent="Theme.MaterialComponents.DayNight.NoActionBar"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> + <item name="colorAccent">@color/accent</item> + <item name="android:statusBarColor">@color/primary_dark</item> </style> </resources>
\ No newline at end of file |