Skip to content

Commit 2fe0884

Browse files
committed
Remove clear cache mechanism on refresh and rename saveImages function
1 parent 8e8fcd3 commit 2fe0884

File tree

7 files changed

+12
-22
lines changed

7 files changed

+12
-22
lines changed

shared/src/androidInstrumentedTest/kotlin/ui/ScreenTestUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ class OfflineMjImagesLocalDataSource : MjImagesDataSource.Local {
8989

9090
override suspend fun clearImages() = Unit
9191

92-
override suspend fun saveImages(page: Int, response: MjImagesResponse) = Unit
92+
override suspend fun cacheResponse(page: Int, response: MjImagesResponse) = Unit
9393
}

shared/src/commonMain/kotlin/data/repository/MjImagesRepository.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MjImagesRepository : KoinComponent {
2121
}
2222

2323
val mjImagesResponse = remoteSource.getImages(page)
24-
localSource.saveImages(page,mjImagesResponse)
24+
localSource.cacheResponse(page,mjImagesResponse)
2525
emit(mjImagesResponse)
2626
}
2727

@@ -38,8 +38,4 @@ class MjImagesRepository : KoinComponent {
3838
suspend fun setDarkMode(enabled: Boolean) {
3939
localSource.setDarkMode(enabled)
4040
}
41-
42-
suspend fun clearImages() {
43-
localSource.clearImages()
44-
}
4541
}

shared/src/commonMain/kotlin/data/source/MjImagesDataSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface MjImagesDataSource {
1313
suspend fun isCacheValid(): Boolean
1414
suspend fun getImages(page: Int): MjImagesResponse?
1515
suspend fun clearImages()
16-
suspend fun saveImages(page: Int, response: MjImagesResponse)
16+
suspend fun cacheResponse(page: Int, response: MjImagesResponse)
1717
}
1818

1919
interface Remote {

shared/src/commonMain/kotlin/data/source/local/MjImagesLocalDataSource.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class MjImagesLocalDataSource(
4242

4343
override suspend fun getImages(page: Int): MjImagesResponse? =
4444
withContext(dispatcherProvider.io) {
45-
val jsonString = settings.getStringOrNull(CACHE_PREFIX_KEY + page) ?: return@withContext null
45+
val jsonString =
46+
settings.getStringOrNull(CACHE_PREFIX_KEY + page) ?: return@withContext null
4647
Json.decodeFromString<MjImagesResponse?>(jsonString)
4748
}
4849

@@ -56,7 +57,7 @@ class MjImagesLocalDataSource(
5657
}
5758
}
5859

59-
override suspend fun saveImages(page: Int, response: MjImagesResponse) {
60+
override suspend fun cacheResponse(page: Int, response: MjImagesResponse) {
6061
withContext(dispatcherProvider.io) {
6162
if (response.mjImageResponses.isNullOrEmpty()) return@withContext
6263
if (page == 1) clearImages()

shared/src/commonMain/kotlin/domain/usecase/MjImagesUseCase.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@ class MjImagesUseCase : KoinComponent {
2121
suspend fun setDarkMode(enabled: Boolean) {
2222
repository.setDarkMode(enabled)
2323
}
24-
25-
suspend fun clearImages() {
26-
repository.clearImages()
27-
}
2824
}

shared/src/commonMain/kotlin/ui/MjImagesViewModel.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@ class MjImagesViewModel(
5555
}
5656

5757
fun refreshImages() {
58-
viewModelScope.launch {
59-
useCase.clearImages()
60-
_images.value = MjImages()
61-
fetchImages()
62-
}
58+
_images.value = MjImages()
59+
fetchImages()
6360
}
6461

6562
private fun fetchImages(

shared/src/commonTest/kotlin/fakes/MjImagesLocalFakeDataSource.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import data.source.remote.model.MjImagesResponse
55

66
class MjImagesLocalFakeDataSource : MjImagesDataSource.Local {
77

8-
override suspend fun isEligibleToShowSnackMessage(): Boolean =
9-
true
8+
override suspend fun isEligibleToShowSnackMessage(): Boolean = true
109

1110
override suspend fun setSnackMessageShown() = Unit
1211

@@ -20,7 +19,8 @@ class MjImagesLocalFakeDataSource : MjImagesDataSource.Local {
2019

2120
override suspend fun clearImages() = Unit
2221

23-
override suspend fun saveImages(
24-
page: Int, response: MjImagesResponse
22+
override suspend fun cacheResponse(
23+
page: Int,
24+
response: MjImagesResponse
2525
) = Unit
2626
}

0 commit comments

Comments
 (0)