From e6d06718161356e3ee8d9bb4ccba548477ec7f5b Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Fri, 17 Sep 2021 09:38:49 +0100 Subject: [PATCH] v2.5.4 - Added radar sweep animation, fixed update issue --- .github/workflows/main.yml | 6 +++--- app/build.gradle | 10 +++++----- .../rtbishop/look4sat/framework/PreferencesProvider.kt | 5 +++++ .../presentation/satPassInfoScreen/PassInfoFragment.kt | 1 + .../presentation/satPassInfoScreen/PassInfoView.kt | 4 ++++ app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/preference.xml | 5 +++++ .../com/rtbishop/look4sat/data/PreferencesSource.kt | 2 ++ 9 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 22131172..8a332d88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - name: Setup java environment uses: actions/setup-java@v1 - with: {java-version: 1.8} + with: {java-version: 11} - name: Assemble APK and Bundle run: | @@ -32,7 +32,7 @@ jobs: alias: ${{ secrets.KEY_ALIAS }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: "30.0.3" + BUILD_TOOLS_VERSION: "31.0.0" - name: Sign Bundle uses: r0adkll/sign-android-release@v1 @@ -44,7 +44,7 @@ jobs: alias: ${{ secrets.KEY_ALIAS }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: "30.0.3" + BUILD_TOOLS_VERSION: "31.0.0" - name: Deploy Bundle to Play Store uses: r0adkll/upload-google-play@v1 diff --git a/app/build.gradle b/app/build.gradle index 402891ab..0e5f50b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { minSdkVersion 23 resConfigs "en,ru" targetSdkVersion 31 - versionCode 253 - versionName "2.5.3" + versionCode 254 + versionName "2.5.4" javaCompileOptions { annotationProcessorOptions { @@ -38,11 +38,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } buildFeatures { viewBinding true diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt index 92c84f75..b328d9ef 100644 --- a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt +++ b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesProvider.kt @@ -69,6 +69,7 @@ class PreferencesProvider @Inject constructor( const val keySources = "prefTleSourcesKey" const val keyModes = "satModes" const val keyCompass = "compass" + const val keyRadarSweep = "radarSweep" const val keyTextLabels = "shouldUseTextLabels" const val keyTimeUTC = "timeUTC" const val keyHoursAhead = "hoursAhead" @@ -156,6 +157,10 @@ class PreferencesProvider @Inject constructor( return preferences.getBoolean(keyCompass, true) } + override fun shouldShowSweep(): Boolean { + return preferences.getBoolean(keyRadarSweep, true) + } + override fun isSetupDone(): Boolean { return preferences.getBoolean(keyInitialSetup, false) } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt index dcce78c9..da83153f 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satPassInfoScreen/PassInfoFragment.kt @@ -78,6 +78,7 @@ class PassInfoFragment : Fragment(R.layout.fragment_polar) { setShowAim(preferences.shouldUseCompass()) setPass(pass) setStationPos(stationPos) + setScanning(preferences.shouldShowSweep()) } binding.frame.addView(passInfoView) observeTransmitters(pass, satTransAdapter, binding) 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 cc83c47c..8b0f0d4d 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 @@ -99,6 +99,10 @@ class PassInfoView(context: Context) : View(context) { private var pitch: Float = 0f private var roll: Float = 0f + fun setScanning(isScanning: Boolean) { + shouldShowSweep = isScanning + } + fun setPass(satPass: SatPass) { this.satPass = satPass } diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cbe29640..8787603f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -59,6 +59,7 @@ Использовать текстовые метки Другие настройки Использовать компас + Показывать анимацию радара Показывать время пролета по UTC Настройки слежения diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b879ca86..ae87fa23 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,6 +75,7 @@ Use text labels instead of icons Other Show pass time in UTC + Enable radar sweep animation Use sensors to rotate radar view Tracking preferences diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index c249a72d..66460680 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -74,6 +74,11 @@ android:key="timeUTC" android:title="@string/pref_time_utc_title" app:iconSpaceReserved="false" /> +