Merge pull request #21 from SiroDevs/develop

Remodularised

Author: SiroDevs

…lin-compiler-18110105652542382796.salive …tlin-compiler-4532920975854660223.salive.kotlin/sessions/kotlin-compiler-18110105652542382796.salive renamed to .kotlin/sessions/kotlin-compiler-4532920975854660223.salive .kotlin/sessions/kotlin-compiler-18110105652542382796.salive renamed to .kotlin/sessions/kotlin-compiler-4532920975854660223.salive

@@ -16,35 +16,35 @@ class AppModule {
     @Singleton
     fun provideListingRepository(
         @ApplicationContext context: Context,
-    ): ListingRepository = ListingRepository(context)
+    ): ListingRepo = ListingRepo(context)
 
     @Provides
     @Singleton
     fun providePreferencesRepository(
         @ApplicationContext context: Context,
-    ): PreferencesRepository = PreferencesRepository(context)
+    ): PrefsRepo = PrefsRepo(context)
 
     @Provides
     @Singleton
     fun provideSongBookRepository(
         @ApplicationContext context: Context,
         apiService: ApiService,
-    ): SongBookRepository = SongBookRepository(context, apiService)
+    ): SongBookRepo = SongBookRepo(context, apiService)
 
     @Provides
     @Singleton
     fun provideSubscriptionRepository(
-    ): SubscriptionsRepository = SubscriptionsRepository()
+    ): SubsRepo = SubsRepo()
 
     @Provides
     @Singleton
     fun provideThemeRepository(
-        prefsRepo: PreferencesRepository,
+        prefsRepo: PrefsRepo,
     ): ThemeRepository = ThemeRepository(prefsRepo)
 
     @Provides
     @Singleton
     fun provideTrackingRepository(
         @ApplicationContext context: Context,
-    ): TrackingRepository = TrackingRepository(context)
+    ): TrackingRepo = TrackingRepo(context)
 }

app/src/main/java/com/songlib/core/di/AppModule.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.*
 import javax.inject.*
 
 @Singleton
-class ListingRepository @Inject constructor(context: Context) {
+class ListingRepo @Inject constructor(context: Context) {
     private var listingDao: ListingDao?
 
     init {

…b/domain/repository/ListingRepository.kt …/com/songlib/domain/repos/ListingRepo.ktapp/src/main/java/com/songlib/domain/repository/ListingRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/ListingRepo.kt app/src/main/java/com/songlib/domain/repository/ListingRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/ListingRepo.kt

@@ -7,7 +7,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.*
 
 @Singleton
-class PreferencesRepository @Inject constructor(
+class PrefsRepo @Inject constructor(
     @ApplicationContext context: Context
 ) {
     private val prefs =

…main/repository/PreferencesRepository.kt …va/com/songlib/domain/repos/PrefsRepo.ktapp/src/main/java/com/songlib/domain/repository/PreferencesRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt app/src/main/java/com/songlib/domain/repository/PreferencesRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt

@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.*
 import javax.inject.*
 
 @Singleton
-class SongBookRepository @Inject constructor(
+class SongBookRepo @Inject constructor(
     context: Context,
     private val apiService: ApiService,
 ) {

…/domain/repository/SongBookRepository.kt …com/songlib/domain/repos/SongBookRepo.ktapp/src/main/java/com/songlib/domain/repository/SongBookRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt app/src/main/java/com/songlib/domain/repository/SongBookRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt

@@ -6,7 +6,7 @@ import com.songlib.core.utils.AppConstants
 import javax.inject.*
 
 @Singleton
-class SubscriptionsRepository @Inject constructor() {
+class SubsRepo @Inject constructor() {
     suspend fun isProUser(isOnline: Boolean, completion: (Boolean) -> Unit) {
         val fetchPolicy = if (isOnline) {
             CacheFetchPolicy.FETCH_CURRENT

…in/repository/SubscriptionsRepository.kt …ava/com/songlib/domain/repos/SubsRepo.ktapp/src/main/java/com/songlib/domain/repository/SubscriptionsRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/SubsRepo.kt app/src/main/java/com/songlib/domain/repository/SubscriptionsRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/SubsRepo.kt

@@ -14,7 +14,7 @@ enum class ThemeMode { SYSTEM, LIGHT, DARK }
 
 @HiltViewModel
 class ThemeRepository @Inject constructor(
-    private val prefs: PreferencesRepository
+    private val prefs: PrefsRepo
 ) : ViewModel() {
     var selectedTheme by mutableStateOf(prefs.appThemeMode)
         private set

…lib/domain/repository/ThemeRepository.kt …va/com/songlib/domain/repos/ThemeRepo.ktapp/src/main/java/com/songlib/domain/repository/ThemeRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt app/src/main/java/com/songlib/domain/repository/ThemeRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.*
 import javax.inject.*
 
 @Singleton
-class TrackingRepository @Inject constructor(
+class TrackingRepo @Inject constructor(
     context: Context,
 ) {
     private var historyDao: HistoryDao?

…/domain/repository/TrackingRepository.kt …com/songlib/domain/repos/TrackingRepo.ktapp/src/main/java/com/songlib/domain/repository/TrackingRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt app/src/main/java/com/songlib/domain/repository/TrackingRepository.kt renamed to app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt

@@ -1,23 +1,31 @@
-package com.songlib.presentation.viewmodels
+package com.songlib.presentation.home
 
 import android.util.Log
-import androidx.lifecycle.*
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.songlib.core.utils.SongUtils
-import com.songlib.data.models.*
+import com.songlib.data.models.Book
+import com.songlib.data.models.ListingUi
+import com.songlib.data.models.Song
 import com.songlib.domain.entity.UiState
-import com.songlib.domain.repository.*
-import com.songlib.presentation.screens.home.components.HomeNavItem
+import com.songlib.domain.repository.ListingRepo
+import com.songlib.domain.repository.PrefsRepo
+import com.songlib.domain.repository.SongBookRepo
+import com.songlib.presentation.home.components.HomeNavItem
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
-import kotlin.collections.*
 
 @HiltViewModel
 class HomeViewModel @Inject constructor(
-    private val prefsRepo: PreferencesRepository,
-    private val songbkRepo: SongBookRepository,
-    private val listRepo: ListingRepository,
+    private val prefsRepo: PrefsRepo,
+    private val songbkRepo: SongBookRepo,
+    private val listRepo: ListingRepo,
 ) : ViewModel() {
     private val _uiState: MutableStateFlow<UiState> = MutableStateFlow(UiState.Loading)
     val uiState: StateFlow<UiState> = _uiState.asStateFlow()
@@ -196,4 +204,4 @@ class HomeViewModel @Inject constructor(
         }
     }
 
-}
+}

…presentation/viewmodels/HomeViewModel.kt …nglib/presentation/home/HomeViewModel.ktapp/src/main/java/com/songlib/presentation/viewmodels/HomeViewModel.kt renamed to app/src/main/java/com/songlib/presentation/home/HomeViewModel.kt app/src/main/java/com/songlib/presentation/viewmodels/HomeViewModel.kt renamed to app/src/main/java/com/songlib/presentation/home/HomeViewModel.kt

@@ -1,4 +1,4 @@
-package com.songlib.presentation.screens.home.components
+package com.songlib.presentation.home.components
 
 //noinspection UsingMaterialAndMaterial3Libraries
 import androidx.compose.material.*