diff --git a/app/build.gradle b/app/build.gradle index 5106f8ac..e5a84ac6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.rtbishop.look4sat" minSdkVersion 21 targetSdkVersion 30 - versionCode 232 - versionName "2.3.2" + versionCode 240 + versionName "2.4.0" kapt { arguments { arg("room.schemaLocation", "$projectDir/schemas") diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt index 215148a2..80f84f2b 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt @@ -25,7 +25,6 @@ import androidx.navigation.ui.setupWithNavController import com.rtbishop.look4sat.R import com.rtbishop.look4sat.databinding.ActivityMainBinding import com.rtbishop.look4sat.utility.PrefsManager -import com.rtbishop.look4sat.utility.navigateSafe import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject @@ -45,7 +44,7 @@ class Look4SatActivity : AppCompatActivity() { binding.navBottom.setupWithNavController(navHost.navController) if (prefsManager.isFirstLaunch()) { prefsManager.setFirstLaunchDone() - navHost.navController.navigateSafe(R.id.nav_dialog_splash) + navHost.navController.navigate(R.id.nav_dialog_splash) } } } diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt index 86ef53f2..221bb84c 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt @@ -78,7 +78,7 @@ class PassesAdapter(private val isUTC: Boolean, private val clickListener: Passe RecyclerView.ViewHolder(binding.root) { private val satIdFormat = itemView.context.getString(R.string.pass_satId) - private val altFormat = itemView.context.getString(R.string.pat_altitude) + private val tcaAzFormat = itemView.context.getString(R.string.pass_tcaAz) private val aosAzFormat = itemView.context.getString(R.string.pass_aosAz) private val maxElFormat = itemView.context.getString(R.string.pass_maxEl) private val losAzFormat = itemView.context.getString(R.string.pass_losAz) @@ -100,7 +100,7 @@ class PassesAdapter(private val isUTC: Boolean, private val clickListener: Passe passLeoMaxEl.text = String.format(maxElFormat, satPass.maxElevation) passLeoLosAz.text = String.format(losAzFormat, satPass.losAzimuth) passLeoStart.text = startFormat.format(satPass.aosDate) - passLeoAlt.text = String.format(altFormat, satPass.altitude) + passLeoTcaAz.text = String.format(tcaAzFormat, satPass.tcaAzimuth) passLeoEnd.text = endFormat.format(satPass.losDate) passLeoProgress.progress = satPass.progress } diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xml index 6463d729..26bdd296 100644 --- a/app/src/main/res/layout/item_pass_leo.xml +++ b/app/src/main/res/layout/item_pass_leo.xml @@ -59,9 +59,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pass_maxEl" - app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz" - app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz" - app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" /> + app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start" + app:layout_constraintEnd_toEndOf="@+id/pass_leo_end" + app:layout_constraintStart_toStartOf="@+id/pass_leo_start" /> + android:text="@string/pass_tcaAz" + app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz" + app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz" + app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" /> + app:layout_constraintTop_toBottomOf="@+id/pass_leo_maxEl" /> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index abc37dc3..82411fd1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -24,6 +24,7 @@ Нет предстоящих пролётов НПС - %.1f° + Азимут: %.1f° МаксЭлев: %.1f° %.1f° - КПС diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f772a31..195b1c95 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,7 +32,8 @@ %s Id:%d AOS - %.1f° - MaxEl: %.1f° + Azimuth: %.1f° + MaxElev: %.1f° %.1f° - LOS HH:mm:ss - EEE EEE - HH:mm:ss @@ -50,8 +51,8 @@ Coverage: %.0f km Wikimedia maps | Map data © OpenStreetMap contributors - Az: %.1f° - El: %.1f° + Azimuth: %.1f° + Elevation: %.1f° Range: %.0f km Altitude: %.0f km Id:%s / %s diff --git a/fastlane/metadata/android/en-US/changelogs/240.txt b/fastlane/metadata/android/en-US/changelogs/240.txt new file mode 100644 index 00000000..a3f94317 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/240.txt @@ -0,0 +1,5 @@ +Removed hardcoded screen orientation +Removed redundant permission from manifest +Added antenna rotator control via socket +Showing azimuth for respective maxElevation +Showing satellite name on the polar screen diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US index 675e63c6..a3f94317 100644 --- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US +++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US @@ -1,8 +1,5 @@ -Added satellite items filtering by transmitter mode -Now updating recyclers views asyncronously -Switched to concurrent satellite data update -Minor visual changes to map info -Separated application screens logic -Bug fixes, huge code cleanup -Fixed recent InflatingException -Fixed transmitters doppler frequency update logic \ No newline at end of file +Removed hardcoded screen orientation +Removed redundant permission from manifest +Added antenna rotator control via socket +Showing azimuth for respective maxElevation +Showing satellite name on the polar screen