settings: Add Grid Count and Sort Settings

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" tools:node="replace"/>
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application

auth/build.gradle.kts

@@ -71,6 +71,10 @@ dependencies {
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
     implementation("com.squareup.okhttp3:logging-interceptor:4.5.0")
 
+    // Chucker
+    debugImplementation("com.github.chuckerteam.chucker:library:4.0.0")
+    releaseImplementation("com.github.chuckerteam.chucker:library-no-op:4.0.0")
+
     // Hilt DI
     implementation("com.google.dagger:hilt-android:2.50")
     ksp("com.google.dagger:hilt-android-compiler:2.50")

auth/src/main/java/com/android/swingmusic/auth/data/di/AuthModule.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import com.android.swingmusic.auth.data.api.service.AuthApiService
 import com.android.swingmusic.auth.data.datastore.AuthTokensDataStore
 import com.android.swingmusic.database.data.dao.BaseUrlDao
+import com.chuckerteam.chucker.api.ChuckerInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -33,10 +34,13 @@ object AuthModule {
 
     @Provides
     @Singleton
-    fun providesOkHttpClient(): OkHttpClient {
+    fun providesOkHttpClient(
+        @ApplicationContext context: Context
+    ): OkHttpClient {
         val interceptor = HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY)
         return OkHttpClient.Builder()
             .addInterceptor(interceptor)
+            .addInterceptor(ChuckerInterceptor(context))
             .callTimeout(15, TimeUnit.SECONDS)
             .connectTimeout(15, TimeUnit.SECONDS)
             .writeTimeout(15, TimeUnit.SECONDS)

feature/album/build.gradle.kts

@@ -48,6 +48,7 @@ dependencies {
     implementation(project(":uicomponent"))
     implementation(project(":feature:player"))
     implementation(project(":feature:artist"))
+    implementation(project(":feature:settings"))
     // Common
     implementation(project(":feature:common"))
 

feature/album/src/main/java/com/android/swingmusic/album/presentation/viewmodel/AllAlbumsViewModel.kt

@@ -12,17 +12,24 @@ import com.android.swingmusic.auth.domain.repository.AuthRepository
 import com.android.swingmusic.core.data.util.Resource
 import com.android.swingmusic.core.domain.util.SortBy
 import com.android.swingmusic.core.domain.util.SortOrder
+import com.android.swingmusic.settings.domain.repository.AppSettingsRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class AllAlbumsViewModel @Inject constructor(
     private val artistRepository: AlbumRepository,
-    private val authRepository: AuthRepository
+    private val authRepository: AuthRepository,
+    private val settingsRepository: AppSettingsRepository
 ) : ViewModel() {
 
     private val _baseUrl: MutableStateFlow<String?> = MutableStateFlow(null)
@@ -43,6 +50,43 @@ class AllAlbumsViewModel @Inject constructor(
         Pair(SortBy.DURATION, "duration"),
     )
 
+    // Settings
+    init {
+        settingsRepository.albumGridCount.onEach { gridCount ->
+            _allAlbumsUiState.value = _allAlbumsUiState.value.copy(gridCount = gridCount)
+        }.launchIn(viewModelScope)
+
+        combine(
+            settingsRepository.albumSortOrder.distinctUntilChanged(),
+            settingsRepository.albumSortBy.distinctUntilChanged()
+        ) { sortOrder, sortBy ->
+            val sortByPair = sortAlbumsByEntries.find { it.first == sortBy }
+                ?: Pair(SortBy.LAST_PLAYED, "lastplayed")
+
+            Pair(sortOrder, sortByPair)
+        }.onEach { (sortOrder, sortByPair) ->
+            _allAlbumsUiState.value = _allAlbumsUiState.value.copy(
+                sortOrder = sortOrder,
+                sortBy = sortByPair
+            )
+            getPagingAlbums(
+                sortBy = sortByPair.second,
+                sortOrder = sortOrder
+            )
+        }.launchIn(viewModelScope)
+    }
+
+    init {
+        getBaseUrl()
+        getAlbumCount()
+    }
+
+    private fun getBaseUrl() {
+        viewModelScope.launch {
+            _baseUrl.value = authRepository.getBaseUrl()
+        }
+    }
+
     private fun getAlbumCount() {
         viewModelScope.launch {
             artistRepository.getAlbumCount().collectLatest {
@@ -66,64 +110,39 @@ class AllAlbumsViewModel @Inject constructor(
         }
     }
 
-    init {
-        getBaseUrl()
-    }
-
-
-    private fun getBaseUrl() {
+    private fun updateGridCount(count: Int) {
         viewModelScope.launch {
-            _baseUrl.value = authRepository.getBaseUrl()
+            settingsRepository.setAlbumGridCount(count)
         }
-
     }
 
-    init {
-        getPagingAlbums(
-            sortBy = _allAlbumsUiState.value.sortBy.second,
-            sortOrder = _allAlbumsUiState.value.sortOrder
-        )
-        getAlbumCount()
-    }
-
-
     fun onAlbumsUiEvent(event: AlbumsUiEvent) {
         when (event) {
             is AlbumsUiEvent.OnSortBy -> {
-                // Retry fetching artist count if the previous sorting resulted to Error
-                if (_allAlbumsUiState.value.totalAlbums is Resource.Error) {
-                    getAlbumCount()
-                }
-
-                if (event.sortByPair == _allAlbumsUiState.value.sortBy) {
-                    val newOrder = if (_allAlbumsUiState.value.sortOrder == SortOrder.ASCENDING)
-                        SortOrder.DESCENDING else SortOrder.ASCENDING
-
-                    _allAlbumsUiState.value = _allAlbumsUiState.value.copy(sortOrder = newOrder)
-                    getPagingAlbums(
-                        sortBy = event.sortByPair.second,
-                        sortOrder = newOrder
-                    )
-                } else {
-                    _allAlbumsUiState.value = _allAlbumsUiState.value.copy(
-                        sortBy = event.sortByPair,
-                        sortOrder = SortOrder.DESCENDING
-                    )
-                    getPagingAlbums(
-                        sortBy = event.sortByPair.second,
-                        sortOrder = SortOrder.DESCENDING
-                    )
+                viewModelScope.launch {
+                    // Retry fetching artist count if the previous sorting resulted to Error
+                    if (_allAlbumsUiState.value.totalAlbums is Resource.Error) {
+                        getAlbumCount()
+                    }
+
+                    if (event.sortByPair == _allAlbumsUiState.value.sortBy) {
+                        val newOrder = if (_allAlbumsUiState.value.sortOrder == SortOrder.ASCENDING)
+                            SortOrder.DESCENDING else SortOrder.ASCENDING
+
+                        settingsRepository.setAlbumSortOrder(newOrder)
+                    } else {
+                        settingsRepository.setAlbumSortOrder(SortOrder.DESCENDING)
+                        settingsRepository.setAlbumSortBy(event.sortByPair.first)
+                    }
                 }
             }
 
             is AlbumsUiEvent.OnClickAlbum -> {
-                // TODO: Navigate from the UI (apparently not in the VM)
+                // TODO: Navigate from the UI (handled by UI navigator)
             }
 
             is AlbumsUiEvent.OnUpdateGridCount -> {
-                _allAlbumsUiState.value = _allAlbumsUiState.value.copy(
-                    gridCount = event.newCount
-                )
+                updateGridCount(event.newCount)
             }
 
             is AlbumsUiEvent.OnRetry -> {

feature/artist/build.gradle.kts

@@ -48,6 +48,7 @@ dependencies {
     implementation(project(":network"))
     implementation(project(":uicomponent"))
     implementation(project(":feature:player"))
+    implementation(project(":feature:settings"))
     // Common Feature
     implementation(project(":feature:common"))