mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-05 12:07:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further changes to layouts and views #76

Browse Source
This commit is contained in:
Arty Bishop committed 2022-02-19 12:11:49 +00:00
1 parent bdc0000476
commit 22d0db1d78
37 files changed
+298 -503
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/activity_main.xml
+6 -28
View File
@@ -1,31 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/navigation_host"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/navigation_host"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toTopOf="@+id/navigation_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/navigation_graph" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation_bar"
android:layout_width="match_parent"
android:layout_height="56dp"
android:visibility="gone"
app:itemBackground="@color/surfaceToolbar"
app:labelVisibilityMode="unlabeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/navigation_menu" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="match_parent"
app:defaultNavHost="true"
app:navGraph="@navigation/navigation_graph" />
app/src/main/res/layout/card_prefs_about.xml
+3 -5
View File
@@ -59,14 +59,13 @@
<Button
android:id="@+id/about_btn_github"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/about_github"
app:icon="@drawable/ic_github"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/about_btn_donate"
app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -75,7 +74,7 @@
<Button
android:id="@+id/about_btn_donate"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/about_support"
@@ -86,12 +85,11 @@
<Button
android:id="@+id/about_btn_fdroid"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="@string/about_fdroid"
app:icon="@drawable/ic_fdroid"
app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/about_btn_donate" />
app/src/main/res/layout/card_prefs_location.xml
+3 -3
View File
@@ -56,13 +56,13 @@
<Button
android:id="@+id/location_btn_gps"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:drawableStart="@drawable/ic_pos"
android:drawableStart="@drawable/ic_gps"
android:text="@string/location_gps"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/location_btn_qth"
@@ -73,7 +73,7 @@
<Button
android:id="@+id/location_btn_qth"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
app/src/main/res/layout/card_prefs_update.xml
+5 -5
View File
@@ -32,14 +32,14 @@
<Button
android:id="@+id/update_btn_web"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/update_web"
app:icon="@drawable/ic_world"
app:icon="@drawable/ic_map"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/update_btn_file"
app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +47,7 @@
<Button
android:id="@+id/update_btn_file"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/update_file"
@@ -58,12 +58,12 @@
<Button
android:id="@+id/update_btn_clear"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="@string/update_clear"
app:icon="@drawable/ic_delete"
app:icon="@drawable/ic_clear"
app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/update_btn_file" />
app/src/main/res/layout/dialog_sources.xml
+1 -1
View File
@@ -43,7 +43,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/sources_recycler"
style="@style/AppRecycler"
style="@style/Recycler"
android:layout_width="0dp"
android:layout_height="280dp"
android:layout_marginStart="16dp"
app/src/main/res/layout/fragment_entries.xml
+20 -40
View File
@@ -5,14 +5,8 @@
android:layout_height="match_parent">
<androidx.cardview.widget.CardView
android:id="@+id/entries_top_bar"
style="@style/ToolbarCard"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="top"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp">
android:id="@+id/entries_toolbar"
style="@style/Toolbar">
<ImageButton
android:id="@+id/entries_back_btn"
@@ -22,22 +16,13 @@
<EditText
android:id="@+id/entries_search"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
style="@style/ToolbarTitle"
android:layout_marginStart="52dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="52dp"
android:layout_marginBottom="4dp"
android:background="@android:color/transparent"
android:gravity="center"
android:hint="@string/entries_search_hint"
android:importantForAutofill="no"
android:includeFontPadding="false"
android:inputType="text"
android:textColor="@color/themeAccent"
android:textColorHint="@color/themeAccent"
android:textSize="@dimen/text_size_large" />
android:importantForAutofill="no" />
<ImageButton
android:id="@+id/entries_modes_btn"
@@ -51,54 +36,49 @@
style="@style/SurfaceCard"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="64dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="64dp">
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="@dimen/surface_margin_top"
android:layout_marginEnd="@dimen/view_default_margin"
android:layout_marginBottom="@dimen/surface_margin_bot">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/entries_recycler"
style="@style/AppRecycler"
style="@style/Recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ProgressBar
android:id="@+id/entries_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
style="@style/RecyclerProgress" />
</androidx.cardview.widget.CardView>
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/entries_bottom_bar"
style="@style/BottomAppBar">
style="@style/BottomBar">
<Button
android:id="@+id/entries_select_btn"
style="@style/AppButton"
android:layout_width="128dp"
android:layout_height="wrap_content"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_marginStart="@dimen/button_margin_side"
android:layout_gravity="start|center_vertical"
android:text="Select"
app:icon="@drawable/ic_checkbox" />
android:text="Select" />
<Button
android:id="@+id/entries_clear_btn"
style="@style/AppButton"
android:layout_width="128dp"
android:layout_height="wrap_content"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_marginEnd="@dimen/button_margin_side"
android:layout_gravity="end|center_vertical"
android:text="Clear"
app:icon="@drawable/ic_checkbox_out"
app:iconGravity="end" />
android:text="Clear" />
</com.google.android.material.bottomappbar.BottomAppBar>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/entries_accept_btn"
style="@style/FloatingActionButton"
android:src="@drawable/ic_play"
android:src="@drawable/ic_done"
app:layout_anchor="@id/entries_bottom_bar" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/fragment_map.xml
+20 -25
View File
@@ -6,11 +6,8 @@
android:keepScreenOn="true">
<androidx.cardview.widget.CardView
android:id="@+id/map_top_bar"
style="@style/ToolbarCard"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:id="@+id/map_toolbar"
style="@style/Toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -24,7 +21,6 @@
<TextView
android:id="@+id/map_title"
style="@style/ToolbarTitle"
android:layout_gravity="center"
android:text="@string/map_title" />
</androidx.cardview.widget.CardView>
@@ -34,14 +30,14 @@
style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="@dimen/view_default_margin"
android:layout_marginEnd="@dimen/view_default_margin"
android:layout_marginBottom="@dimen/view_default_margin"
app:layout_constraintBottom_toTopOf="@+id/map_card_info"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/map_top_bar">
app:layout_constraintTop_toBottomOf="@+id/map_toolbar">
<org.osmdroid.views.MapView
android:id="@+id/map_view"
@@ -73,9 +69,9 @@
style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginEnd="@dimen/view_default_margin"
android:layout_marginBottom="@dimen/view_default_margin"
app:layout_constraintBottom_toTopOf="@+id/map_coordinator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@@ -159,18 +155,17 @@
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/map_bottom_bar"
style="@style/BottomAppBar" />
style="@style/BottomBar" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<Button
android:id="@+id/map_prev_btn"
style="@style/AppButton"
android:layout_width="96dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_med"
android:layout_marginStart="@dimen/button_margin_side"
android:text="Prev"
app:icon="@drawable/ic_arrow_left"
app:icon="@drawable/ic_prev"
app:layout_constraintBottom_toBottomOf="@+id/map_coordinator"
app:layout_constraintStart_toStartOf="@+id/map_coordinator"
app:layout_constraintTop_toTopOf="@+id/map_coordinator" />
@@ -192,12 +187,12 @@
<Button
android:id="@+id/map_next_btn"
style="@style/AppButton"
android:layout_width="96dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_med"
android:layout_marginEnd="@dimen/button_margin_side"
android:text="Next"
app:icon="@drawable/ic_arrow_right"
app:icon="@drawable/ic_next"
app:iconGravity="end"
app:layout_constraintBaseline_toBaselineOf="@+id/map_prev_btn"
app:layout_constraintEnd_toEndOf="@+id/map_coordinator" />
app/src/main/res/layout/fragment_passes.xml
+20 -32
View File
@@ -5,14 +5,8 @@
android:layout_height="match_parent">
<androidx.cardview.widget.CardView
android:id="@+id/passes_top_bar"
style="@style/ToolbarCard"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="top"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp">
android:id="@+id/passes_toolbar"
style="@style/Toolbar">
<ImageButton
android:id="@+id/passes_refresh_btn"
@@ -23,14 +17,13 @@
<TextView
android:id="@+id/passes_timer"
style="@style/ToolbarTimer"
android:layout_gravity="center" />
style="@style/ToolbarTimer" />
<ImageButton
android:id="@+id/passes_map_btn"
style="@style/ToolbarButton"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_world" />
android:src="@drawable/ic_map" />
</androidx.cardview.widget.CardView>
@@ -38,23 +31,21 @@
style="@style/SurfaceCard"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="64dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="64dp">
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="@dimen/surface_margin_top"
android:layout_marginEnd="@dimen/view_default_margin"
android:layout_marginBottom="@dimen/surface_margin_bot">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/passes_recycler"
style="@style/AppRecycler"
style="@style/Recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ProgressBar
android:visibility="invisible"
android:id="@+id/passes_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
android:visibility="invisible"
style="@style/RecyclerProgress" />
<TextView
android:id="@+id/passes_error_msg"
@@ -69,26 +60,23 @@
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/passes_bottomBar"
style="@style/BottomAppBar">
style="@style/BottomBar">
<Button
android:id="@+id/passes_filter_btn"
style="@style/AppButton"
android:layout_width="136dp"
android:layout_height="wrap_content"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_marginStart="@dimen/button_margin_side"
android:layout_gravity="start|center_vertical"
android:text="Filter"
app:icon="@drawable/ic_filter" />
android:text="Filter" />
<Button
android:id="@+id/passes_settings_btn"
style="@style/AppButton"
android:layout_width="136dp"
android:layout_height="wrap_content"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_marginEnd="@dimen/button_margin_side"
android:layout_gravity="end|center_vertical"
android:text="Настройки"
app:icon="@drawable/ic_prefs"
app:iconGravity="end" />
android:text="Настройки" />
</com.google.android.material.bottomappbar.BottomAppBar>
app/src/main/res/layout/fragment_radar.xml
+34 -57
View File
@@ -7,10 +7,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/radar_toolbar"
style="@style/ToolbarCard"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
style="@style/Toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -23,44 +20,28 @@
<TextView
android:id="@+id/radar_timer"
style="@style/ToolbarTimer"
android:layout_gravity="center" />
style="@style/ToolbarTimer" />
<ImageButton
android:id="@+id/radar_map"
style="@style/ToolbarButton"
android:layout_gravity="end|center_vertical"
android:src="@drawable/ic_world" />
android:src="@drawable/ic_map" />
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/radar_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:textSize="@dimen/text_size_medium"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_toolbar" />
<androidx.cardview.widget.CardView
android:id="@+id/radar_card"
style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="@dimen/view_default_margin"
android:layout_marginEnd="@dimen/view_default_margin"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_name" />
app:layout_constraintTop_toBottomOf="@+id/radar_toolbar" />
<TextView
android:id="@+id/radar_az"
@@ -111,38 +92,38 @@
style="@style/SurfaceCard"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="@dimen/view_default_margin"
android:layout_marginEnd="@dimen/view_default_margin"
android:layout_marginBottom="@dimen/view_default_margin"
app:layout_constraintBottom_toTopOf="@+id/radar_coordinator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_recycler_msg">
app:layout_constraintTop_toBottomOf="@+id/radar_card">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/radar_recycler"
style="@style/AppRecycler"
style="@style/Recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.cardview.widget.CardView>
<ProgressBar
android:id="@+id/radar_progress"
style="@style/RecyclerProgress"
android:visibility="invisible" />
<TextView
android:id="@+id/radar_recycler_msg"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/trans_no_data"
android:textSize="@dimen/text_size_medium"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_card" />
<TextView
android:id="@+id/radar_recycler_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/trans_no_data"
android:textSize="@dimen/text_size_medium"
android:visibility="invisible" />
</androidx.cardview.widget.CardView>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/radar_coordinator"
@@ -154,18 +135,16 @@
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/radar_bottom_bar"
style="@style/BottomAppBar" />
style="@style/BottomBar" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<Button
android:id="@+id/radar_prev_btn"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginStart="@dimen/button_margin_side"
android:text="Notify"
app:icon="@drawable/ic_notify_2"
app:layout_constraintBottom_toBottomOf="@+id/radar_coordinator"
app:layout_constraintEnd_toStartOf="@+id/radar_data_name"
app:layout_constraintHorizontal_bias="0.5"
@@ -191,12 +170,10 @@
<Button
android:id="@+id/radar_next_btn"
style="@style/AppButton"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginEnd="@dimen/button_margin_side"
android:text="Settings"
app:icon="@drawable/ic_prefs"
app:layout_constraintBaseline_toBaselineOf="@+id/radar_prev_btn"
app:layout_constraintEnd_toEndOf="@+id/radar_coordinator"
app:layout_constraintStart_toEndOf="@+id/radar_data_name" />
app/src/main/res/layout/fragment_settings.xml
+36 -48
View File
@@ -5,42 +5,35 @@
android:layout_height="match_parent">
<androidx.cardview.widget.CardView
android:id="@+id/prefs_toolbar"
style="@style/ToolbarCard"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="top"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp">
android:id="@+id/settings_toolbar"
style="@style/Toolbar">
<ImageButton
android:id="@+id/prefs_back"
android:id="@+id/settings_back"
style="@style/ToolbarButton"
android:layout_gravity="start|center_vertical"
android:src="@drawable/ic_back" />
<TextView
android:id="@+id/prefs_title"
android:id="@+id/settings_title"
style="@style/ToolbarTitle"
android:layout_gravity="center"
android:text="@string/settings_title" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
style="@style/ToolbarCard"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="64dp"
android:layout_marginStart="8dp"
android:layout_marginBottom="64dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="60dp"
android:layout_marginEnd="@dimen/view_default_margin"
android:layout_marginBottom="62dp"
android:backgroundTint="@color/surfaceBg">
<androidx.core.widget.NestedScrollView
android:id="@+id/settings_scroll"
style="@style/AppRecycler"
style="@style/Recycler"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -49,7 +42,7 @@
android:layout_height="wrap_content">
<include
android:id="@+id/prefs_info"
android:id="@+id/settings_info"
layout="@layout/card_prefs_about"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -58,55 +51,55 @@
app:layout_constraintTop_toTopOf="parent" />
<include
android:id="@+id/prefs_location"
android:id="@+id/settings_location"
layout="@layout/card_prefs_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/view_default_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/prefs_info" />
app:layout_constraintTop_toBottomOf="@+id/settings_info" />
<include
android:id="@+id/prefs_data"
android:id="@+id/settings_data"
layout="@layout/card_prefs_update"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/view_default_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/prefs_location" />
app:layout_constraintTop_toBottomOf="@+id/settings_location" />
<include
android:id="@+id/prefs_tracking"
android:id="@+id/settings_tracking"
layout="@layout/card_prefs_tracking"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/view_default_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/prefs_data" />
app:layout_constraintTop_toBottomOf="@+id/settings_data" />
<include
android:id="@+id/prefs_other"
android:id="@+id/settings_other"
layout="@layout/card_prefs_other"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/view_default_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/prefs_tracking" />
app:layout_constraintTop_toBottomOf="@+id/settings_tracking" />
<include
android:id="@+id/prefs_warranty"
android:id="@+id/settings_warranty"
layout="@layout/card_prefs_warranty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/view_default_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/prefs_other" />
app:layout_constraintTop_toBottomOf="@+id/settings_other" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -114,37 +107,32 @@
</androidx.cardview.widget.CardView>
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/settings_bottom_bar"
style="@style/BottomAppBar">
style="@style/BottomBar">
<Button
android:id="@+id/settings_prev_btn"
style="@style/AppButton"
android:layout_width="128dp"
android:layout_height="wrap_content"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_marginStart="@dimen/button_margin_side"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="4dp"
android:text="Notify"
app:icon="@drawable/ic_notify_2" />
android:text="@string/about_github" />
<Button
android:id="@+id/settings_next_btn"
style="@style/AppButton"
android:layout_width="128dp"
android:layout_height="wrap_content"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_marginEnd="@dimen/button_margin_side"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="4dp"
android:text="Settings"
app:icon="@drawable/ic_prefs" />
android:text="@string/about_fdroid" />
</com.google.android.material.bottomappbar.BottomAppBar>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/settings_fab"
style="@style/FloatingActionButton"
android:src="@drawable/ic_sputnik"
android:src="@drawable/ic_support"
app:layout_anchor="@id/settings_bottom_bar" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/item_entry.xml
+3 -3
View File
@@ -6,12 +6,12 @@
<CheckBox
android:id="@+id/entry_checkbox"
android:layout_width="match_parent"
android:layout_height="43dp"
android:layout_marginStart="6dp"
android:layout_height="41dp"
android:layout_marginStart="8dp"
android:background="@color/surfaceCard"
android:ellipsize="end"
android:lines="1"
android:padding="4dp"
android:padding="6dp"
android:textColor="@color/themeLight"
android:textSize="@dimen/text_size_medium" />
app/src/main/res/layout/item_radio.xml
+4 -12
View File
@@ -40,15 +40,11 @@
app:layout_constraintBottom_toBottomOf="@+id/radio_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/radio_info"
app:srcCompat="@drawable/ic_arrow_right" />
app:srcCompat="@drawable/ic_next" />
<TextView
android:id="@+id/radio_downlink"
style="@style/ToolbarTimer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trans_link_low"
android:textSize="@dimen/text_size_frequency"
style="@style/RadioFreq"
app:layout_constraintEnd_toStartOf="@+id/radio_guide"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radio_info" />
@@ -62,15 +58,11 @@
app:layout_constraintBottom_toBottomOf="@+id/radio_info"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/radio_info"
app:srcCompat="@drawable/ic_arrow_right" />
app:srcCompat="@drawable/ic_next" />
<TextView
android:id="@+id/radio_uplink"
style="@style/ToolbarTimer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trans_link_low"
android:textSize="@dimen/text_size_frequency"
style="@style/RadioFreq"
app:layout_constraintBaseline_toBaselineOf="@+id/radio_downlink"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/radio_guide" />