kopia lustrzana https://github.com/rt-bishop/Look4Sat
v2.5.4 - Added radar sweep animation, fixed update issue
rodzic
4bf2e6c768
commit
e6d0671816
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -59,6 +59,7 @@
|
|||
<string name="pref_map_labels">Использовать текстовые метки</string>
|
||||
<string name="pref_other_title">Другие настройки</string>
|
||||
<string name="pref_compass_title">Использовать компас</string>
|
||||
<string name="pref_radar_sweep">Показывать анимацию радара</string>
|
||||
<string name="pref_time_utc_title">Показывать время пролета по UTC</string>
|
||||
|
||||
<string name="tracking_title">Настройки слежения</string>
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
<string name="pref_map_labels">Use text labels instead of icons</string>
|
||||
<string name="pref_other_title">Other</string>
|
||||
<string name="pref_time_utc_title">Show pass time in UTC</string>
|
||||
<string name="pref_radar_sweep">Enable radar sweep animation</string>
|
||||
<string name="pref_compass_title">Use sensors to rotate radar view</string>
|
||||
|
||||
<string name="tracking_title">Tracking preferences</string>
|
||||
|
|
|
@ -74,6 +74,11 @@
|
|||
android:key="timeUTC"
|
||||
android:title="@string/pref_time_utc_title"
|
||||
app:iconSpaceReserved="false" />
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
android:key="radarSweep"
|
||||
android:title="@string/pref_radar_sweep"
|
||||
app:iconSpaceReserved="false" />
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
android:key="compass"
|
||||
|
|
|
@ -43,6 +43,8 @@ interface PreferencesSource {
|
|||
|
||||
fun shouldUseCompass(): Boolean
|
||||
|
||||
fun shouldShowSweep(): Boolean
|
||||
|
||||
fun isSetupDone(): Boolean
|
||||
|
||||
fun setSetupDone()
|
||||
|
|
Ładowanie…
Reference in New Issue