Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Using action navigating to sources dialog, removed unnecessary scopes
Arty Bishopcfdba41ed501
diff --git a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.ktindex 0aa53ce0..39fa1181 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt@@ -24,24 +24,21 @@ import dagger.Moduleimport dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.components.ActivityComponent-import dagger.hilt.android.scopes.ActivityScopedimport okhttp3.OkHttpClientimport retrofit2.Retrofitimport retrofit2.converter.moshi.MoshiConverterFactory@Module@InstallIn(ActivityComponent::class)-class NetworkModule {+object NetworkModule {- @ActivityScoped@Provides- fun provideWebClient(): OkHttpClient {+ fun getOkHttpClient(): OkHttpClient {return OkHttpClient()}- @ActivityScoped@Provides- fun provideTransApi(): TransmittersApi {+ fun getTransmittersApi(): TransmittersApi {return Retrofit.Builder().baseUrl("https://db.satnogs.org/api/").addConverterFactory(MoshiConverterFactory.create())diff --git a/app/src/main/java/com/rtbishop/look4sat/di/PersistenceModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/PersistenceModule.ktindex da00edff..ab478cb5 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/PersistenceModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/PersistenceModule.kt@@ -30,33 +30,28 @@ import dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.components.ActivityComponentimport dagger.hilt.android.qualifiers.ActivityContext-import dagger.hilt.android.scopes.ActivityScoped@Module@InstallIn(ActivityComponent::class)-class PersistenceModule {+object PersistenceModule {- @ActivityScoped@Provides- fun provideEntriesDao(db: SatelliteDb): EntriesDao {+ fun getEntriesDao(db: SatelliteDb): EntriesDao {return db.entriesDao()}- @ActivityScoped@Provides- fun provideTransDao(db: SatelliteDb): TransmittersDao {- return db.transmittersDao()+ fun getSourcesDao(db: SatelliteDb): SourcesDao {+ return db.sourcesDao()}- @ActivityScoped@Provides- fun providesSourcesDao(db: SatelliteDb): SourcesDao {- return db.sourcesDao()+ fun getTransmittersDao(db: SatelliteDb): TransmittersDao {+ return db.transmittersDao()}- @ActivityScoped@Provides- fun provideSatDb(@ActivityContext context: Context): SatelliteDb {+ fun getSatelliteDb(@ActivityContext context: Context): SatelliteDb {return Room.databaseBuilder(context, SatelliteDb::class.java, "satDb").build()}}diff --git a/app/src/main/java/com/rtbishop/look4sat/di/RepoModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/RepoModule.ktindex c1a0aaff..9eb829d6 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/RepoModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/RepoModule.kt@@ -31,41 +31,31 @@ import dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.components.ActivityComponentimport dagger.hilt.android.qualifiers.ActivityContext-import dagger.hilt.android.scopes.ActivityScopedimport okhttp3.OkHttpClient@Module@InstallIn(ActivityComponent::class)-class RepoModule {+object RepoModule {- @ActivityScoped@Provides- fun provideContentResolver(@ActivityContext context: Context): ContentResolver {- return context.applicationContext.contentResolver+ fun getEntriesRepo(resolver: ContentResolver, client: OkHttpClient, entriesDao: EntriesDao)+ : EntriesRepo {+ return DefaultEntriesRepo(resolver, client, entriesDao)}- @ActivityScoped@Provides- fun provideEntriesRepo(- resolver: ContentResolver,- client: OkHttpClient,- entriesDao: EntriesDao- ): EntriesRepo {- return DefaultEntriesRepo(resolver, client, entriesDao)+ fun getSourcesRepo(sourcesDao: SourcesDao): SourcesRepo {+ return DefaultSourcesRepo(sourcesDao)}- @ActivityScoped@Provides- fun provideSourcesRepo(sourcesDao: SourcesDao): SourcesRepo {- return DefaultSourcesRepo(sourcesDao)+ fun getTransmittersRepo(transDao: TransmittersDao, transApi: TransmittersApi)+ : TransmittersRepo {+ return DefaultTransmittersRepo(transDao, transApi)}- @ActivityScoped@Provides- fun provideTransmittersRepo(- transmittersDao: TransmittersDao,- transmittersApi: TransmittersApi- ): TransmittersRepo {- return DefaultTransmittersRepo(transmittersDao, transmittersApi)+ fun getContentResolver(@ActivityContext context: Context): ContentResolver {+ return context.applicationContext.contentResolver}}diff --git a/app/src/main/java/com/rtbishop/look4sat/di/UtilityModule.kt b/app/src/main/java/com/rtbishop/look4sat/di/UtilityModule.ktindex 31ab4880..41e88187 100644--- a/app/src/main/java/com/rtbishop/look4sat/di/UtilityModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/di/UtilityModule.kt@@ -29,30 +29,23 @@ import dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.components.ActivityComponentimport dagger.hilt.android.qualifiers.ActivityContext-import dagger.hilt.android.scopes.ActivityScoped@Module@InstallIn(ActivityComponent::class)-class UtilityModule {+object UtilityModule {- @ActivityScoped@Provides- fun provideSharedPreferences(@ActivityContext context: Context): SharedPreferences {+ fun getSharedPreferences(@ActivityContext context: Context): SharedPreferences {return PreferenceManager.getDefaultSharedPreferences(context)}- @ActivityScoped@Provides- fun provideLocationManager(@ActivityContext context: Context): LocationManager {+ fun getLocationManager(@ActivityContext context: Context): LocationManager {return context.getSystemService(Context.LOCATION_SERVICE) as LocationManager}- @ActivityScoped@Provides- fun providePrefsManager(- sharedPreferences: SharedPreferences,- locationManager: LocationManager- ): PrefsManager {- return PrefsManager(sharedPreferences, locationManager)+ fun getPrefsManager(prefs: SharedPreferences, locationManager: LocationManager): PrefsManager {+ return PrefsManager(prefs, locationManager)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.ktindex 8a375a6a..e96aa4dd 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt@@ -76,7 +76,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {}private fun showImportFromWebDialog() {- findNavController().navigate(R.id.nav_dialog_sources)+ findNavController().navigate(R.id.action_entries_to_dialog_sources)}private fun showImportFromFileDialog() {diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex 27b7a3e1..c01de314 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -34,6 +34,13 @@app:exitAnim="@anim/nav_default_exit_anim"app:popEnterAnim="@anim/nav_default_pop_enter_anim"app:popExitAnim="@anim/nav_default_pop_exit_anim" />+ <action+ android:id="@+id/action_entries_to_dialog_sources"+ app:destination="@id/nav_dialog_sources"+ app:enterAnim="@anim/nav_default_enter_anim"+ app:exitAnim="@anim/nav_default_exit_anim"+ app:popEnterAnim="@anim/nav_default_pop_enter_anim"+ app:popExitAnim="@anim/nav_default_pop_exit_anim" /></fragment><fragment