Skip to content

Remodularised #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SiroDevs merged 5 commits into from
Dec 19, 2025
Merged

Remodularised #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45c0af7
remodularised
SiroDevs Dec 4, 2025
53b2dd2
remodularised repos
SiroDevs Dec 5, 2025
38cc361
remodularised repos
SiroDevs Dec 5, 2025
c919e85
splashview model fixes
SiroDevs Dec 6, 2025
e55258e
missing refs
SiroDevs Dec 7, 2025
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
0 ...tlin-compiler-18110105652542382796.salive → ...otlin-compiler-4532920975854660223.salive
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions app/src/main/java/com/songlib/core/di/AppModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion ...ib/domain/repository/ListingRepository.kt → ...a/com/songlib/domain/repos/ListingRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...omain/repository/PreferencesRepository.kt → ...ava/com/songlib/domain/repos/PrefsRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion ...b/domain/repository/SongBookRepository.kt → .../com/songlib/domain/repos/SongBookRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/repository/SubscriptionsRepository.kt → ...java/com/songlib/domain/repos/SubsRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...glib/domain/repository/ThemeRepository.kt → ...ava/com/songlib/domain/repos/ThemeRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...b/domain/repository/TrackingRepository.kt → .../com/songlib/domain/repos/TrackingRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
32 changes: 20 additions & 12 deletions .../presentation/viewmodels/HomeViewModel.kt → ...onglib/presentation/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -196,4 +204,4 @@ class HomeViewModel @Inject constructor(
}
}

}
}
2 changes: 1 addition & 1 deletion ...n/screens/home/components/BottomNavBar.kt → ...sentation/home/components/BottomNavBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.components
package com.songlib.presentation.home.components

