diff --git a/.kotlin/sessions/kotlin-compiler-4532920975854660223.salive b/.kotlin/sessions/kotlin-compiler-204136539978830062.salive similarity index 100% rename from .kotlin/sessions/kotlin-compiler-4532920975854660223.salive rename to .kotlin/sessions/kotlin-compiler-204136539978830062.salive diff --git a/app/src/main/java/com/songlib/MainActivity.kt b/app/src/main/java/com/songlib/MainActivity.kt index 9b49bd4..0347317 100644 --- a/app/src/main/java/com/songlib/MainActivity.kt +++ b/app/src/main/java/com/songlib/MainActivity.kt @@ -7,7 +7,8 @@ import androidx.annotation.* import androidx.compose.foundation.* import androidx.compose.ui.* import androidx.hilt.navigation.compose.hiltViewModel -import com.songlib.domain.repository.* +import com.songlib.domain.repos.ThemeMode +import com.songlib.domain.repos.ThemeRepository import com.songlib.presentation.navigation.* import com.songlib.presentation.theme.* import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/songlib/core/di/AppModule.kt b/app/src/main/java/com/songlib/core/di/AppModule.kt index 2ebbace..afe6373 100644 --- a/app/src/main/java/com/songlib/core/di/AppModule.kt +++ b/app/src/main/java/com/songlib/core/di/AppModule.kt @@ -2,7 +2,12 @@ package com.songlib.core.di import android.content.Context import com.songlib.data.sources.remote.ApiService -import com.songlib.domain.repository.* +import com.songlib.domain.repos.ListingRepo +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SongBookRepo +import com.songlib.domain.repos.SubsRepo +import com.songlib.domain.repos.ThemeRepository +import com.songlib.domain.repos.TrackingRepo import dagger.* import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/app/src/main/java/com/songlib/domain/repos/ListingRepo.kt b/app/src/main/java/com/songlib/domain/repos/ListingRepo.kt index b0bc184..94234f0 100644 --- a/app/src/main/java/com/songlib/domain/repos/ListingRepo.kt +++ b/app/src/main/java/com/songlib/domain/repos/ListingRepo.kt @@ -1,4 +1,4 @@ -package com.songlib.domain.repository +package com.songlib.domain.repos import android.content.* import com.songlib.core.utils.toTimeAgo diff --git a/app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt b/app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt index 005fb66..cdee786 100644 --- a/app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt +++ b/app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt @@ -1,10 +1,10 @@ -package com.songlib.domain.repository +package com.songlib.domain.repos import android.content.Context -import android.content.SharedPreferences import com.songlib.core.utils.PrefConstants import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.* +import androidx.core.content.edit @Singleton class PrefsRepo @Inject constructor( @@ -72,15 +72,4 @@ class PrefsRepo @Inject constructor( if (lastTime == 0L) return 0L return System.currentTimeMillis() - lastTime } - - private inline fun SharedPreferences.edit( - commit: Boolean = false, - action: SharedPreferences.Editor.() -> Unit - ) { - val editor = edit() - editor.action() - if (commit) { - editor.apply() - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt b/app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt index 42d1e7a..a3acc8a 100644 --- a/app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt +++ b/app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt @@ -1,4 +1,4 @@ -package com.songlib.domain.repository +package com.songlib.domain.repos import android.content.* import com.songlib.data.models.* diff --git a/app/src/main/java/com/songlib/domain/repos/SubsRepo.kt b/app/src/main/java/com/songlib/domain/repos/SubsRepo.kt index ed4d31b..01f92dd 100644 --- a/app/src/main/java/com/songlib/domain/repos/SubsRepo.kt +++ b/app/src/main/java/com/songlib/domain/repos/SubsRepo.kt @@ -1,4 +1,4 @@ -package com.songlib.domain.repository +package com.songlib.domain.repos import com.revenuecat.purchases.* import com.revenuecat.purchases.CacheFetchPolicy diff --git a/app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt b/app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt index ff6ee52..93b3ea4 100644 --- a/app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt +++ b/app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt @@ -1,4 +1,4 @@ -package com.songlib.domain.repository +package com.songlib.domain.repos import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* diff --git a/app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt b/app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt index 42b7838..c770849 100644 --- a/app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt +++ b/app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt @@ -1,4 +1,4 @@ -package com.songlib.domain.repository +package com.songlib.domain.repos import android.content.* import com.songlib.data.models.* diff --git a/app/src/main/java/com/songlib/presentation/home/HomeViewModel.kt b/app/src/main/java/com/songlib/presentation/home/HomeViewModel.kt index 664df5a..46151eb 100644 --- a/app/src/main/java/com/songlib/presentation/home/HomeViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/home/HomeViewModel.kt @@ -8,9 +8,9 @@ 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.ListingRepo -import com.songlib.domain.repository.PrefsRepo -import com.songlib.domain.repository.SongBookRepo +import com.songlib.domain.repos.ListingRepo +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SongBookRepo import com.songlib.presentation.home.components.HomeNavItem import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/songlib/presentation/home/components/HomeAppBar.kt b/app/src/main/java/com/songlib/presentation/home/components/HomeAppBar.kt index cdedd49..e965aa6 100644 --- a/app/src/main/java/com/songlib/presentation/home/components/HomeAppBar.kt +++ b/app/src/main/java/com/songlib/presentation/home/components/HomeAppBar.kt @@ -6,7 +6,7 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.platform.LocalContext import com.songlib.data.models.Song -import com.songlib.domain.repository.PrefsRepo +import com.songlib.domain.repos.PrefsRepo import com.songlib.presentation.components.action.AppTopBar import com.songlib.presentation.components.general.QuickFormDialog import com.songlib.presentation.home.HomeViewModel diff --git a/app/src/main/java/com/songlib/presentation/listing/ListingViewModel.kt b/app/src/main/java/com/songlib/presentation/listing/ListingViewModel.kt index 5bff34a..86d631a 100644 --- a/app/src/main/java/com/songlib/presentation/listing/ListingViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/listing/ListingViewModel.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.viewModelScope import com.songlib.data.models.ListingUi import com.songlib.data.models.Song import com.songlib.domain.entity.UiState -import com.songlib.domain.repository.ListingRepo -import com.songlib.domain.repository.SongBookRepo +import com.songlib.domain.repos.ListingRepo +import com.songlib.domain.repos.SongBookRepo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/songlib/presentation/navigation/AppNavHost.kt b/app/src/main/java/com/songlib/presentation/navigation/AppNavHost.kt index e0d9161..a4ee147 100644 --- a/app/src/main/java/com/songlib/presentation/navigation/AppNavHost.kt +++ b/app/src/main/java/com/songlib/presentation/navigation/AppNavHost.kt @@ -7,7 +7,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.* import androidx.navigation.compose.* import com.songlib.data.models.* -import com.songlib.domain.repository.ThemeRepository +import com.songlib.domain.repos.ThemeRepository import com.songlib.presentation.home.HomeViewModel import com.songlib.presentation.home.view.HomeScreen import com.songlib.presentation.listing.ListingViewModel diff --git a/app/src/main/java/com/songlib/presentation/presenter/PresenterViewModel.kt b/app/src/main/java/com/songlib/presentation/presenter/PresenterViewModel.kt index 0de2f65..01d22e3 100644 --- a/app/src/main/java/com/songlib/presentation/presenter/PresenterViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/presenter/PresenterViewModel.kt @@ -6,8 +6,8 @@ import com.songlib.core.utils.getSongVerses import com.songlib.core.utils.songItemTitle import com.songlib.data.models.Song import com.songlib.domain.entity.UiState -import com.songlib.domain.repository.PrefsRepo -import com.songlib.domain.repository.SongBookRepo +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SongBookRepo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/songlib/presentation/selection/step1/Step1ViewModel.kt b/app/src/main/java/com/songlib/presentation/selection/step1/Step1ViewModel.kt index 9badc9d..3c81e9b 100644 --- a/app/src/main/java/com/songlib/presentation/selection/step1/Step1ViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/selection/step1/Step1ViewModel.kt @@ -6,9 +6,9 @@ import androidx.lifecycle.viewModelScope import com.songlib.data.models.Book import com.songlib.domain.entity.Selectable import com.songlib.domain.entity.UiState -import com.songlib.domain.repository.PrefsRepo -import com.songlib.domain.repository.SongBookRepo -import com.songlib.domain.repository.SubsRepo +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SongBookRepo +import com.songlib.domain.repos.SubsRepo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/songlib/presentation/selection/step1/view/Step1Screen.kt b/app/src/main/java/com/songlib/presentation/selection/step1/view/Step1Screen.kt index 62bd4b0..6a1f0a6 100644 --- a/app/src/main/java/com/songlib/presentation/selection/step1/view/Step1Screen.kt +++ b/app/src/main/java/com/songlib/presentation/selection/step1/view/Step1Screen.kt @@ -13,7 +13,8 @@ import androidx.navigation.NavHostController import com.revenuecat.purchases.ui.revenuecatui.Paywall import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions import com.songlib.domain.entity.UiState -import com.songlib.domain.repository.* +import com.songlib.domain.repos.ThemeRepository +import com.songlib.domain.repos.ThemeSelectorDialog import com.songlib.presentation.components.action.AppTopBar import com.songlib.presentation.components.indicators.* import com.songlib.presentation.navigation.Routes diff --git a/app/src/main/java/com/songlib/presentation/selection/step2/Step2ViewModel.kt b/app/src/main/java/com/songlib/presentation/selection/step2/Step2ViewModel.kt index e4d88f2..1cd614e 100644 --- a/app/src/main/java/com/songlib/presentation/selection/step2/Step2ViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/selection/step2/Step2ViewModel.kt @@ -5,8 +5,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.songlib.data.models.Song import com.songlib.domain.entity.UiState -import com.songlib.domain.repository.PrefsRepo -import com.songlib.domain.repository.SongBookRepo +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SongBookRepo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/songlib/presentation/settings/SettingsViewModel.kt b/app/src/main/java/com/songlib/presentation/settings/SettingsViewModel.kt index ce2c6ef..412572d 100644 --- a/app/src/main/java/com/songlib/presentation/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/settings/SettingsViewModel.kt @@ -3,7 +3,9 @@ package com.songlib.presentation.settings import androidx.compose.runtime.* import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.songlib.domain.repository.* +import com.songlib.domain.repos.ListingRepo +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SongBookRepo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/com/songlib/presentation/settings/view/SettingsScreen.kt b/app/src/main/java/com/songlib/presentation/settings/view/SettingsScreen.kt index cdacf8d..fe2f4e4 100644 --- a/app/src/main/java/com/songlib/presentation/settings/view/SettingsScreen.kt +++ b/app/src/main/java/com/songlib/presentation/settings/view/SettingsScreen.kt @@ -9,8 +9,9 @@ import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.navigation.NavHostController -import com.songlib.domain.repository.* -import com.songlib.domain.repository.appThemeName +import com.songlib.domain.repos.ThemeRepository +import com.songlib.domain.repos.ThemeSelectorDialog +import com.songlib.domain.repos.appThemeName import com.songlib.presentation.components.action.AppTopBar import com.songlib.presentation.navigation.Routes import com.songlib.presentation.settings.SettingsViewModel diff --git a/app/src/main/java/com/songlib/presentation/splash/SplashViewModel.kt b/app/src/main/java/com/songlib/presentation/splash/SplashViewModel.kt index 7e1cd2c..88ab489 100644 --- a/app/src/main/java/com/songlib/presentation/splash/SplashViewModel.kt +++ b/app/src/main/java/com/songlib/presentation/splash/SplashViewModel.kt @@ -3,7 +3,8 @@ package com.songlib.presentation.splash import android.content.Context import androidx.lifecycle.* import com.songlib.core.helpers.NetworkUtils -import com.songlib.domain.repository.* +import com.songlib.domain.repos.PrefsRepo +import com.songlib.domain.repos.SubsRepo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/songlib/presentation/splash/view/SplashScreen.kt b/app/src/main/java/com/songlib/presentation/splash/view/SplashScreen.kt index 01acefc..6ee9e0f 100644 --- a/app/src/main/java/com/songlib/presentation/splash/view/SplashScreen.kt +++ b/app/src/main/java/com/songlib/presentation/splash/view/SplashScreen.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.* import androidx.navigation.NavHostController import com.songlib.R -import com.songlib.domain.repository.PrefsRepo +import com.songlib.domain.repos.PrefsRepo import com.songlib.presentation.navigation.Routes import com.songlib.presentation.splash.components.* import com.songlib.presentation.splash.SplashViewModel diff --git a/gradle/config/config.properties b/gradle/config/config.properties index 7073460..b7d2dd4 100644 --- a/gradle/config/config.properties +++ b/gradle/config/config.properties @@ -1,5 +1,5 @@ applicationId=com.songlib -versionName=1.0.821 -versionCode=821 +versionName=1.0.822 +versionCode=822 targetSdk=35 minSdk=24 \ No newline at end of file