Merge pull request #12 from niscy-eudiw/main

Show application version in dashboard options menu
eu-digital-identity-wallet · Feb 6, 2024 · b2d364e · b2d364e
2 parents d36b99e + bc9d73e
commit b2d364e
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/business-logic/build.gradle.kts b/business-logic/build.gradle.kts
@@ -15,6 +15,7 @@
  */
 
 import eu.europa.ec.euidi.addConfigField
+import eu.europa.ec.euidi.getProperty
 
 plugins {
     id("eudi.android.library")
@@ -26,6 +27,10 @@ android {
 
     defaultConfig {
         addConfigField("DEEPLINK", "eudi-wallet://")
+        addConfigField(
+            "APP_VERSION",
+            getProperty("VERSION_NAME", "version.properties") ?: ""
+        )
     }
 }
 

diff --git a/business-logic/src/main/java/eu/europa/ec/businesslogic/config/ConfigLogic.kt b/business-logic/src/main/java/eu/europa/ec/businesslogic/config/ConfigLogic.kt
@@ -29,6 +29,11 @@ interface ConfigLogic {
      * Server Environment Configuration.
      */
     val environmentConfig: EnvironmentConfig
+
+    /**
+     * Application version.
+     */
+    val appVersion: String get() = BuildConfig.APP_VERSION
 }
 
 enum class AppBuildType {

diff --git a/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/di/FeatureDashboardModule.kt b/dashboard-feature/src/main/java/eu/europa/ec/dashboardfeature/di/FeatureDashboardModule.kt
@@ -16,6 +16,7 @@
 
 package eu.europa.ec.dashboardfeature.di
 
+import eu.europa.ec.businesslogic.config.ConfigLogic
 import eu.europa.ec.businesslogic.config.WalletCoreConfig
 import eu.europa.ec.businesslogic.controller.walletcore.WalletCoreDocumentsController
 import eu.europa.ec.dashboardfeature.interactor.DashboardInteractor
@@ -33,6 +34,12 @@ class FeatureDashboardModule
 fun provideDashboardInteractor(
     resourceProvider: ResourceProvider,
     walletCoreDocumentsController: WalletCoreDocumentsController,
-    walletCoreConfig: WalletCoreConfig
+    walletCoreConfig: WalletCoreConfig,
+    configLogic: ConfigLogic
 ): DashboardInteractor =
-    DashboardInteractorImpl(resourceProvider, walletCoreDocumentsController, walletCoreConfig)
+    DashboardInteractorImpl(
+        resourceProvider,
+        walletCoreDocumentsController,
+        walletCoreConfig,
+        configLogic
+    )
diff --git a/...ard-feature/src/main/java/eu/europa/ec/dashboardfeature/interactor/DashboardInteractor.kt b/...ard-feature/src/main/java/eu/europa/ec/dashboardfeature/interactor/DashboardInteractor.kt
@@ -18,6 +18,7 @@ package eu.europa.ec.dashboardfeature.interactor
 
 import android.bluetooth.BluetoothManager
 import android.content.Context
+import eu.europa.ec.businesslogic.config.ConfigLogic
 import eu.europa.ec.businesslogic.config.WalletCoreConfig
 import eu.europa.ec.businesslogic.controller.walletcore.WalletCoreDocumentsController
 import eu.europa.ec.businesslogic.extension.safeAsync
@@ -46,12 +47,14 @@ interface DashboardInteractor {
     fun getDocuments(): Flow<DashboardInteractorPartialState>
     fun isBleAvailable(): Boolean
     fun isBleCentralClientModeEnabled(): Boolean
+    fun getAppVersion(): String
 }
 
 class DashboardInteractorImpl(
     private val resourceProvider: ResourceProvider,
     private val walletCoreDocumentsController: WalletCoreDocumentsController,
-    private val walletCoreConfig: WalletCoreConfig
+    private val walletCoreConfig: WalletCoreConfig,
+    private val configLogic: ConfigLogic
 ) : DashboardInteractor {
 
     private val genericErrorMsg
@@ -117,4 +120,6 @@ class DashboardInteractorImpl(
             error = it.localizedMessage ?: genericErrorMsg
         )
     }
+
+    override fun getAppVersion(): String = configLogic.appVersion
 }
diff --git a/...board-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardScreen.kt b/...board-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardScreen.kt
@@ -52,6 +52,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
@@ -153,6 +154,7 @@ fun DashboardScreen(
             ) {
                 DashboardSheetContent(
                     sheetContent = state.sheetContent,
+                    state = state,
                     onEventSent = {
                         viewModel.setEvent(it)
                     }
@@ -266,6 +268,7 @@ private fun Content(
 @Composable
 private fun DashboardSheetContent(
     sheetContent: DashboardBottomSheetContent,
+    state: State,
     onEventSent: (event: Event) -> Unit
 ) {
     when (sheetContent) {
@@ -343,6 +346,16 @@ private fun DashboardSheetContent(
                             color = MaterialTheme.colorScheme.textPrimaryDark
                         )
                     }
+
+                    VSpacer.Medium()
+
+                    Text(
+                        modifier = Modifier.fillMaxWidth(),
+                        text = state.appVersion,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.textSecondaryDark,
+                        textAlign = TextAlign.Center
+                    )
                 }
             )
         }
@@ -677,6 +690,7 @@ private fun SheetContentPreview() {
     PreviewTheme {
         DashboardSheetContent(
             sheetContent = DashboardBottomSheetContent.OPTIONS,
+            state = State(),
             onEventSent = {}
         )
     }

diff --git a/...rd-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardViewModel.kt b/...rd-feature/src/main/java/eu/europa/ec/dashboardfeature/ui/dashboard/DashboardViewModel.kt
@@ -59,6 +59,7 @@ data class State(
     val documents: List<DocumentUi> = emptyList(),
 
     val deepLinkUri: Uri? = null,
+    val appVersion: String = ""
 ) : ViewState
 
 sealed class Event : ViewEvent {
@@ -123,7 +124,8 @@ class DashboardViewModel(
 ) : MviViewModel<Event, State, Effect>() {
 
     override fun setInitialState(): State = State(
-        isBleCentralClientModeEnabled = dashboardInteractor.isBleCentralClientModeEnabled()
+        isBleCentralClientModeEnabled = dashboardInteractor.isBleCentralClientModeEnabled(),
+        appVersion = dashboardInteractor.getAppVersion()
     )
 
     override fun handleEvents(event: Event) {