//noinspection UsingMaterialAndMaterial3Libraries
import androidx.compose.material.*
Expand Down
2 changes: 1 addition & 1 deletion ...ens/home/components/ChooseListingSheet.kt → ...ion/home/components/ChooseListingSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.components
package com.songlib.presentation.home.components

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
Expand Down
2 changes: 1 addition & 1 deletion ...tation/screens/home/components/DialPad.kt → ...b/presentation/home/components/DialPad.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.components
package com.songlib.presentation.home.components

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
Expand Down
8 changes: 4 additions & 4 deletions ...ion/screens/home/components/HomeAppBar.kt → ...resentation/home/components/HomeAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.songlib.presentation.screens.home.components
package com.songlib.presentation.home.components

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
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.PreferencesRepository
import com.songlib.domain.repository.PrefsRepo
import com.songlib.presentation.components.action.AppTopBar
import com.songlib.presentation.components.general.QuickFormDialog
import com.songlib.presentation.viewmodels.HomeViewModel
import com.songlib.presentation.home.HomeViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand All @@ -22,7 +22,7 @@ fun HomeSearchAppBar(
onClearSelection: () -> Unit,
) {
val context = LocalContext.current
val prefs = remember { PreferencesRepository(context) }
val prefs = remember { PrefsRepo(context) }
var showAddDialog by remember { mutableStateOf(false) }
var showListingSheet by remember { mutableStateOf(false) }
val isProUser by viewModel.isProUser.collectAsState()
Expand Down
2 changes: 1 addition & 1 deletion ...n/screens/home/components/ListingsList.kt → ...sentation/home/components/ListingsList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.components
package com.songlib.presentation.home.components

import androidx.compose.foundation.*
import androidx.compose.foundation.layout.*
Expand Down
4 changes: 2 additions & 2 deletions ...tion/screens/home/components/SongsList.kt → ...presentation/home/components/SongsList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.components
package com.songlib.presentation.home.components

import androidx.compose.foundation.*
import androidx.compose.foundation.layout.*
Expand All @@ -15,7 +15,7 @@ import androidx.navigation.NavHostController
import com.songlib.data.models.Song
import com.songlib.presentation.components.listitems.*
import com.songlib.presentation.navigation.Routes
import com.songlib.presentation.viewmodels.HomeViewModel
import com.songlib.presentation.home.HomeViewModel

@Composable
fun SongsList(
Expand Down
14 changes: 7 additions & 7 deletions ...b/presentation/screens/home/HomeScreen.kt → ...glib/presentation/home/view/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home
package com.songlib.presentation.home.view

import androidx.compose.foundation.layout.*
//noinspection UsingMaterialAndMaterial3Libraries
Expand All @@ -8,16 +8,16 @@ import androidx.compose.material.icons.filled.EditNote
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.*
import androidx.compose.ui.window.*
import androidx.navigation.NavHostController
import com.revenuecat.purchases.ui.revenuecatui.*
import com.revenuecat.purchases.ui.revenuecatui.customercenter.CustomerCenter
import com.songlib.domain.entity.UiState
import com.songlib.presentation.components.indicators.*
import com.songlib.presentation.screens.home.tabs.*
import com.songlib.presentation.screens.home.components.*
import com.songlib.presentation.viewmodels.HomeViewModel
import com.songlib.presentation.home.HomeViewModel
import com.songlib.presentation.components.indicators.ErrorState
import com.songlib.presentation.home.components.BottomNavBar
import com.songlib.presentation.home.components.HomeNavItem
import com.songlib.presentation.home.view.tabs.HomeLikes
import com.songlib.presentation.home.view.tabs.HomeListings
import com.songlib.presentation.home.view.tabs.HomeSearch
import com.songlib.presentation.navigation.Routes

@OptIn(ExperimentalMaterialApi::class)
Expand Down
6 changes: 3 additions & 3 deletions ...esentation/screens/home/tabs/HomeLikes.kt → .../presentation/home/view/tabs/HomeLikes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.tabs
package com.songlib.presentation.home.view.tabs

import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
Expand All @@ -11,9 +11,9 @@ import com.songlib.data.models.Song
import com.songlib.domain.entity.UiState
import com.songlib.presentation.components.action.AppTopBar
import com.songlib.presentation.components.indicators.*
import com.songlib.presentation.home.components.SongsList
import com.songlib.presentation.navigation.Routes
import com.songlib.presentation.screens.home.components.*
import com.songlib.presentation.viewmodels.HomeViewModel
import com.songlib.presentation.home.HomeViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
6 changes: 3 additions & 3 deletions ...ntation/screens/home/tabs/HomeListings.kt → ...esentation/home/view/tabs/HomeListings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.tabs
package com.songlib.presentation.home.view.tabs

import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
Expand All @@ -9,14 +9,14 @@ import androidx.compose.ui.*
import androidx.compose.ui.window.*
import androidx.navigation.NavHostController
import com.revenuecat.purchases.ui.revenuecatui.*
import com.songlib.presentation.screens.home.components.ListingsList
import com.songlib.presentation.home.components.ListingsList
import com.songlib.data.models.ListingUi
import com.songlib.domain.entity.UiState
import com.songlib.presentation.components.action.*
import com.songlib.presentation.components.general.*
import com.songlib.presentation.components.indicators.*
import com.songlib.presentation.navigation.Routes
import com.songlib.presentation.viewmodels.HomeViewModel
import com.songlib.presentation.home.HomeViewModel
import kotlin.collections.plus

@OptIn(ExperimentalMaterial3Api::class)
Expand Down
8 changes: 5 additions & 3 deletions ...sentation/screens/home/tabs/HomeSearch.kt → ...presentation/home/view/tabs/HomeSearch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.home.tabs
package com.songlib.presentation.home.view.tabs

import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
Expand All @@ -11,15 +11,17 @@ import androidx.navigation.NavHostController
import com.songlib.domain.entity.UiState
import com.songlib.presentation.components.action.*
import com.songlib.presentation.navigation.Routes
import com.songlib.presentation.viewmodels.HomeViewModel
import com.songlib.presentation.home.HomeViewModel
import androidx.compose.ui.Modifier
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.revenuecat.purchases.ui.revenuecatui.Paywall
import com.revenuecat.purchases.ui.revenuecatui.PaywallOptions
import com.songlib.data.models.Song
import com.songlib.presentation.components.indicators.EmptyState
import com.songlib.presentation.screens.home.components.*
import com.songlib.presentation.home.components.DialPad
import com.songlib.presentation.home.components.HomeSearchAppBar
import com.songlib.presentation.home.components.SongsList

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
27 changes: 16 additions & 11 deletions ...esentation/viewmodels/ListingViewModel.kt → .../presentation/listing/ListingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
package com.songlib.presentation.viewmodels
package com.songlib.presentation.listing

import android.util.Log
import androidx.lifecycle.*
import com.songlib.data.models.*
import com.songlib.domain.entity.*
import com.songlib.domain.repository.*
import androidx.lifecycle.ViewModel
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 dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.collections.forEach

@HiltViewModel
class ListingViewModel @Inject constructor(
private val songbkRepo: SongBookRepository,
private val listRepo: ListingRepository,
private val songbkRepo: SongBookRepo,
private val listRepo: ListingRepo,
) : ViewModel() {
private val _uiState: MutableStateFlow<UiState> = MutableStateFlow(UiState.Loading)
val uiState: StateFlow<UiState> = _uiState.asStateFlow()
Expand Down Expand Up @@ -86,4 +91,4 @@ class ListingViewModel @Inject constructor(
}
}

}
}
2 changes: 1 addition & 1 deletion ...esentation/screens/listing/ListedSongs.kt → .../presentation/listing/view/ListedSongs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.listing
package com.songlib.presentation.listing.view

import androidx.compose.foundation.*
import androidx.compose.foundation.layout.*
Expand Down
4 changes: 2 additions & 2 deletions ...entation/screens/listing/ListingScreen.kt → ...resentation/listing/view/ListingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.songlib.presentation.screens.listing
package com.songlib.presentation.listing.view

import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
Expand All @@ -13,7 +13,7 @@ import com.songlib.domain.entity.UiState
import com.songlib.presentation.components.action.AppTopBar
import com.songlib.presentation.components.general.*
import com.songlib.presentation.components.indicators.*
import com.songlib.presentation.viewmodels.ListingViewModel
import com.songlib.presentation.listing.ListingViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
Loading