Using action navigating to sources dialog, removed unnecessary scopes

app/src/main/java/com/rtbishop/look4sat/di/NetworkModule.kt

@@ -24,24 +24,21 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.scopes.ActivityScoped
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import 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())

app/src/main/java/com/rtbishop/look4sat/di/PersistenceModule.kt

@@ -30,33 +30,28 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import 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 {
+    fun getSourcesDao(db: SatelliteDb): SourcesDao {
-        return db.transmittersDao()
-    }
-
-    @ActivityScoped
-    @Provides
-    fun providesSourcesDao(db: SatelliteDb): SourcesDao {
         return db.sourcesDao()
     }
 
-    @ActivityScoped
     @Provides
-    fun provideSatDb(@ActivityContext context: Context): SatelliteDb {
+    fun getTransmittersDao(db: SatelliteDb): TransmittersDao {
+        return db.transmittersDao()
+    }
+
+    @Provides
+    fun getSatelliteDb(@ActivityContext context: Context): SatelliteDb {
         return Room.databaseBuilder(context, SatelliteDb::class.java, "satDb").build()
     }
 }

app/src/main/java/com/rtbishop/look4sat/di/RepoModule.kt

@@ -31,41 +31,31 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.qualifiers.ActivityContext
-import dagger.hilt.android.scopes.ActivityScoped
 import okhttp3.OkHttpClient
 
 @Module
 @InstallIn(ActivityComponent::class)
-class RepoModule {
+object RepoModule {
 
-    @ActivityScoped
     @Provides
-    fun provideContentResolver(@ActivityContext context: Context): ContentResolver {
+    fun getEntriesRepo(resolver: ContentResolver, client: OkHttpClient, entriesDao: EntriesDao)
-        return context.applicationContext.contentResolver
+            : EntriesRepo {
-    }
-
-    @ActivityScoped
-    @Provides
-    fun provideEntriesRepo(
-        resolver: ContentResolver,
-        client: OkHttpClient,
-        entriesDao: EntriesDao
-    ): EntriesRepo {
         return DefaultEntriesRepo(resolver, client, entriesDao)
     }
 
-    @ActivityScoped
     @Provides
-    fun provideSourcesRepo(sourcesDao: SourcesDao): SourcesRepo {
+    fun getSourcesRepo(sourcesDao: SourcesDao): SourcesRepo {
         return DefaultSourcesRepo(sourcesDao)
     }
 
-    @ActivityScoped
     @Provides
-    fun provideTransmittersRepo(
+    fun getTransmittersRepo(transDao: TransmittersDao, transApi: TransmittersApi)
-        transmittersDao: TransmittersDao,
+            : TransmittersRepo {
-        transmittersApi: TransmittersApi
+        return DefaultTransmittersRepo(transDao, transApi)
-    ): TransmittersRepo {
+    }
-        return DefaultTransmittersRepo(transmittersDao, transmittersApi)
+
+    @Provides
+    fun getContentResolver(@ActivityContext context: Context): ContentResolver {
+        return context.applicationContext.contentResolver
     }
 }

app/src/main/java/com/rtbishop/look4sat/di/UtilityModule.kt

@@ -29,30 +29,23 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import 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(
+    fun getPrefsManager(prefs: SharedPreferences, locationManager: LocationManager): PrefsManager {
-        sharedPreferences: SharedPreferences,
+        return PrefsManager(prefs, locationManager)
-        locationManager: LocationManager
-    ): PrefsManager {
-        return PrefsManager(sharedPreferences, locationManager)
     }
 }

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() {

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