refactor aboutus viewmodel to create repository

openMF · Jan 9, 2024 · a4760c2 · a4760c2
1 parent 212a23c
commit a4760c2
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 40 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -191,6 +191,7 @@ dependencies {
     // Hilt
     implementation("com.google.dagger:hilt-android:2.48")
     kapt("com.google.dagger:hilt-android-compiler:2.47")
+    implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03")
 
     // Compose BOM
     implementation platform('androidx.compose:compose-bom:2023.08.00')

diff --git a/app/src/main/java/org/mifos/mobile/di/RepositoryModule.kt b/app/src/main/java/org/mifos/mobile/di/RepositoryModule.kt
@@ -1,8 +1,10 @@
 package org.mifos.mobile.di
 
+import android.content.Context
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import org.mifos.mobile.api.DataManager
 import org.mifos.mobile.repositories.TransferRepository
@@ -94,5 +96,8 @@ object RepositoryModule {
     fun providesReviewLoanApplicationRepository(dataManager: DataManager): ReviewLoanApplicationRepository {
         return ReviewLoanApplicationRepositoryImpl(dataManager)
     }
-
+    @Provides
+    fun providesAboutUsRepository(@ApplicationContext context: Context): AboutUsRepository {
+        return AboutUsRepositoryImpl(context)
+    }
 }
diff --git a/app/src/main/java/org/mifos/mobile/repositories/AboutUsRepository.kt b/app/src/main/java/org/mifos/mobile/repositories/AboutUsRepository.kt
@@ -0,0 +1,10 @@
+package org.mifos.mobile.repositories
+
+import org.mifos.mobile.models.AboutUsItem
+
+
+interface AboutUsRepository {
+    fun getAboutUsItems(): List<AboutUsItem>
+}
+
+
diff --git a/app/src/main/java/org/mifos/mobile/repositories/AboutUsRepositoryImpl.kt b/app/src/main/java/org/mifos/mobile/repositories/AboutUsRepositoryImpl.kt
@@ -0,0 +1,51 @@
+package org.mifos.mobile.repositories
+
+import android.content.Context
+import org.mifos.mobile.R
+import org.mifos.mobile.models.AboutUsItem
+import org.mifos.mobile.ui.enums.AboutUsListItemId
+import java.util.Calendar
+import javax.inject.Inject
+
+class AboutUsRepositoryImpl @Inject constructor(
+    private val context: Context
+) : AboutUsRepository {
+
+    override fun getAboutUsItems(): List<AboutUsItem> {
+        val currentYear = Calendar.getInstance().get(Calendar.YEAR)
+        val copyrightText = context.getString(R.string.copy_right_mifos)
+            .replace("%1\$s", currentYear.toString())
+
+        return listOf(
+            AboutUsItem(
+                title = context.getString(R.string.app_version_text),
+                itemId = AboutUsListItemId.APP_VERSION_TEXT
+            ),
+            AboutUsItem(
+                title = context.getString(R.string.official_website),
+                iconUrl = R.drawable.ic_website,
+                itemId = AboutUsListItemId.OFFICE_WEBSITE
+            ),
+            AboutUsItem(
+                title = context.getString(R.string.licenses),
+                iconUrl = R.drawable.ic_law_icon,
+                itemId = AboutUsListItemId.LICENSES
+            ),
+            AboutUsItem(
+                title = context.getString(R.string.privacy_policy),
+                iconUrl = R.drawable.ic_privacy_policy,
+                itemId = AboutUsListItemId.PRIVACY_POLICY
+            ),
+            AboutUsItem(
+                title = context.getString(R.string.sources),
+                iconUrl = R.drawable.ic_source_code,
+                itemId = AboutUsListItemId.SOURCE_CODE
+            ),
+            AboutUsItem(
+                title = copyrightText,
+                subtitle = R.string.license_string_with_value,
+                itemId = AboutUsListItemId.LICENSES_STRING_WITH_VALUE
+            )
+        )
+    }
+}
diff --git a/app/src/main/java/org/mifos/mobile/ui/about/AboutUsScreen.kt b/app/src/main/java/org/mifos/mobile/ui/about/AboutUsScreen.kt
@@ -7,13 +7,17 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import org.mifos.mobile.core.ui.component.AboutUsItemCard
 import org.mifos.mobile.core.ui.component.MifosItemCard
+import org.mifos.mobile.core.ui.theme.MifosMobileTheme
+import org.mifos.mobile.models.AboutUsItem
 import org.mifos.mobile.ui.enums.AboutUsListItemId
 import java.util.*
 
+
 @Composable
 fun AboutUsScreen(viewModel: AboutUsViewModel) {
     LazyColumn(
@@ -70,5 +74,5 @@ fun AboutUsScreen(viewModel: AboutUsViewModel) {
 @Composable
 @Preview
 fun AboutScreenPreview() {
-    AboutUsScreen(AboutUsViewModel())
-}
+ AboutUsScreen(viewModel = viewModel())
+}
diff --git a/app/src/main/java/org/mifos/mobile/ui/about/AboutUsViewModel.kt b/app/src/main/java/org/mifos/mobile/ui/about/AboutUsViewModel.kt
@@ -7,52 +7,22 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import org.mifos.mobile.MifosSelfServiceApp.Companion.context
 import org.mifos.mobile.R
 import org.mifos.mobile.models.AboutUsItem
+import org.mifos.mobile.repositories.AboutUsRepository
 import org.mifos.mobile.ui.enums.AboutUsListItemId
 import java.util.*
 import javax.inject.Inject
 
 @HiltViewModel
-class AboutUsViewModel @Inject constructor() : ViewModel() {
+class AboutUsViewModel @Inject constructor(
+    private val aboutUsRepository: AboutUsRepository
+) : ViewModel() {
 
     private val _aboutUsItemEvent = MutableLiveData<AboutUsListItemId>()
     val aboutUsItemEvent: LiveData<AboutUsListItemId> get() = _aboutUsItemEvent
 
-    private val currentYear = Calendar.getInstance().get(Calendar.YEAR)
-    private val copyrightText =
-        context?.getString(R.string.copy_right_mifos)
-            ?.replace("%1\$s", currentYear.toString())
-
-    val aboutUsItems: List<AboutUsItem> = listOf(
-        AboutUsItem(
-            title = context?.getString(R.string.app_version_text),
-            itemId = AboutUsListItemId.APP_VERSION_TEXT
-        ),
-        AboutUsItem(
-            title = context?.getString(R.string.official_website),
-            iconUrl = R.drawable.ic_website,
-            itemId = AboutUsListItemId.OFFICE_WEBSITE
-        ),
-        AboutUsItem(
-            title = context?.getString(R.string.licenses),
-            iconUrl = R.drawable.ic_law_icon,
-            itemId = AboutUsListItemId.LICENSES
-        ),
-        AboutUsItem(
-            title = context?.getString(R.string.privacy_policy),
-            iconUrl = R.drawable.ic_privacy_policy,
-            itemId = AboutUsListItemId.PRIVACY_POLICY
-        ),
-        AboutUsItem(
-            title = context?.getString(R.string.sources),
-            iconUrl = R.drawable.ic_source_code,
-            itemId = AboutUsListItemId.SOURCE_CODE
-        ),
-        AboutUsItem(
-            title = copyrightText,
-            subtitle = R.string.license_string_with_value,
-            itemId = AboutUsListItemId.LICENSES_STRING_WITH_VALUE
-        )
-    )
+    val aboutUsItems: List<AboutUsItem> by lazy {
+        aboutUsRepository.getAboutUsItems()
+    }
 
     fun navigateToItem(itemId: AboutUsListItemId) {
         _aboutUsItemEvent.value = itemId