Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Further changes to strings, layouts and styles
Arty Bishopafe9f77869ce
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.ktindex 59bad8bb..acd5035c 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt@@ -95,15 +95,15 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {private fun setupAboutCard() {binding.settingsInfo.aboutVersion.text =String.format(getString(R.string.about_version), BuildConfig.VERSION_NAME)- binding.settingsInfo.aboutBtnGithub.setOnClickListener {- gotoUrl("https://github.com/rt-bishop/Look4Sat/")- }- binding.settingsInfo.aboutBtnDonate.setOnClickListener {- gotoUrl("https://www.buymeacoffee.com/rtbishop")- }- binding.settingsInfo.aboutBtnFdroid.setOnClickListener {- gotoUrl("https://f-droid.org/en/packages/com.rtbishop.look4sat/")- }+// binding.settingsInfo.aboutBtnGithub.setOnClickListener {+// gotoUrl("https://github.com/rt-bishop/Look4Sat/")+// }+// binding.settingsInfo.aboutBtnDonate.setOnClickListener {+// gotoUrl("https://www.buymeacoffee.com/rtbishop")+// }+// binding.settingsInfo.aboutBtnFdroid.setOnClickListener {+// gotoUrl("https://f-droid.org/en/packages/com.rtbishop.look4sat/")+// }}private fun setupLocationCard() {@@ -128,12 +128,12 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {}private fun setupDataCard() {- binding.settingsData.updateBtnFile.setOnClickListener { contentRequest.launch("*/*") }- binding.settingsData.updateBtnWeb.setOnClickListener {+ binding.settingsData.dataBtnFile.setOnClickListener { contentRequest.launch("*/*") }+ binding.settingsData.dataBtnWeb.setOnClickListener {val action = SettingsFragmentDirections.actionPrefsToSources()findNavController().navigate(action)}- binding.settingsData.updateBtnClear.setOnClickListener { viewModel.clearData() }+ binding.settingsData.dataBtnClear.setOnClickListener { viewModel.clearData() }getNavResult<List<String>>(R.id.nav_settings, "sources") { sources ->viewModel.updateDataFromWeb(sources)}@@ -210,17 +210,17 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {private fun handleSatState(state: DataState<Long>) {when (state) {is DataState.Success -> {- binding.settingsData.updateProgress.isIndeterminate = false+ binding.settingsData.dataProgress.isIndeterminate = falseviewModel.setUpdateHandled()showToast("Data updated successfully")}is DataState.Error -> {- binding.settingsData.updateProgress.isIndeterminate = false+ binding.settingsData.dataProgress.isIndeterminate = falseviewModel.setUpdateHandled()showToast(state.message.toString())}is DataState.Loading -> {- binding.settingsData.updateProgress.isIndeterminate = true+ binding.settingsData.dataProgress.isIndeterminate = true}is DataState.Handled -> {}}diff --git a/app/src/main/res/layout/card_prefs_about.xml b/app/src/main/res/layout/card_about.xmlsimilarity index 62%rename from app/src/main/res/layout/card_prefs_about.xmlrename to app/src/main/res/layout/card_about.xmlindex 74055185..3ffad9a6 100644--- a/app/src/main/res/layout/card_prefs_about.xml+++ b/app/src/main/res/layout/card_about.xml@@ -11,7 +11,9 @@android:id="@+id/about_img"android:layout_width="0dp"android:layout_height="0dp"- android:layout_marginTop="8dp"+ android:layout_marginStart="8dp"+ android:layout_marginTop="4dp"+ android:contentDescription="@string/app_name"android:src="@drawable/ic_sputnik"app:layout_constraintBottom_toBottomOf="@+id/about_version"app:layout_constraintDimensionRatio="h,1:1"@@ -26,22 +28,28 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_marginStart="8dp"- android:layout_marginTop="8dp"+ android:layout_marginTop="10dp"+ android:layout_marginEnd="8dp"android:includeFontPadding="false"android:text="@string/app_name"android:textColor="@color/themeAccent"android:textSize="@dimen/text_size_app_title"+ app:layout_constraintBottom_toTopOf="@+id/about_version"app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toEndOf="@+id/about_img"app:layout_constraintTop_toTopOf="parent" /><TextViewandroid:id="@+id/about_version"- android:layout_width="wrap_content"+ android:layout_width="0dp"android:layout_height="wrap_content"+ android:layout_marginTop="4dp"android:text="@string/about_version"android:textColor="@color/themeLight"android:textSize="@dimen/text_size_large"+ app:layout_constraintBottom_toTopOf="@+id/about_subtitle"+ app:layout_constraintEnd_toEndOf="@+id/about_title"app:layout_constraintStart_toStartOf="@+id/about_title"app:layout_constraintTop_toBottomOf="@+id/about_title" />@@ -49,51 +57,17 @@android:id="@+id/about_subtitle"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginTop="4dp"+ android:layout_marginTop="8dp"+ android:layout_marginBottom="12dp"android:text="@string/about_subtitle"android:textColor="@color/themeLight"android:textSize="@dimen/text_size_large"+ app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/about_version" />- <Button- android:id="@+id/about_btn_github"- 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:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toStartOf="@+id/about_btn_donate"- app:layout_constraintHorizontal_chainStyle="spread_inside"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/about_subtitle" />-- <Button- android:id="@+id/about_btn_donate"- style="@style/NormalButton"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:text="@string/about_support"- app:icon="@drawable/ic_support"- app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"- app:layout_constraintEnd_toStartOf="@+id/about_btn_fdroid"- app:layout_constraintStart_toEndOf="@+id/about_btn_github" />-- <Button- android:id="@+id/about_btn_fdroid"- style="@style/NormalButton"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginEnd="4dp"- android:text="@string/about_fdroid"- app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toEndOf="@+id/about_btn_donate" />-</androidx.constraintlayout.widget.ConstraintLayout></androidx.cardview.widget.CardView>diff --git a/app/src/main/res/layout/card_data.xml b/app/src/main/res/layout/card_data.xmlnew file mode 100644index 00000000..c7eb252c--- /dev/null+++ b/app/src/main/res/layout/card_data.xml@@ -0,0 +1,94 @@+<?xml version="1.0" encoding="utf-8"?>+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto"+ style="@style/SurfaceCard">++ <androidx.constraintlayout.widget.ConstraintLayout+ android:layout_width="match_parent"+ android:layout_height="wrap_content">++ <TextView+ android:id="@+id/data_title"+ style="@style/SettingsTitle"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_marginStart="12dp"+ android:layout_marginTop="10dp"+ android:text="@string/update_title"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />++ <ProgressBar+ android:id="@+id/data_progress"+ style="?android:attr/progressBarStyleHorizontal"+ android:layout_width="0dp"+ android:layout_height="0dp"+ android:layout_marginStart="8dp"+ android:layout_marginEnd="12dp"+ app:layout_constraintBottom_toBottomOf="@+id/data_title"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toEndOf="@+id/data_title"+ app:layout_constraintTop_toTopOf="@+id/data_title" />++ <TextView+ android:id="@+id/data_satellites"+ style="@style/SettingsText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_marginTop="6dp"+ android:text="@string/location_lat"+ app:layout_constraintEnd_toStartOf="@+id/data_transmitters"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintHorizontal_chainStyle="spread_inside"+ app:layout_constraintStart_toStartOf="@+id/data_title"+ app:layout_constraintTop_toBottomOf="@+id/data_title" />++ <TextView+ android:id="@+id/data_transmitters"+ style="@style/SettingsText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="@string/location_lon"+ app:layout_constraintBaseline_toBaselineOf="@+id/data_satellites"+ app:layout_constraintEnd_toEndOf="@+id/data_progress"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/data_satellites" />++ <Button+ android:id="@+id/data_btn_web"+ style="@style/NormalButton"+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:layout_marginStart="4dp"+ android:layout_marginTop="6dp"+ android:layout_marginBottom="4dp"+ android:text="@string/btn_web"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toStartOf="@+id/data_btn_file"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toBottomOf="@+id/data_satellites" />++ <Button+ android:id="@+id/data_btn_file"+ style="@style/NormalButton"+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:text="@string/btn_file"+ app:layout_constraintBaseline_toBaselineOf="@+id/data_btn_web"+ app:layout_constraintEnd_toStartOf="@+id/data_btn_clear"+ app:layout_constraintStart_toEndOf="@+id/data_btn_web" />++ <Button+ android:id="@+id/data_btn_clear"+ style="@style/NormalButton"+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:layout_marginEnd="4dp"+ android:text="@string/btn_clear"+ app:layout_constraintBaseline_toBaselineOf="@+id/data_btn_web"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toEndOf="@+id/data_btn_file" />++ </androidx.constraintlayout.widget.ConstraintLayout>++</androidx.cardview.widget.CardView>diff --git a/app/src/main/res/layout/card_prefs_warranty.xml b/app/src/main/res/layout/card_info.xmlsimilarity index 74%rename from app/src/main/res/layout/card_prefs_warranty.xmlrename to app/src/main/res/layout/card_info.xmlindex b52a5c75..4ad1723b 100644--- a/app/src/main/res/layout/card_prefs_warranty.xml+++ b/app/src/main/res/layout/card_info.xml@@ -10,11 +10,14 @@<TextViewandroid:id="@+id/warranty_title"style="@style/SettingsTitle"- android:layout_width="wrap_content"+ android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"+ android:layout_marginStart="12dp"+ android:layout_marginTop="10dp"+ android:layout_marginEnd="12dp"android:text="@string/warranty_title"+ app:layout_constraintBottom_toTopOf="@+id/warranty_thanks"+ app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -24,9 +27,10 @@android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginTop="4dp"- android:layout_marginEnd="8dp"android:text="@string/warranty_thanks"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintBottom_toTopOf="@+id/warranty_license"+ app:layout_constraintEnd_toEndOf="@+id/warranty_title"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="@+id/warranty_title"app:layout_constraintTop_toBottomOf="@+id/warranty_title" />@@ -36,11 +40,12 @@android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginTop="4dp"- android:layout_marginBottom="8dp"+ android:layout_marginBottom="10dp"android:text="@string/warranty_license"app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="@+id/warranty_thanks"- app:layout_constraintStart_toStartOf="@+id/warranty_thanks"+ app:layout_constraintEnd_toEndOf="@+id/warranty_title"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toStartOf="@+id/warranty_title"app:layout_constraintTop_toBottomOf="@+id/warranty_thanks" /></androidx.constraintlayout.widget.ConstraintLayout>diff --git a/app/src/main/res/layout/card_prefs_location.xml b/app/src/main/res/layout/card_location.xmlsimilarity index 90%rename from app/src/main/res/layout/card_prefs_location.xmlrename to app/src/main/res/layout/card_location.xmlindex 16a9d95f..0dadaed7 100644--- a/app/src/main/res/layout/card_prefs_location.xml+++ b/app/src/main/res/layout/card_location.xml@@ -12,8 +12,8 @@style="@style/SettingsTitle"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"+ android:layout_marginStart="12dp"+ android:layout_marginTop="10dp"android:text="@string/location_title"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -23,8 +23,8 @@style="?android:attr/progressBarStyleHorizontal"android:layout_width="0dp"android:layout_height="0dp"- android:layout_marginStart="6dp"- android:layout_marginEnd="8dp"+ android:layout_marginStart="8dp"+ android:layout_marginEnd="12dp"app:layout_constraintBottom_toBottomOf="@+id/location_title"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/location_title"@@ -59,11 +59,11 @@style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:layout_marginBottom="8dp"+ android:layout_marginStart="4dp"+ android:layout_marginTop="6dp"+ android:layout_marginBottom="4dp"android:drawableStart="@drawable/ic_gps"- android:text="@string/location_gps"+ android:text="@string/btn_gps"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/location_btn_manual"app:layout_constraintHorizontal_bias="0.5"@@ -76,7 +76,7 @@android:layout_width="0dp"android:layout_height="wrap_content"android:drawableStart="@drawable/ic_gps"- android:text="Manual"+ android:text="@string/btn_manual"app:layout_constraintBaseline_toBaselineOf="@+id/location_btn_gps"app:layout_constraintEnd_toStartOf="@+id/location_btn_qth"app:layout_constraintHorizontal_bias="0.5"@@ -87,9 +87,9 @@style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginEnd="8dp"+ android:layout_marginEnd="4dp"android:drawableStart="@drawable/ic_qth"- android:text="@string/location_qth"+ android:text="@string/btn_qth"app:layout_constraintBaseline_toBaselineOf="@+id/location_btn_gps"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"diff --git a/app/src/main/res/layout/card_prefs_other.xml b/app/src/main/res/layout/card_other.xmlsimilarity index 68%rename from app/src/main/res/layout/card_prefs_other.xmlrename to app/src/main/res/layout/card_other.xmlindex 675ba7f7..4562a403 100644--- a/app/src/main/res/layout/card_prefs_other.xml+++ b/app/src/main/res/layout/card_other.xml@@ -10,12 +10,15 @@<TextViewandroid:id="@+id/other_title"style="@style/SettingsTitle"- android:layout_width="wrap_content"+ android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"+ android:layout_marginStart="12dp"+ android:layout_marginTop="10dp"+ android:layout_marginEnd="12dp"android:text="@string/other_title"- android:textColor="@color/themeAccent"+ app:layout_constraintBottom_toTopOf="@+id/other_switch_utc"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -24,40 +27,44 @@style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginTop="8dp"- android:layout_marginEnd="4dp"- android:minHeight="48dp"+ android:layout_marginTop="6dp"+ android:minHeight="42dp"android:text="@string/other_switch_utc"- app:trackTint="@color/themeDisabled"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintBottom_toTopOf="@+id/other_switch_sweep"+ app:layout_constraintEnd_toEndOf="@+id/other_title"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="@+id/other_title"- app:layout_constraintTop_toBottomOf="@+id/other_title" />+ app:layout_constraintTop_toBottomOf="@+id/other_title"+ app:trackTint="@color/themeDisabled" /><com.google.android.material.switchmaterial.SwitchMaterialandroid:id="@+id/other_switch_sweep"style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:minHeight="48dp"+ android:minHeight="42dp"android:text="@string/other_switch_sweep"- app:trackTint="@color/themeDisabled"+ app:layout_constraintBottom_toTopOf="@+id/other_switch_sensors"app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="@+id/other_switch_utc"- app:layout_constraintTop_toBottomOf="@+id/other_switch_utc" />+ app:layout_constraintTop_toBottomOf="@+id/other_switch_utc"+ app:trackTint="@color/themeDisabled" /><com.google.android.material.switchmaterial.SwitchMaterialandroid:id="@+id/other_switch_sensors"style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginBottom="8dp"- android:minHeight="48dp"+ android:layout_marginBottom="6dp"+ android:minHeight="42dp"android:text="@string/other_switch_sensors"- app:trackTint="@color/themeDisabled"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"- app:layout_constraintStart_toStartOf="@+id/other_switch_sweep"- app:layout_constraintTop_toBottomOf="@+id/other_switch_sweep" />+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toStartOf="@+id/other_switch_utc"+ app:layout_constraintTop_toBottomOf="@+id/other_switch_sweep"+ app:trackTint="@color/themeDisabled" /></androidx.constraintlayout.widget.ConstraintLayout>diff --git a/app/src/main/res/layout/card_prefs_update.xml b/app/src/main/res/layout/card_prefs_update.xmldeleted file mode 100644index 63915b93..00000000--- a/app/src/main/res/layout/card_prefs_update.xml+++ /dev/null@@ -1,73 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:app="http://schemas.android.com/apk/res-auto"- style="@style/SurfaceCard">-- <androidx.constraintlayout.widget.ConstraintLayout- android:layout_width="match_parent"- android:layout_height="match_parent">-- <TextView- android:id="@+id/update_title"- style="@style/SettingsTitle"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:text="@string/update_title"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent" />-- <ProgressBar- android:id="@+id/update_progress"- style="?android:attr/progressBarStyleHorizontal"- android:layout_width="0dp"- android:layout_height="0dp"- android:layout_marginStart="6dp"- android:layout_marginEnd="8dp"- app:layout_constraintBottom_toBottomOf="@+id/update_title"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toEndOf="@+id/update_title"- app:layout_constraintTop_toTopOf="@+id/update_title" />-- <Button- android:id="@+id/update_btn_web"- 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_map"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toStartOf="@+id/update_btn_file"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/update_title" />-- <Button- android:id="@+id/update_btn_file"- style="@style/NormalButton"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:text="@string/update_file"- app:icon="@drawable/ic_file"- app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"- app:layout_constraintEnd_toStartOf="@+id/update_btn_clear"- app:layout_constraintStart_toEndOf="@+id/update_btn_web" />-- <Button- android:id="@+id/update_btn_clear"- 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_clear"- app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toEndOf="@+id/update_btn_file" />-- </androidx.constraintlayout.widget.ConstraintLayout>--</androidx.cardview.widget.CardView>diff --git a/app/src/main/res/layout/card_prefs_tracking.xml b/app/src/main/res/layout/card_tracking.xmlsimilarity index 85%rename from app/src/main/res/layout/card_prefs_tracking.xmlrename to app/src/main/res/layout/card_tracking.xmlindex 206795f8..8613c69c 100644--- a/app/src/main/res/layout/card_prefs_tracking.xml+++ b/app/src/main/res/layout/card_tracking.xml@@ -10,11 +10,13 @@<TextViewandroid:id="@+id/tracking_title"style="@style/SettingsTitle"- android:layout_width="wrap_content"+ android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"+ android:layout_marginStart="12dp"+ android:layout_marginTop="10dp"+ android:layout_marginEnd="12dp"android:text="@string/tracking_title"+ app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -23,26 +25,24 @@style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginEnd="4dp"- android:minHeight="48dp"+ android:minHeight="42dp"android:text="@string/tracking_switch"- app:trackTint="@color/themeDisabled"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintEnd_toEndOf="@+id/tracking_title"app:layout_constraintStart_toStartOf="@+id/tracking_title"- app:layout_constraintTop_toBottomOf="@+id/tracking_title" />+ app:layout_constraintTop_toBottomOf="@+id/tracking_title"+ app:trackTint="@color/themeDisabled" /><com.google.android.material.textfield.TextInputLayoutandroid:id="@+id/tracking_ip"style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginEnd="6dp"- android:layout_marginBottom="8dp"+ android:layout_marginEnd="8dp"+ android:layout_marginBottom="12dp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/tracking_port"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintStart_toStartOf="@+id/tracking_switch"app:layout_constraintTop_toBottomOf="@+id/tracking_switch"app:layout_constraintWidth_percent="0.69">@@ -58,9 +58,8 @@style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginEnd="8dp"app:layout_constraintBottom_toBottomOf="@+id/tracking_ip"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintEnd_toEndOf="@+id/tracking_switch"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toEndOf="@+id/tracking_ip"app:layout_constraintTop_toTopOf="@+id/tracking_ip">diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex 6b221e9c..331afbbd 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -12,11 +12,13 @@android:id="@+id/entries_back_btn"style="@style/ToolbarButton"android:layout_gravity="start|center_vertical"+ android:contentDescription="@string/btn_back"android:src="@drawable/ic_back" /><EditTextandroid:id="@+id/entries_search"style="@style/ToolbarTitle"+ android:inputType="text"android:layout_marginStart="52dp"android:layout_marginTop="4dp"android:layout_marginEnd="52dp"@@ -28,6 +30,7 @@android:id="@+id/entries_modes_btn"style="@style/ToolbarButton"android:layout_gravity="end|center_vertical"+ android:contentDescription="@string/btn_modes"android:src="@drawable/ic_satellite" /></androidx.cardview.widget.CardView>@@ -63,7 +66,7 @@android:layout_width="@dimen/button_width_max"android:layout_marginStart="@dimen/button_margin_side"android:layout_gravity="start|center_vertical"- android:text="Select" />+ android:text="@string/btn_select" /><Buttonandroid:id="@+id/entries_clear_btn"@@ -71,7 +74,7 @@android:layout_width="@dimen/button_width_max"android:layout_marginEnd="@dimen/button_margin_side"android:layout_gravity="end|center_vertical"- android:text="Clear" />+ android:text="@string/btn_clear" /></com.google.android.material.bottomappbar.BottomAppBar>@@ -79,6 +82,7 @@android:id="@+id/entries_fab"style="@style/FloatingActionButton"android:src="@drawable/ic_done"+ android:contentDescription="@string/btn_done"app:layout_anchor="@id/entries_bottom_bar" /></androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xmlindex f580befa..2f42aace 100644--- a/app/src/main/res/layout/fragment_map.xml+++ b/app/src/main/res/layout/fragment_map.xml@@ -16,6 +16,7 @@android:id="@+id/map_back_btn"style="@style/ToolbarButton"android:layout_gravity="start|center_vertical"+ android:contentDescription="@string/btn_back"android:src="@drawable/ic_back" /><TextView@@ -164,7 +165,7 @@style="@style/NormalButton"android:layout_width="@dimen/button_width_med"android:layout_marginStart="@dimen/button_margin_side"- android:text="Prev"+ android:text="@string/btn_prev"app:icon="@drawable/ic_prev"app:layout_constraintBottom_toBottomOf="@+id/map_coordinator"app:layout_constraintStart_toStartOf="@+id/map_coordinator"@@ -190,7 +191,7 @@style="@style/NormalButton"android:layout_width="@dimen/button_width_med"android:layout_marginEnd="@dimen/button_margin_side"- android:text="Next"+ android:text="@string/btn_next"app:icon="@drawable/ic_next"app:iconGravity="end"app:layout_constraintBaseline_toBaselineOf="@+id/map_prev_btn"diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xmlindex a1e4aa44..5bd5c5c8 100644--- a/app/src/main/res/layout/fragment_passes.xml+++ b/app/src/main/res/layout/fragment_passes.xml@@ -13,6 +13,7 @@style="@style/ToolbarButton"android:rotation="45"android:layout_gravity="start|center_vertical"+ android:contentDescription="@string/btn_refresh"android:src="@drawable/ic_refresh" /><TextView@@ -23,6 +24,7 @@android:id="@+id/passes_map_btn"style="@style/ToolbarButton"android:layout_gravity="end|center_vertical"+ android:contentDescription="@string/btn_map"android:src="@drawable/ic_map" /></androidx.cardview.widget.CardView>@@ -68,7 +70,7 @@android:layout_width="@dimen/button_width_max"android:layout_marginStart="@dimen/button_margin_side"android:layout_gravity="start|center_vertical"- android:text="Filter" />+ android:text="@string/btn_filter" /><Buttonandroid:id="@+id/passes_settings_btn"@@ -76,7 +78,7 @@android:layout_width="@dimen/button_width_max"android:layout_marginEnd="@dimen/button_margin_side"android:layout_gravity="end|center_vertical"- android:text="Настройки" />+ android:text="@string/btn_settings" /></com.google.android.material.bottomappbar.BottomAppBar>@@ -84,6 +86,7 @@android:id="@+id/passes_fab"style="@style/FloatingActionButton"android:src="@drawable/ic_sputnik"+ android:contentDescription="@string/btn_satellites"app:layout_anchor="@id/passes_bottomBar" /></androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xmlindex c411bdd7..f6d50549 100644--- a/app/src/main/res/layout/fragment_radar.xml+++ b/app/src/main/res/layout/fragment_radar.xml@@ -16,6 +16,7 @@android:id="@+id/radar_back"style="@style/ToolbarButton"android:layout_gravity="start|center_vertical"+ android:contentDescription="@string/btn_back"android:src="@drawable/ic_back" /><TextView@@ -26,6 +27,7 @@android:id="@+id/radar_map"style="@style/ToolbarButton"android:layout_gravity="end|center_vertical"+ android:contentDescription="@string/btn_map"android:src="@drawable/ic_map" /></androidx.cardview.widget.CardView>@@ -144,7 +146,7 @@style="@style/NormalButton"android:layout_width="0dp"android:layout_marginStart="@dimen/button_margin_side"- android:text="Notify"+ android:text="@string/btn_notify"app:layout_constraintBottom_toBottomOf="@+id/radar_coordinator"app:layout_constraintEnd_toStartOf="@+id/radar_data_name"app:layout_constraintHorizontal_bias="0.5"@@ -173,7 +175,7 @@style="@style/NormalButton"android:layout_width="0dp"android:layout_marginEnd="@dimen/button_margin_side"- android:text="Settings"+ android:text="@string/btn_settings"app:layout_constraintBaseline_toBaselineOf="@+id/radar_prev_btn"app:layout_constraintEnd_toEndOf="@+id/radar_coordinator"app:layout_constraintStart_toEndOf="@+id/radar_data_name" />diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xmlindex 7de20dfa..f0307be9 100644--- a/app/src/main/res/layout/fragment_settings.xml+++ b/app/src/main/res/layout/fragment_settings.xml@@ -12,6 +12,7 @@android:id="@+id/settings_back"style="@style/ToolbarButton"android:layout_gravity="start|center_vertical"+ android:contentDescription="@string/btn_back"android:src="@drawable/ic_back" /><TextView@@ -43,7 +44,7 @@<includeandroid:id="@+id/settings_info"- layout="@layout/card_prefs_about"+ layout="@layout/card_about"android:layout_width="match_parent"android:layout_height="wrap_content"app:layout_constraintEnd_toEndOf="parent"@@ -52,7 +53,7 @@<includeandroid:id="@+id/settings_location"- layout="@layout/card_prefs_location"+ layout="@layout/card_location"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginTop="@dimen/view_default_margin"@@ -62,7 +63,7 @@<includeandroid:id="@+id/settings_data"- layout="@layout/card_prefs_update"+ layout="@layout/card_data"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginTop="@dimen/view_default_margin"@@ -72,7 +73,7 @@<includeandroid:id="@+id/settings_tracking"- layout="@layout/card_prefs_tracking"+ layout="@layout/card_tracking"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginTop="@dimen/view_default_margin"@@ -82,7 +83,7 @@<includeandroid:id="@+id/settings_other"- layout="@layout/card_prefs_other"+ layout="@layout/card_other"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginTop="@dimen/view_default_margin"@@ -92,7 +93,7 @@<includeandroid:id="@+id/settings_warranty"- layout="@layout/card_prefs_warranty"+ layout="@layout/card_info"android:layout_width="match_parent"android:layout_height="wrap_content"android:layout_marginTop="@dimen/view_default_margin"@@ -117,7 +118,7 @@android:layout_width="@dimen/button_width_max"android:layout_marginStart="@dimen/button_margin_side"android:layout_gravity="start|center_vertical"- android:text="@string/about_github" />+ android:text="@string/btn_github" /><Buttonandroid:id="@+id/settings_next_btn"@@ -125,7 +126,7 @@android:layout_width="@dimen/button_width_max"android:layout_marginEnd="@dimen/button_margin_side"android:layout_gravity="end|center_vertical"- android:text="@string/about_fdroid" />+ android:text="@string/btn_fdroid" /></com.google.android.material.bottomappbar.BottomAppBar>@@ -133,6 +134,7 @@android:id="@+id/settings_fab"style="@style/FloatingActionButton"android:src="@drawable/ic_support"+ android:contentDescription="@string/btn_support"app:layout_anchor="@id/settings_bottom_bar" /></androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xmlindex 73514a64..774ac566 100644--- a/app/src/main/res/layout/item_entry.xml+++ b/app/src/main/res/layout/item_entry.xml@@ -1,6 +1,5 @@<?xml version="1.0" encoding="utf-8"?><androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"- android:id="@+id/entry_card"style="@style/RecyclerItemCard"><CheckBoxdiff --git a/app/src/main/res/layout/item_mode.xml b/app/src/main/res/layout/item_mode.xmlindex 363467c2..7ce35b28 100644--- a/app/src/main/res/layout/item_mode.xml+++ b/app/src/main/res/layout/item_mode.xml@@ -1,6 +1,5 @@<?xml version="1.0" encoding="utf-8"?><androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"- android:id="@+id/mode_card"style="@style/RecyclerItemCard"><CheckBoxdiff --git a/app/src/main/res/layout/item_pass.xml b/app/src/main/res/layout/item_pass.xmlindex 29e07308..175e8ba1 100644--- a/app/src/main/res/layout/item_pass.xml+++ b/app/src/main/res/layout/item_pass.xml@@ -1,7 +1,6 @@<?xml version="1.0" encoding="utf-8"?><androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/pass_card"style="@style/RecyclerItemCard"><androidx.constraintlayout.widget.ConstraintLayoutdiff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex ac380ee2..8d2a60fe 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -1,10 +1,32 @@<?xml version="1.0" encoding="utf-8"?><resources>- <string name="yes">Да</string>- <string name="no">Нет</string>- <string name="btn_accept">Принять</string><string name="btn_add">Добавить</string>+ <string name="btn_accept">Принять</string><string name="btn_cancel">Отмена</string>+ <string name="btn_back">Назад</string>+ <string name="btn_modes">Режимы</string>+ <string name="btn_select">Выбрать</string>+ <string name="btn_done">Готово</string>+ <string name="btn_clear">Очистка</string>+ <string name="btn_refresh">Обновить</string>+ <string name="btn_map">Карта</string>+ <string name="btn_filter">Фильтр</string>+ <string name="btn_satellites">Спутники</string>+ <string name="btn_settings">Настройки</string>+ <string name="btn_prev">Пред</string>+ <string name="btn_next">След</string>+ <string name="btn_notify">Уведомить</string>+ <string name="btn_gps">GPS</string>+ <string name="btn_manual">Ввести</string>+ <string name="btn_qth">QTH</string>+ <string name="btn_web">Онлайн</string>+ <string name="btn_file">Файл</string>+ <string name="btn_github">GitHub</string>+ <string name="btn_support">Поддержать</string>+ <string name="btn_fdroid">F-Droid</string>++ <string name="yes">Да</string>+ <string name="no">Нет</string><string name="menu_satellites">Спутники</string><string name="menu_passes">Пролеты</string>@@ -82,7 +104,7 @@<string name="about_subtitle">Трекер спутников для Android</string><string name="about_support">Поддержать</string>- <string name="location_title">Местоположение наземной станции</string>+ <string name="location_title">Местоположение</string><string name="location_lat">Широта: %.4f°</string><string name="location_lon">Долгота: %.4f°</string><string name="location_gps">Данные GPS</string>@@ -104,7 +126,7 @@<string name="tracking_port_hint">Порт</string><string name="tracking_port_invalid">Введите порт в диапазоне от 1024 до 65535</string>- <string name="update_title">Обновление данных спутников</string>+ <string name="update_title">Обновление данных</string><string name="update_web">Вэб</string><string name="update_file">Файл</string><string name="update_clear">Удалить</string>diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xmlindex e0b2ecaa..4b250220 100644--- a/app/src/main/res/values/dimens.xml+++ b/app/src/main/res/values/dimens.xml@@ -22,7 +22,7 @@<dimen name="text_size_small">15sp</dimen><dimen name="text_size_medium">16sp</dimen><dimen name="text_size_mediumLarge">18sp</dimen>- <dimen name="text_size_large">20sp</dimen>+ <dimen name="text_size_large">21sp</dimen><dimen name="text_size_frequency">24sp</dimen><dimen name="text_size_app_timer">42sp</dimen><dimen name="text_size_app_title">48sp</dimen>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 564ae863..38a0910b 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -2,11 +2,33 @@<resources><string name="app_name" translatable="false">Look4Sat</string>- <string name="yes">Yes</string>- <string name="no">No</string>- <string name="btn_accept">Accept</string><string name="btn_add">Add</string>+ <string name="btn_accept">Accept</string><string name="btn_cancel">Cancel</string>+ <string name="btn_back">Back</string>+ <string name="btn_modes">Modes</string>+ <string name="btn_select">Select</string>+ <string name="btn_done">Done</string>+ <string name="btn_clear">Clear</string>+ <string name="btn_refresh">Refresh</string>+ <string name="btn_map">Map</string>+ <string name="btn_filter">Filter</string>+ <string name="btn_satellites">Satellites</string>+ <string name="btn_settings">Settings</string>+ <string name="btn_prev">Prev</string>+ <string name="btn_next">Next</string>+ <string name="btn_notify">Notify</string>+ <string name="btn_gps">GPS</string>+ <string name="btn_manual">Manual</string>+ <string name="btn_qth">QTH</string>+ <string name="btn_web">Online</string>+ <string name="btn_file">File</string>+ <string name="btn_github">GitHub</string>+ <string name="btn_support">Support</string>+ <string name="btn_fdroid">F-Droid</string>++ <string name="yes">Yes</string>+ <string name="no">No</string><string name="menu_satellites">Satellites</string><string name="menu_passes">Passes</string>@@ -102,7 +124,7 @@<string name="about_support">Support</string><string name="about_fdroid" translatable="false">F-Droid</string>- <string name="location_title">Station position update</string>+ <string name="location_title">Station position</string><string name="location_lat">Latitude: %.4f°</string><string name="location_lon">Longitude: %.4f°</string><string name="location_gps">From GPS</string>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex 775f139d..3e40fb45 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -63,7 +63,6 @@<item name="android:background">@color/transparent</item><item name="android:gravity">center</item><item name="android:includeFontPadding">false</item>- <item name="android:inputType">text</item><item name="android:textColor">@color/themeAccent</item><item name="android:textColorHint">@color/themeAccent</item><item name="android:textSize">@dimen/text_size_large</item>