From afe9f77869ced4c4d9e774c9690aa46d2cb34a72 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 19 Feb 2022 12:32:24 +0000 Subject: [PATCH] Further changes to strings, layouts and styles --- .../settingsScreen/SettingsFragment.kt | 30 +++--- .../{card_prefs_about.xml => card_about.xml} | 56 +++-------- app/src/main/res/layout/card_data.xml | 94 +++++++++++++++++++ ...{card_prefs_warranty.xml => card_info.xml} | 21 +++-- ...d_prefs_location.xml => card_location.xml} | 22 ++--- .../{card_prefs_other.xml => card_other.xml} | 43 +++++---- app/src/main/res/layout/card_prefs_update.xml | 73 -------------- ...d_prefs_tracking.xml => card_tracking.xml} | 27 +++--- app/src/main/res/layout/fragment_entries.xml | 8 +- app/src/main/res/layout/fragment_map.xml | 5 +- app/src/main/res/layout/fragment_passes.xml | 7 +- app/src/main/res/layout/fragment_radar.xml | 6 +- app/src/main/res/layout/fragment_settings.xml | 18 ++-- app/src/main/res/layout/item_entry.xml | 1 - app/src/main/res/layout/item_mode.xml | 1 - app/src/main/res/layout/item_pass.xml | 1 - app/src/main/res/values-ru/strings.xml | 32 ++++++- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/strings.xml | 30 +++++- app/src/main/res/values/styles.xml | 1 - 20 files changed, 268 insertions(+), 210 deletions(-) rename app/src/main/res/layout/{card_prefs_about.xml => card_about.xml} (62%) create mode 100644 app/src/main/res/layout/card_data.xml rename app/src/main/res/layout/{card_prefs_warranty.xml => card_info.xml} (74%) rename app/src/main/res/layout/{card_prefs_location.xml => card_location.xml} (90%) rename app/src/main/res/layout/{card_prefs_other.xml => card_other.xml} (68%) delete mode 100644 app/src/main/res/layout/card_prefs_update.xml rename app/src/main/res/layout/{card_prefs_tracking.xml => card_tracking.xml} (85%) 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.kt index 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>(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) { when (state) { is DataState.Success -> { - binding.settingsData.updateProgress.isIndeterminate = false + binding.settingsData.dataProgress.isIndeterminate = false viewModel.setUpdateHandled() showToast("Data updated successfully") } is DataState.Error -> { - binding.settingsData.updateProgress.isIndeterminate = false + binding.settingsData.dataProgress.isIndeterminate = false viewModel.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.xml similarity index 62% rename from app/src/main/res/layout/card_prefs_about.xml rename to app/src/main/res/layout/card_about.xml index 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" /> @@ -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" /> -