mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-03 19:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added types dialog, removed EntriesFragment

Browse Source
This commit is contained in:
Arty Bishop committed 2025-12-27 15:01:32 +00:00
1 parent a817423e7e
commit 1ea4da3baf
21 files changed
+119 -474
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/drawable/ic_delete.xml
-11
View File
@@ -1,11 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
</vector>
app/src/main/res/drawable/ic_support.xml
-11
View File
@@ -1,11 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M14,21c1.93,0 3.62,-1.17 4,-3l-1.75,-0.88C16,18.21 15.33,19 14,19l-4.9,0c0.83,-1 1.5,-2.34 1.5,-4c0,-0.35 -0.03,-0.69 -0.08,-1L14,14v-2l-4.18,0C9,10.42 8,9.6 8,8c0,-1.93 1.57,-3.5 3.5,-3.5c1.5,0 2.79,0.95 3.28,2.28L16.63,6c-0.8,-2.05 -2.79,-3.5 -5.13,-3.5C8.46,2.5 6,4.96 6,8c0,1.78 0.79,2.9 1.49,4L6,12v2l2.47,0c0.08,0.31 0.13,0.64 0.13,1c0,2.7 -2.6,4 -2.6,4v2H14z" />
</vector>
app/src/main/res/layout/activity_main.xml
-30
View File
@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toTopOf="@+id/nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/nav_graph" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/nav_bar"
android:layout_width="0dp"
android:layout_height="56dp"
app:itemBackground="@color/bottomBar"
app:labelVisibilityMode="unlabeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/nav_menu" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_entries.xml
-126
View File
@@ -1,126 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:transitionGroup="true">
<androidx.cardview.widget.CardView
android:id="@+id/entries_toolbar"
style="@style/Toolbar">
<ImageButton
android:id="@+id/entries_btn_back"
style="@style/ToolbarButton"
android:layout_gravity="start|center_vertical"
android:contentDescription="@string/btn_back"
android:src="@drawable/ic_back" />
<EditText
android:id="@+id/entries_search"
style="@style/ToolbarTitle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="52dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="52dp"
android:layout_marginBottom="4dp"
android:hint="@string/entries_search_hint"
android:importantForAutofill="no"
android:inputType="text" />
<ImageButton
android:id="@+id/entries_btn_modes"
style="@style/ToolbarButton"
android:layout_gravity="end|center_vertical"
android:contentDescription="@string/btn_modes"
android:src="@drawable/ic_modes" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/entries_type_card"
style="@style/SurfaceCard"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="60dp"
android:layout_marginEnd="@dimen/view_default_margin">
<TextView
android:id="@+id/entries_type_message"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start|center_vertical"
android:gravity="center"
android:includeFontPadding="false"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:text="@string/types_title"
android:textColor="@color/accent"
android:textSize="@dimen/text_size_mediumLarge" />
<ImageView
android:id="@+id/entries_type_img"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:contentDescription="@string/types_title"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:src="@drawable/ic_next"
app:tint="@color/accent" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
style="@style/SurfaceCard"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/view_default_margin"
android:layout_marginTop="108dp"
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/Recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ProgressBar
android:id="@+id/entries_progress"
style="@style/RecyclerProgress" />
</androidx.cardview.widget.CardView>
<com.google.android.material.bottomappbar.BottomAppBar
android:id="@+id/entries_bottom_bar"
style="@style/BottomBar">
<Button
android:id="@+id/entries_btn_select"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/button_margin_side"
android:text="@string/btn_select" />
<Button
android:id="@+id/entries_btn_clear"
style="@style/NormalButton"
android:layout_width="@dimen/button_width_max"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="@dimen/button_margin_side"
android:text="@string/btn_clear_all" />
</com.google.android.material.bottomappbar.BottomAppBar>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/entries_fab"
style="@style/FloatingActionButton"
android:contentDescription="@string/btn_done"
android:src="@drawable/ic_done"
app:layout_anchor="@id/entries_bottom_bar" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/fragment_settings.xml
+1 -1
View File
@@ -144,7 +144,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/settings_fab"
style="@style/FloatingActionButton"
android:src="@drawable/ic_support"
android:src="@drawable/ic_done"
android:contentDescription="@string/btn_support"
app:layout_anchor="@id/settings_bottom_bar" />
app/src/main/res/layout/item_entry.xml
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/RecyclerItemCard">
<CheckBox
android:id="@+id/entry_checkbox"
android:layout_width="match_parent"
android:layout_height="41dp"
android:layout_marginStart="6dp"
android:background="@color/cardRegular"
android:ellipsize="end"
android:lines="1"
android:padding="4dp"
android:textColor="@color/textMain"
android:textSize="@dimen/text_size_medium" />
</androidx.cardview.widget.CardView>
app/src/main/res/layout/item_pass.xml
+1 -1
View File
@@ -58,7 +58,7 @@
android:id="@+id/pass_los"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_los"
android:text="@string/pass_losAz"
android:textSize="@dimen/text_size_small"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_aos"
app:layout_constraintEnd_toEndOf="@+id/pass_id"
app/src/main/res/layout/item_source.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/source_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:hint="@string/sources_hint"
app:endIconDrawable="@drawable/ic_delete"
app:endIconMode="custom">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/source_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="textUri" />
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/menu/nav_menu.xml
-4
View File
@@ -16,8 +16,4 @@
android:id="@+id/nav_settings"
android:icon="@drawable/ic_settings"
android:title="@string/menu_settings" />
<item
android:id="@+id/nav_about"
android:icon="@drawable/ic_about"
android:title="@string/menu_about" />
</menu>
app/src/main/res/navigation/nav_graph.xml
-24
View File
@@ -4,18 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_root"
app:startDestination="@id/nav_passes">
<fragment
android:id="@+id/nav_entries"
android:name="com.rtbishop.look4sat.presentation.entriesScreen.EntriesFragmentCompose"
tools:layout="@layout/fragment_entries">
<action
android:id="@+id/entries_to_modes"
app:destination="@id/nav_modes"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
</fragment>
<fragment
android:id="@+id/nav_passes"
android:name="com.rtbishop.look4sat.presentation.passesScreen.PassesFragment"
@@ -54,18 +42,6 @@
android:id="@+id/nav_settings"
android:name="com.rtbishop.look4sat.presentation.settingsScreen.SettingsFragment"
tools:layout="@layout/fragment_settings" />
<fragment
android:id="@+id/nav_about"
android:name="com.rtbishop.look4sat.presentation.aboutScreen.AboutFragment">
<argument
android:name="catNum"
android:defaultValue="-1"
app:argType="integer" />
<argument
android:name="aosTime"
android:defaultValue="0L"
app:argType="long" />
</fragment>
<dialog
android:id="@+id/nav_modes"
android:name="com.rtbishop.look4sat.presentation.entriesScreen.ModesDialog"
app/src/main/res/values-ru/strings.xml
+2 -2
View File
@@ -78,8 +78,8 @@
<string name="pass_satId">Id:%d</string>
<string name="pass_aosAz">НПС - %.1f°</string>
<string name="pass_elevation">Элевация: %.1f°</string>
<string name="pass_los">%.1f° - КПС</string>
<string name="pass_altitude">Высота: %.0fкм</string>
<string name="pass_losAz">%.1f° - КПС</string>
<string name="pass_altitude">Высота: %d км</string>
<string name="pass_placeholder"> - - : - - </string>
<string name="pass_startTime">HH:mm:ss - EEE</string>
<string name="pass_endTime">EEE - HH:mm:ss</string>
app/src/main/res/values-zh-rCN/strings.xml
+2 -2
View File
@@ -78,8 +78,8 @@
<string name="pass_satId">Id:%d</string>
<string name="pass_aosAz">入境 - %.1f°</string>
<string name="pass_elevation">仰角：%.1f°</string>
<string name="pass_los">%.1f° - 出境</string>
<string name="pass_altitude">高度：%.0f km</string>
<string name="pass_losAz">%.1f° - 出境</string>
<string name="pass_altitude">高度：%d km</string>
<string name="pass_placeholder">" - - : - - "</string>
<string name="pass_startTime">HH:mm:ss - EEE</string>
<string name="pass_endTime">EEE - HH:mm:ss</string>
app/src/main/res/values/strings.xml
+5 -5
View File
@@ -77,12 +77,12 @@
<string name="pass_satName">%s</string>
<string name="pass_satId">Id:%d</string>
<string name="pass_aosAz">AOS - %.1f°</string>
<string name="pass_elevation">ELEV: %.1f°</string>
<string name="pass_los">%.1f° - LOS</string>
<string name="pass_altitude">ALT: %.0f km</string>
<string name="pass_elevation">Elevation: %.1f°</string>
<string name="pass_losAz">%.1f° - LOS</string>
<string name="pass_altitude">Altitude: %d km</string>
<string name="pass_placeholder"> - - : - - </string>
<string name="pass_startTime">HH:mm:ss - MMM dd</string>
<string name="pass_endTime">dd MMM - HH:mm:ss</string>
<string name="pass_startTime">HH:mm:ss - EEE</string>
<string name="pass_endTime">EEE - HH:mm:ss</string>
<string name="radar_az_text">Azimuth</string>
<string name="radar_az_value">%.1f°</string>