From eb1ac3341f768314878c42317ddbd161a9c94947 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Wed, 19 May 2021 09:39:01 +0100 Subject: [PATCH] v2.5.2 - Fixed aiming icon issue #57 and list scrolling issue #59 --- app/build.gradle | 4 ++-- .../satItemScreen/SatItemFragment.kt | 24 ------------------- .../satPassInfoScreen/PassInfoView.kt | 10 +++++++- app/src/main/res/layout/dialog_source.xml | 16 ------------- .../metadata/android/en-US/changelogs/252.txt | 10 ++++++++ .../android/en-US/whatsnew/whatsnew-en-US | 3 +++ 6 files changed, 24 insertions(+), 43 deletions(-) delete mode 100644 app/src/main/res/layout/dialog_source.xml create mode 100644 fastlane/metadata/android/en-US/changelogs/252.txt diff --git a/app/build.gradle b/app/build.gradle index 2d65f8fd..99f64859 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.rtbishop.look4sat" minSdkVersion 21 targetSdkVersion 30 - versionCode 251 - versionName "2.5.1" + versionCode 252 + versionName "2.5.2" } buildTypes { diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt index 9dece856..ab28acdd 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satItemScreen/SatItemFragment.kt @@ -18,10 +18,8 @@ package com.rtbishop.look4sat.presentation.satItemScreen import android.os.Bundle -import android.util.Patterns import android.view.View import androidx.activity.result.contract.ActivityResultContracts -import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController @@ -29,7 +27,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.rtbishop.look4sat.R -import com.rtbishop.look4sat.databinding.DialogSourceBinding import com.rtbishop.look4sat.databinding.FragmentEntriesBinding import com.rtbishop.look4sat.domain.model.SatItem import com.rtbishop.look4sat.framework.model.Result @@ -66,10 +63,8 @@ class SatItemFragment : Fragment(R.layout.fragment_entries) { addItemDecoration(RecyclerDivider(R.drawable.rec_divider_light)) } importWeb.setOnClickListener { -// viewModel.updateEntriesFromWeb(null) findNavController().navigateSafe(R.id.action_entries_to_sources) } -// importSource.setOnClickListener { showSourceDialog() } importFile.setOnClickListener { filePicker.launch("*/*") } selectMode.setOnClickListener { showModesDialog() } selectAll.setOnClickListener { viewModel.selectCurrentItems() } @@ -93,7 +88,6 @@ class SatItemFragment : Fragment(R.layout.fragment_entries) { satItemAdapter.submitList(result.data) binding.entriesProgress.visibility = View.INVISIBLE binding.entriesRecycler.visibility = View.VISIBLE - binding.entriesRecycler.scrollToPosition(0) } is Result.InProgress -> { binding.entriesProgress.visibility = View.VISIBLE @@ -107,24 +101,6 @@ class SatItemFragment : Fragment(R.layout.fragment_entries) { } } - private fun showSourceDialog() { - val dialogBinding = DialogSourceBinding.inflate(requireActivity().layoutInflater) - val dialogBuilder = AlertDialog.Builder(requireContext()).apply { - setMessage(getString(R.string.sources_title)) - setView(dialogBinding.root) - setPositiveButton(android.R.string.ok) { _, _ -> - val editTextInput = dialogBinding.sourceUrl.text.toString() - if (Patterns.WEB_URL.matcher(editTextInput).matches()) { - viewModel.updateEntriesFromWeb(listOf(editTextInput)) - } else { - requireView().showSnack(getString(R.string.sources_error)) - } - } - setNeutralButton(android.R.string.cancel, null) - } - dialogBuilder.create().show() - } - private fun showModesDialog() { val modes = arrayOf( "AFSK", "AFSK S-Net", "AFSK SALSAT", "AHRPT", "AM", "APT", "BPSK", "BPSK PMT-A3", diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt index 9219630c..862e2e5a 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoView.kt @@ -22,13 +22,19 @@ import android.graphics.* import android.view.View import androidx.core.content.ContextCompat import com.rtbishop.look4sat.R +import com.rtbishop.look4sat.data.PreferencesSource import com.rtbishop.look4sat.domain.predict4kotlin.SatPass +import dagger.hilt.android.AndroidEntryPoint import java.util.* +import javax.inject.Inject import kotlin.math.cos import kotlin.math.sin +@AndroidEntryPoint class PassInfoView(context: Context) : View(context) { + @Inject lateinit var preferencesSource: PreferencesSource + private lateinit var satPass: SatPass private val scale = resources.displayMetrics.density private val radarWidth = resources.displayMetrics.widthPixels @@ -93,7 +99,9 @@ class PassInfoView(context: Context) : View(context) { canvas.drawPath(satTrack, arrowPaint) } drawSatellite(canvas, satPass) - drawCrosshair(canvas, azimuth, pitch) + if (preferencesSource.shouldUseCompass()) { + drawCrosshair(canvas, azimuth, pitch) + } } private fun createPassTrajectory(satPass: SatPass) { diff --git a/app/src/main/res/layout/dialog_source.xml b/app/src/main/res/layout/dialog_source.xml deleted file mode 100644 index 0e9067f8..00000000 --- a/app/src/main/res/layout/dialog_source.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/fastlane/metadata/android/en-US/changelogs/252.txt b/fastlane/metadata/android/en-US/changelogs/252.txt new file mode 100644 index 00000000..0356bdb9 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/252.txt @@ -0,0 +1,10 @@ +Added immediate initial setup +Added pass direction arrow to radar view #52 +Added orientation pointer to radar view +Fixed update triggered crash +Fixed radar view update bug #51 +Fixed tle update issue #53 +Fixed location update bug #54 +Removed aiming icon without sensors #57 +Removed satellite list scroll to the top on selection #59 +Switched to modular architecture \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US index 750e0d86..0356bdb9 100644 --- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US +++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US @@ -1,7 +1,10 @@ Added immediate initial setup Added pass direction arrow to radar view #52 Added orientation pointer to radar view +Fixed update triggered crash Fixed radar view update bug #51 Fixed tle update issue #53 Fixed location update bug #54 +Removed aiming icon without sensors #57 +Removed satellite list scroll to the top on selection #59 Switched to modular architecture \ No newline at end of file