mirror
/
Look4Sat
kopia lustrzana https://github.com/rt-bishop/Look4Sat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

v2.4.0 - Showing azimuth for respective maxElevation

pull/65/head
Arty Bishop 2021-04-18 19:54:32 +01:00
rodzic e27224d9a8
commit 5f7c3e3786
8 zmienionych plików z 29 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/build.gradle
Wyświetl plik

@ -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")

3
app/src/main/java/com/rtbishop/look4sat/ui/Look4SatActivity.kt
Wyświetl plik

@ -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)
}
}
}

4
app/src/main/java/com/rtbishop/look4sat/ui/passesScreen/PassesAdapter.kt
Wyświetl plik

@ -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
}

18
app/src/main/res/layout/item_pass_leo.xml
Wyświetl plik

@ -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" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_losAz"
@ -85,13 +85,13 @@
app:layout_constraintTop_toBottomOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_alt"
android:id="@+id/pass_leo_tcaAz"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pat_altitude"
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" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_end"
@ -112,7 +112,7 @@
app:layout_constraintBottom_toBottomOf="@+id/pass_leo_bg"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
app:layout_constraintStart_toStartOf="@+id/pass_leo_start"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_alt" />
app:layout_constraintTop_toBottomOf="@+id/pass_leo_maxEl" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>

1
app/src/main/res/values-ru/strings.xml
Wyświetl plik

@ -24,6 +24,7 @@
<string name="passes_error">Нет предстоящих пролётов</string>
<string name="pass_aosAz">НПС - %.1f°</string>
<string name="pass_tcaAz">Азимут: %.1f°</string>
<string name="pass_maxEl">МаксЭлев: %.1f°</string>
<string name="pass_losAz">%.1f° - КПС</string>

7
app/src/main/res/values/strings.xml
Wyświetl plik

@ -32,7 +32,8 @@
<string name="pass_satName" translatable="false">%s</string>
<string name="pass_satId" translatable="false">Id:%d</string>
<string name="pass_aosAz">AOS - %.1f°</string>
<string name="pass_maxEl">MaxEl: %.1f°</string>
<string name="pass_tcaAz">Azimuth: %.1f°</string>
<string name="pass_maxEl">MaxElev: %.1f°</string>
<string name="pass_losAz">%.1f° - LOS</string>
<string name="pass_startTime" translatable="false">HH:mm:ss - EEE</string>
<string name="pass_endTime" translatable="false">EEE - HH:mm:ss</string>
@ -50,8 +51,8 @@
<string name="map_coverage">Coverage: %.0f km</string>
<string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>
<string name="pat_azimuth">Az: %.1f°</string>
<string name="pat_elevation">El: %.1f°</string>
<string name="pat_azimuth">Azimuth: %.1f°</string>
<string name="pat_elevation">Elevation: %.1f°</string>
<string name="pat_distance">Range: %.0f km</string>
<string name="pat_altitude">Altitude: %.0f km</string>
<string name="pat_osm_idName" translatable="false">Id:%s / %s</string>

5
fastlane/metadata/android/en-US/changelogs/240.txt 100644
Wyświetl plik

@ -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

13
fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
Wyświetl plik

@ -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
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