Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/com/songlib/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/songlib/core/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/songlib/domain/repos/ListingRepo.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.domain.repository
package com.songlib.domain.repos

import android.content.*
import com.songlib.core.utils.toTimeAgo
Expand Down
15 changes: 2 additions & 13 deletions app/src/main/java/com/songlib/domain/repos/PrefsRepo.kt
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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()
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/songlib/domain/repos/SongBookRepo.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.domain.repository
package com.songlib.domain.repos

import android.content.*
import com.songlib.data.models.*
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/songlib/domain/repos/SubsRepo.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.domain.repository
package com.songlib.domain.repos

import com.revenuecat.purchases.*
import com.revenuecat.purchases.CacheFetchPolicy
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/songlib/domain/repos/ThemeRepo.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.domain.repository
package com.songlib.domain.repos

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/songlib/domain/repos/TrackingRepo.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.domain.repository
package com.songlib.domain.repos

import android.content.*
import com.songlib.data.models.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/config/config.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
applicationId=com.songlib
versionName=1.0.821
versionCode=821
versionName=1.0.822
versionCode=822
targetSdk=35
minSdk=24