Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added app-wide supervisor scope to CoroutinesModule.kt
Arty Bishopa15e789e70e8
diff --git a/app/src/main/java/com/rtbishop/look4sat/di/ApplicationModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/ApplicationModule.ktindex 13558e76..b7c78fca 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/ApplicationModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/ApplicationModule.kt@@ -19,6 +19,7 @@package com.rtbishop.look4sat.di+import android.content.ContentResolverimport android.content.Contextimport android.content.SharedPreferencesimport android.location.LocationManager@@ -36,13 +37,19 @@ object ApplicationModule {@Provides@Singleton- fun getLocationManager(@ApplicationContext context: Context): LocationManager {+ fun provideContentResolver(@ApplicationContext context: Context): ContentResolver {+ return context.contentResolver+ }++ @Provides+ @Singleton+ fun provideLocationManager(@ApplicationContext context: Context): LocationManager {return context.getSystemService(Context.LOCATION_SERVICE) as LocationManager}@Provides@Singleton- fun getSharedPreferences(@ApplicationContext context: Context): SharedPreferences {+ fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {return PreferenceManager.getDefaultSharedPreferences(context)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.ktsimilarity index 76%rename from app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.ktrename to app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.ktindex d3ee5aa0..e6b39604 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/DispatchersModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/CoroutinesModule.kt@@ -24,24 +24,31 @@ import dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.components.SingletonComponentimport kotlinx.coroutines.CoroutineDispatcher+import kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.SupervisorJobimport javax.inject.Qualifier+import javax.inject.Singleton@Module@InstallIn(SingletonComponent::class)-object DispatchersModule {+object CoroutinesModule {++ @Provides+ @Singleton+ fun provideApplicationScope(): CoroutineScope = CoroutineScope(SupervisorJob())@Provides@DefaultDispatcher- fun getDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default+ fun provideDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default@Provides@IoDispatcher- fun getIoDispatcher(): CoroutineDispatcher = Dispatchers.IO+ fun provideIoDispatcher(): CoroutineDispatcher = Dispatchers.IO@Provides@MainDispatcher- fun getMainDispatcher(): CoroutineDispatcher = Dispatchers.Main+ fun provideMainDispatcher(): CoroutineDispatcher = Dispatchers.Main}@Qualifierdiff --git a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.ktindex b506e6ef..061722c6 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt@@ -36,19 +36,19 @@ object NetworkModule {@Provides@Singleton- fun getOkHttpClient(): OkHttpClient {+ fun provideOkHttpClient(): OkHttpClient {return OkHttpClient()}@Provides@Singleton- fun getMoshi(): Moshi {+ fun provideMoshi(): Moshi {return Moshi.Builder().build()}@Provides@Singleton- fun getTransmittersApi(): TransmittersApi {+ fun provideTransmittersApi(): TransmittersApi {return Retrofit.Builder().baseUrl("https://db.satnogs.org/api/").addConverterFactory(MoshiConverterFactory.create())diff --git a/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.ktindex beee5edf..092eb73b 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/RepositoryModule.kt@@ -19,7 +19,6 @@package com.rtbishop.look4sat.di-import android.content.ContentResolverimport android.content.Contextimport androidx.room.Roomimport com.rtbishop.look4sat.repository.localData.EntriesDao@@ -41,31 +40,25 @@ object RepositoryModule {@Provides@Singleton- fun getContentResolver(@ApplicationContext context: Context): ContentResolver {- return context.contentResolver- }-- @Provides- @Singleton- fun getEntriesDao(db: SatelliteDb): EntriesDao {+ fun provideEntriesDao(db: SatelliteDb): EntriesDao {return db.entriesDao()}@Provides@Singleton- fun getSourcesDao(db: SatelliteDb): SourcesDao {+ fun provideSourcesDao(db: SatelliteDb): SourcesDao {return db.sourcesDao()}@Provides@Singleton- fun getTransmittersDao(db: SatelliteDb): TransmittersDao {+ fun provideTransmittersDao(db: SatelliteDb): TransmittersDao {return db.transmittersDao()}@Provides@Singleton- fun getSatelliteDb(@ApplicationContext context: Context, moshi: Moshi): SatelliteDb {+ fun provideSatelliteDb(@ApplicationContext context: Context, moshi: Moshi): SatelliteDb {RoomConverters.initialize(moshi)return Room.databaseBuilder(context, SatelliteDb::class.java, "satDb").build()}