Add dynamic version name

Infomaniak · Aug 27, 2024 · 2b6bad6 · 2b6bad6
1 parent ccc1199
commit 2b6bad6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,6 +34,11 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
     compileOptions {
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt
@@ -42,7 +42,7 @@ fun MainScaffold(
     navController: NavHostController,
     currentDestination: MainNavigation,
     windowAdaptiveInfo: WindowAdaptiveInfo,
-    content: @Composable (Boolean) -> Unit = {},
+    content: @Composable () -> Unit = {},
 ) {
 
     val navType by rememberNavType(currentDestination, windowAdaptiveInfo)
@@ -57,15 +57,15 @@ private fun MainScaffold(
     navType: NavigationSuiteType,
     currentDestination: MainNavigation,
     navigateToSelectedItem: (MainNavigation) -> Unit,
-    content: @Composable (Boolean) -> Unit,
+    content: @Composable () -> Unit,
 ) {
     AppNavigationSuiteScaffold(navType, NavigationItem.entries, currentDestination, navigateToSelectedItem) {
         if (navType == NavigationSuiteType.None) {
-            content(it)
+            content()
         } else {
             Column {
                 Box(modifier = Modifier.weight(1f)) {
-                    content(it)
+                    content()
                 }
                 HorizontalDivider()
             }

diff --git a/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt b/...java/com/infomaniak/swisstransfer/ui/screen/main/components/AppNavigationSuiteScaffold.kt
@@ -60,7 +60,7 @@ fun AppNavigationSuiteScaffold(
     navigationItems: List<NavigationItem>,
     currentDestination: MainNavigation,
     navigateToSelectedItem: (MainNavigation) -> Unit,
-    content: @Composable (Boolean) -> Unit,
+    content: @Composable () -> Unit,
 ) {
     Surface(color = SwissTransferTheme.materialColors.background) {
         NavigationSuiteScaffoldLayout(
@@ -88,7 +88,7 @@ fun AppNavigationSuiteScaffold(
                     }
                 )
             ) {
-                content(layoutType == NavigationSuiteType.NavigationBar)
+                content()
             }
         }
     }

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt
@@ -30,6 +30,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import com.infomaniak.swisstransfer.BuildConfig
 import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.BrandTobAppBar
 import com.infomaniak.swisstransfer.ui.icons.AppIcons
@@ -128,7 +129,7 @@ fun SettingsScreen(onItemClick: (SettingsOptionScreens) -> Unit, getSelectedSett
             SettingItem(R.string.settingsOptionGiveFeedback, { selectedSetting == GIVE_FEEDBACK }, endIcon = OPEN_OUTSIDE) {
                 onItemClick(GIVE_FEEDBACK)
             }
-            SettingItem(R.string.version, isSelected = { false }, description = "0.0.1", onClick = null)
+            SettingItem(R.string.version, isSelected = { false }, description = BuildConfig.VERSION_NAME, onClick = null)
         }
     }
 }