v3.1.4 - Fixed leap year bug, various other minor fixes

app/build.gradle

@@ -7,16 +7,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.0'
     namespace 'com.rtbishop.look4sat'
-
+    compileSdk 34
     defaultConfig {
         applicationId "com.rtbishop.look4sat"
         minSdk 21
-        targetSdk 33
-        versionCode 313
-        versionName '3.1.3'
+        targetSdk 34
+        versionCode 314
+        versionName '3.1.4'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -43,11 +41,11 @@ android {
         kotlinCompilerExtensionVersion compose_compiler_version
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     testOptions {
         animationsDisabled true
@@ -56,7 +54,7 @@ android {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 dependencies {

app/proguard-rules.pro

@@ -0,0 +1,11 @@
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE

app/src/main/java/com/rtbishop/look4sat/framework/data/LocalRadioSource.kt

@@ -17,10 +17,10 @@
  */
 package com.rtbishop.look4sat.framework.data
 
-import com.rtbishop.look4sat.domain.data.ILocalRadioSource
-import com.rtbishop.look4sat.framework.data.dao.RadiosDao
 import com.rtbishop.look4sat.domain.model.SatRadio as DomainRadio
 import com.rtbishop.look4sat.framework.model.SatRadio as FrameworkRadio
+import com.rtbishop.look4sat.domain.data.ILocalRadioSource
+import com.rtbishop.look4sat.framework.data.dao.RadiosDao
 
 class LocalRadioSource(private val radiosDao: RadiosDao) : ILocalRadioSource {
 
@@ -31,6 +31,7 @@ class LocalRadioSource(private val radiosDao: RadiosDao) : ILocalRadioSource {
     }
 
     override suspend fun insertRadios(radios: List<DomainRadio>) {
+        radiosDao.deleteRadios()
         radiosDao.insertRadios(radios.toFrameworkRadios())
     }
 

app/src/main/java/com/rtbishop/look4sat/injection/BaseModule.kt

@@ -28,7 +28,12 @@ import com.rtbishop.look4sat.domain.data.DataRepository
 import com.rtbishop.look4sat.domain.predict.SatelliteManager
 import com.rtbishop.look4sat.framework.LocationManager
 import com.rtbishop.look4sat.framework.SettingsManager
-import com.rtbishop.look4sat.framework.data.*
+import com.rtbishop.look4sat.framework.data.FileDataSource
+import com.rtbishop.look4sat.framework.data.LocalDatabase
+import com.rtbishop.look4sat.framework.data.LocalEntrySource
+import com.rtbishop.look4sat.framework.data.LocalRadioSource
+import com.rtbishop.look4sat.framework.data.MIGRATION_1_2
+import com.rtbishop.look4sat.framework.data.RemoteDataSource
 import com.rtbishop.look4sat.presentation.radarScreen.BTReporter
 import com.rtbishop.look4sat.utility.DataParser
 import com.rtbishop.look4sat.utility.DataReporter
@@ -37,11 +42,11 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import okhttp3.OkHttpClient
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)

app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarViewModel.kt

@@ -19,7 +19,11 @@ package com.rtbishop.look4sat.presentation.radarScreen
 
 import android.hardware.GeomagneticField
 import android.util.Log
-import androidx.lifecycle.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.liveData
+import androidx.lifecycle.viewModelScope
 import com.rtbishop.look4sat.domain.IDataRepository
 import com.rtbishop.look4sat.domain.ISatelliteManager
 import com.rtbishop.look4sat.domain.ISettingsManager
@@ -33,10 +37,10 @@ import com.rtbishop.look4sat.utility.DataReporter
 import com.rtbishop.look4sat.utility.round
 import com.rtbishop.look4sat.utility.toDegrees
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @HiltViewModel
 class RadarViewModel @Inject constructor(
@@ -107,8 +111,8 @@ class RadarViewModel @Inject constructor(
             if (settings.getRotatorEnabled()) {
                 val server = settings.getRotatorServer()
                 val port = settings.getRotatorPort().toInt()
-                val azimuth = satPos.azimuth.toDegrees().round(1)
-                val elevation = satPos.elevation.toDegrees().round(1)
+                val azimuth = satPos.azimuth.toDegrees().round(2)
+                val elevation = satPos.elevation.toDegrees().round(2)
                 reporter.reportRotation(server, port, azimuth, elevation)
             }
             _passData.postValue(RadarData(satPos, track))

app/src/main/res/values/strings.xml

@@ -69,12 +69,12 @@
     <string name="pass_satName">%s</string>
     <string name="pass_satId">Id:%d</string>
     <string name="pass_aosAz">AOS - %.1f°</string>
-    <string name="pass_elevation">Elevation: %.1f°</string>
+    <string name="pass_elevation">ELEV: %.1f°</string>
     <string name="pass_los">%.1f° - LOS</string>
-    <string name="pass_altitude">Altitude: %.0f km</string>
+    <string name="pass_altitude">ALT: %.0f km</string>
     <string name="pass_placeholder"> - - : - - </string>
-    <string name="pass_startTime">HH:mm:ss - EEE</string>
-    <string name="pass_endTime">EEE - HH:mm:ss</string>
+    <string name="pass_startTime">HH:mm:ss - MMM dd</string>
+    <string name="pass_endTime">dd MMM - HH:mm:ss</string>
 
     <string name="radar_az_text">Azimuth</string>
     <string name="radar_az_value">%.1f°</string>