From e057918ca9ad84b5cb27b474a45fe4075e060205 Mon Sep 17 00:00:00 2001 From: Mahmudul Hasan Shohag Date: Sat, 28 Dec 2024 01:21:22 +0600 Subject: [PATCH 1/2] refactor(mapview): Rename `MapViewModel` to `MapViewViewModel` and adjust empty list logic The `MapViewModel` class has been renamed to `MapViewViewModel`. Also, the condition for returning an empty list in `MapPlaceRepo` has been changed from `random > 5` to `random > 2`. --- .../whynotcompose/repositories/MapPlaceRepo.kt | 2 +- .../imaginativeworld/whynotcompose/ui/screens/NavGraphMain.kt | 4 ++-- .../whynotcompose/ui/screens/ui/mapview/MapViewScreen.kt | 2 +- .../ui/mapview/{MapViewModel.kt => MapViewViewModel.kt} | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/{MapViewModel.kt => MapViewViewModel.kt} (98%) diff --git a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/repositories/MapPlaceRepo.kt b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/repositories/MapPlaceRepo.kt index 9c7f1336..02c8829e 100644 --- a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/repositories/MapPlaceRepo.kt +++ b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/repositories/MapPlaceRepo.kt @@ -80,7 +80,7 @@ object MapPlaceRepo { // Note: It randomly send empty list to demonstrate empty view. val random = Random.nextInt(10) - if (random > 5) { + if (random > 2) { return places } diff --git a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/NavGraphMain.kt b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/NavGraphMain.kt index 7a6911c7..3811bfa3 100644 --- a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/NavGraphMain.kt +++ b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/NavGraphMain.kt @@ -135,7 +135,7 @@ import org.imaginativeworld.whynotcompose.ui.screens.tutorial.selectimageandcrop import org.imaginativeworld.whynotcompose.ui.screens.ui.index.UiIndexScreen import org.imaginativeworld.whynotcompose.ui.screens.ui.mapview.MapScreen import org.imaginativeworld.whynotcompose.ui.screens.ui.mapview.MapViewDetailsScreen -import org.imaginativeworld.whynotcompose.ui.screens.ui.mapview.MapViewModel +import org.imaginativeworld.whynotcompose.ui.screens.ui.mapview.MapViewViewModel import org.imaginativeworld.whynotcompose.ui.screens.ui.otpcodeverify.OtpCodeVerifyScreen import org.imaginativeworld.whynotcompose.ui.screens.ui.otpcodeverify.OtpCodeVerifyViewModel import org.imaginativeworld.whynotcompose.ui.screens.ui.pager.UiPagerScreen @@ -692,7 +692,7 @@ private fun NavGraphBuilder.addUiScreens( } composable(UIsScreen.UiMapView.route) { - val viewModel: MapViewModel = hiltViewModel() + val viewModel: MapViewViewModel = hiltViewModel() MapScreen( viewModel = viewModel, diff --git a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewScreen.kt b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewScreen.kt index 5bab39fc..a56a2819 100644 --- a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewScreen.kt +++ b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewScreen.kt @@ -99,7 +99,7 @@ import timber.log.Timber @Suppress("ktlint:compose:modifier-missing-check") @Composable fun MapScreen( - viewModel: MapViewModel, + viewModel: MapViewViewModel, goBack: () -> Unit, gotoDetailsScreen: (MapPlace) -> Unit ) { diff --git a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewModel.kt b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewViewModel.kt similarity index 98% rename from app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewModel.kt rename to app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewViewModel.kt index 92dcc366..1df2d3b4 100644 --- a/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewModel.kt +++ b/app/src/main/kotlin/org/imaginativeworld/whynotcompose/ui/screens/ui/mapview/MapViewViewModel.kt @@ -50,7 +50,7 @@ import org.imaginativeworld.whynotcompose.repositories.MapPlaceRepo import timber.log.Timber @HiltViewModel -class MapViewModel @Inject constructor() : ViewModel() { +class MapViewViewModel @Inject constructor() : ViewModel() { private val eventShowLoading = MutableStateFlow(false) private val eventShowEmpty = MutableStateFlow(false) private val eventShowMessage = MutableStateFlow?>(null) @@ -113,7 +113,7 @@ class MapViewModel @Inject constructor() : ViewModel() { previousResult = places - this@MapViewModel.places.value = places + this@MapViewViewModel.places.value = places eventShowEmpty.value = places.isEmpty() From 50de0580dbf4e819f9db261762a669a50ff9efdd Mon Sep 17 00:00:00 2001 From: Mahmudul Hasan Shohag Date: Sat, 28 Dec 2024 01:22:03 +0600 Subject: [PATCH 2/2] feat: update version name to 7.2.1 --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 03474b0d..8cd9dda9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -46,7 +46,7 @@ android { minSdk = BuildConfigConst.minSdk targetSdk = BuildConfigConst.targetSdk versionCode = (findProperty("android.injected.version.code") as? String)?.toIntOrNull() ?: 1 - versionName = "7.2.0.${getCurrentDateAsYYMMDD()}" // Major.Minor.Patch.YYMMDD + versionName = "7.2.1.${getCurrentDateAsYYMMDD()}" // Major.Minor.Patch.YYMMDD vectorDrawables.useSupportLibrary = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"