Merge pull request #574 from Orange-OpenSource/develop

Release 0.14.0
Orange-OpenSource · Jul 12, 2023 · ce3b11e · ce3b11e
2 parents c0ace18 + 8e0dca7
commit ce3b11e
Show file tree

Hide file tree

Showing 279 changed files with 6,891 additions and 830 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/DEVELOP.md b/DEVELOP.md
@@ -18,7 +18,7 @@ repositories {
 
 ```groovy
 dependencies {
-    implementation 'com.orange.ods.android:ods-lib:0.13.0'
+    implementation 'com.orange.ods.android:ods-lib:0.14.0'
 }
 ```
 

diff --git a/README.md b/README.md
@@ -13,11 +13,17 @@
 
 ## Table of contents
 
+- [Status](#status)
 - [Content](#content)
 - [Bugs and feature requests](#bugs-and-feature-requests)
 - [Contributing](#contributing)
 - [Copyright and license](#copyright-and-license)
 
+## Status
+
+[![Build](https://img.shields.io/github/actions/workflow/status/Orange-OpenSource/ods-android/android-build.yml?logo=github)](https://github.com/Orange-OpenSource/ods-android/actions/workflows/android-build.yml?query=branch%3Amain)
+[![Maven Central](https://img.shields.io/maven-central/v/com.orange.ods.android/ods-lib?logo=apachemaven)](https://search.maven.org/search?q=com.orange.ods.android)
+
 ## Content
 
 This repository contains the Orange Design System Android library that provides Orange Android components, but also a demo application showcasing these different components.

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,7 +34,7 @@ android {
         minSdk = Versions.minSdk
         targetSdk = Versions.targetSdk
         val versionCodeProperty = project.findTypedProperty<String>("versionCode")
-        versionCode = versionCodeProperty?.toInt() ?: 4
+        versionCode = versionCodeProperty?.toInt() ?: 5
         versionName = version.toString()
         val versionNameSuffixProperty = project.findTypedProperty<String>("versionNameSuffix")
         versionNameSuffix = versionNameSuffixProperty
@@ -112,13 +112,13 @@ dependencies {
     implementation(project(":lib-xml"))
     implementation(project(":theme-innovation-cup"))
 
+    implementation(Dependencies.composeMaterial3)
     implementation(Dependencies.coreKtx)
     implementation(Dependencies.kotlinReflect)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.material)
     implementation(Dependencies.composeUi)
     implementation(Dependencies.lifecycleViewModelKtx)
-    implementation(Dependencies.composeMaterial)
     implementation(Dependencies.composeUiToolingPreview)
     implementation(Dependencies.lifecycleRuntimeKtx)
     implementation(Dependencies.activityCompose)

diff --git a/app/src/main/java/com/orange/ods/app/ui/MainBottomNavigation.kt b/app/src/main/java/com/orange/ods/app/ui/MainBottomNavigation.kt
@@ -51,29 +51,23 @@ fun NavGraphBuilder.addBottomNavigationGraph(navigateToElement: (String, Long?,
         val topAppBarConfiguration = MainTopAppBarState.DefaultConfiguration.newBuilder()
             .prependAction(TopAppBarConfiguration.Action.Search)
             .build()
-        with(LocalMainTopAppBarManager.current) {
-            updateTopAppBar(topAppBarConfiguration)
-            clearTopAppBarTabs()
-        }
+        LocalMainTopAppBarManager.current.updateTopAppBar(topAppBarConfiguration)
         GuidelinesScreen(onGuidelineClick = { route -> navigateToElement(route, null, from) })
     }
     composable(BottomNavigationSections.Components.route) { from ->
         val topAppBarConfiguration = MainTopAppBarState.DefaultConfiguration.newBuilder()
             .prependAction(TopAppBarConfiguration.Action.Search)
             .build()
-        with(LocalMainTopAppBarManager.current) {
-            updateTopAppBar(topAppBarConfiguration)
-            clearTopAppBarTabs()
-        }
+        LocalMainTopAppBarManager.current.updateTopAppBar(topAppBarConfiguration)
         ComponentsScreen(onComponentClick = { id -> navigateToElement(MainDestinations.ComponentDetailRoute, id, from) })
     }
     composable(BottomNavigationSections.Modules.route) {
-        LocalMainTopAppBarManager.current.reset()
+        LocalMainTopAppBarManager.current.updateTopAppBar(MainTopAppBarState.DefaultConfiguration)
         ModulesScreen()
     }
     composable(BottomNavigationSections.About.route) { from ->
         val context = LocalContext.current
-        LocalMainTopAppBarManager.current.reset()
+        LocalMainTopAppBarManager.current.updateTopAppBar(MainTopAppBarState.DefaultConfiguration)
         AboutScreen(onAboutItemClick = { id ->
             val aboutItem = aboutItems.firstOrNull { it.id == id }
             if (aboutItem is UrlAboutItem) {

diff --git a/app/src/main/java/com/orange/ods/app/ui/MainScreen.kt b/app/src/main/java/com/orange/ods/app/ui/MainScreen.kt
@@ -13,29 +13,23 @@ package com.orange.ods.app.ui
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.AppBarDefaults
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavGraphBuilder
@@ -55,20 +49,18 @@ import com.orange.ods.app.ui.guidelines.addGuidelinesGraph
 import com.orange.ods.app.ui.search.SearchScreen
 import com.orange.ods.app.ui.utilities.extension.isDarkModeEnabled
 import com.orange.ods.app.ui.utilities.extension.isOrange
-import com.orange.ods.compose.component.list.OdsListItem
-import com.orange.ods.compose.component.list.OdsRadioButtonTrailing
-import com.orange.ods.compose.text.OdsTextH6
 import com.orange.ods.compose.theme.OdsTheme
 import com.orange.ods.theme.OdsThemeConfigurationContract
 import com.orange.ods.utilities.extension.orElse
 import com.orange.ods.xml.theme.OdsXml
 import com.orange.ods.xml.utilities.extension.xml
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MainScreen(themeConfigurations: Set<OdsThemeConfigurationContract>, mainViewModel: MainViewModel = viewModel()) {
     val isSystemInDarkTheme = isSystemInDarkTheme()
     val mainState = rememberMainState(
-        themeState = rememberMainThemeState(
+        themeState = rememberThemeState(
             currentThemeConfiguration = rememberSaveable {
                 mutableStateOf(
                     getCurrentThemeConfiguration(
@@ -94,36 +86,54 @@ fun MainScreen(themeConfigurations: Set<OdsThemeConfigurationContract>, mainView
     CompositionLocalProvider(
         LocalConfiguration provides configuration,
         LocalMainTopAppBarManager provides mainState.topAppBarState,
-        LocalMainThemeManager provides mainState.themeState,
+        LocalThemeManager provides mainState.themeState,
         LocalOdsGuideline provides mainState.themeState.currentThemeConfiguration.guideline,
         LocalRecipes provides mainViewModel.recipes,
         LocalCategories provides mainViewModel.categories,
         LocalUiFramework provides mainState.uiFramework
     ) {
-        var changeThemeDialogVisible by remember { mutableStateOf(false) }
-
         OdsTheme(
             themeConfiguration = mainState.themeState.currentThemeConfiguration,
             darkThemeEnabled = configuration.isDarkModeEnabled
         ) {
+            val topBarScrollBehavior: TopAppBarScrollBehavior?
+            val modifier: Modifier
+
+            val showTabs by remember {
+                derivedStateOf { mainState.topAppBarState.tabsState.hasTabs }
+            }
+            val displayLargeTopAppBar by remember {
+                derivedStateOf { mainState.topAppBarState.isLarge }
+            }
+
+            if (displayLargeTopAppBar) {
+                topBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
+                val nestedScrollConnection = remember { topBarScrollBehavior.nestedScrollConnection }
+                modifier = Modifier.nestedScroll(nestedScrollConnection)
+            } else {
+                topBarScrollBehavior = null
+                modifier = Modifier
+            }
+
             Scaffold(
+                modifier = modifier,
                 backgroundColor = OdsTheme.colors.background,
                 topBar = {
-                    Surface(elevation = AppBarDefaults.TopAppBarElevation) {
+                    Surface(elevation = if (isSystemInDarkTheme()) 0.dp else AppBarDefaults.TopAppBarElevation) {
                         Column {
                             SystemBarsColorSideEffect()
                             MainTopAppBar(
-                                titleRes = mainState.topAppBarState.titleRes.value,
                                 shouldShowUpNavigationIcon = !mainState.shouldShowBottomBar,
-                                state = mainState.topAppBarState,
+                                topAppBarState = mainState.topAppBarState,
                                 upPress = mainState::upPress,
-                                onChangeThemeActionClick = { changeThemeDialogVisible = true },
                                 onSearchActionClick = {
                                     mainState.navController.navigate(MainDestinations.SearchRoute)
-                                }
+                                },
+                                scrollBehavior = topBarScrollBehavior
                             )
-                            // Display tabs in the top bar if needed
-                            MainTabs(mainTabsState = mainState.topAppBarState.tabsState)
+                            if (showTabs) {
+                                MainTabs(mainTabsState = mainState.topAppBarState.tabsState)
+                            }
                         }
                     }
                 },
@@ -141,21 +151,13 @@ fun MainScreen(themeConfigurations: Set<OdsThemeConfigurationContract>, mainView
                     }
                 }
             ) { innerPadding ->
-                Box(modifier = Modifier.padding(innerPadding)) {
-                    NavHost(mainState.navController, startDestination = MainDestinations.HomeRoute) {
-                        mainNavGraph(navigateToElement = mainState::navigateToElement, searchedText = mainState.topAppBarState.searchedText)
-                    }
-                }
-
-                if (changeThemeDialogVisible) {
-                    ChangeThemeDialog(
-                        themeState = mainState.themeState,
-                        dismissDialog = {
-                            changeThemeDialogVisible = false
-                        },
-                        onThemeSelected = {
-                            mainViewModel.storeUserThemeName(mainState.themeState.currentThemeConfiguration.name)
-                        }
+                NavHost(
+                    navController = mainState.navController, startDestination = MainDestinations.HomeRoute, modifier = Modifier.padding(innerPadding)
+                ) {
+                    mainNavGraph(
+                        navigateToElement = mainState::navigateToElement,
+                        upPress = mainState::upPress,
+                        searchedText = mainState.topAppBarState.searchedText
                     )
                 }
             }
@@ -170,38 +172,6 @@ private fun getCurrentThemeConfiguration(storedUserThemeName: String?, themeConf
         .orElse { themeConfigurations.first() }
 }
 
-@Composable
-private fun ChangeThemeDialog(themeState: MainThemeState, dismissDialog: () -> Unit, onThemeSelected: () -> Unit) {
-    val selectedRadio = rememberSaveable { mutableStateOf(themeState.currentThemeConfiguration.name) }
-
-    Dialog(onDismissRequest = dismissDialog) {
-        Column(modifier = Modifier.background(OdsTheme.colors.surface)) {
-            OdsTextH6(
-                text = stringResource(R.string.top_app_bar_action_change_theme_desc),
-                modifier = Modifier
-                    .padding(top = dimensionResource(R.dimen.spacing_m), bottom = dimensionResource(id = R.dimen.spacing_s))
-                    .padding(horizontal = dimensionResource(R.dimen.screen_horizontal_margin))
-            )
-            themeState.themeConfigurations.forEach { themeConfiguration ->
-                OdsListItem(
-                    text = themeConfiguration.name,
-                    trailing = OdsRadioButtonTrailing(
-                        selectedRadio = selectedRadio,
-                        currentRadio = themeConfiguration.name,
-                        onClick = {
-                            if (themeConfiguration != themeState.currentThemeConfiguration) {
-                                themeState.currentThemeConfiguration = themeConfiguration
-                                onThemeSelected()
-                            }
-                            dismissDialog()
-                        }
-                    )
-                )
-            }
-        }
-    }
-}
-
 @Composable
 private fun SystemBarsColorSideEffect() {
     val systemUiController = rememberSystemUiController()
@@ -218,31 +188,33 @@ private fun SystemBarsColorSideEffect() {
 private fun MainTabs(mainTabsState: MainTabsState) {
     with(mainTabsState) {
         pagerState?.let { pagerState ->
-            if (hasTabs) {
-                // Do not use tabs directly because this is a SnapshotStateList
-                // Thus its value can be modified and can lead to crashes if it becomes empty
-                val tabs = tabs.toList()
-                if (scrollableTabs.value) {
-                    ScrollableTabRow(
-                        tabs = tabs,
-                        pagerState = pagerState,
-                        tabIconType = tabIconType.value,
-                        tabTextEnabled = tabTextEnabled.value
-                    )
-                } else {
-                    FixedTabRow(
-                        tabs = tabs,
-                        pagerState = pagerState,
-                        tabIconType = tabIconType.value,
-                        tabTextEnabled = tabTextEnabled.value
-                    )
-                }
+            // Do not use tabs directly because this is a SnapshotStateList
+            // Thus its value can be modified and can lead to crashes if it becomes empty
+            val tabs = tabs.toList()
+            if (scrollableTabs.value) {
+                ScrollableTabRow(
+                    tabs = tabs,
+                    pagerState = pagerState,
+                    tabIconType = tabIconType.value,
+                    tabTextEnabled = tabTextEnabled.value
+                )
+            } else {
+                FixedTabRow(
+                    tabs = tabs,
+                    pagerState = pagerState,
+                    tabIconType = tabIconType.value,
+                    tabTextEnabled = tabTextEnabled.value
+                )
             }
         }
     }
 }
 
-private fun NavGraphBuilder.mainNavGraph(navigateToElement: (String, Long?, NavBackStackEntry) -> Unit, searchedText: MutableState<TextFieldValue>) {
+private fun NavGraphBuilder.mainNavGraph(
+    navigateToElement: (String, Long?, NavBackStackEntry) -> Unit,
+    upPress: () -> Unit,
+    searchedText: MutableState<TextFieldValue>
+) {
     navigation(
         route = MainDestinations.HomeRoute,
         startDestination = BottomNavigationSections.Guidelines.route
@@ -251,16 +223,13 @@ private fun NavGraphBuilder.mainNavGraph(navigateToElement: (String, Long?, NavB
     }
 
     addGuidelinesGraph()
-    addComponentsGraph(navigateToElement)
+    addComponentsGraph(navigateToElement, upPress)
     addAboutGraph()
 
     composable(
         route = MainDestinations.SearchRoute
     ) { from ->
-        with(LocalMainTopAppBarManager.current) {
-            clearTopAppBarTabs()
-            updateTopAppBarTitle(R.string.navigation_item_search)
-        }
+        LocalMainTopAppBarManager.current.updateTopAppBarTitle(R.string.navigation_item_search)
         SearchScreen(
             searchedText,
             onResultItemClick = { route, id -> navigateToElement(route, id, from) }

diff --git a/app/src/main/java/com/orange/ods/app/ui/MainState.kt b/app/src/main/java/com/orange/ods/app/ui/MainState.kt
@@ -35,7 +35,7 @@ object MainDestinations {
 
     const val ComponentDetailRoute = "component"
     const val ComponentIdKey = "componentId"
-    const val ComponentVariantRoute = "component/variant"
+    const val ComponentVariantDemoRoute = "component/variant"
     const val ComponentVariantIdKey = "componentVariantId"
     const val ComponentDemoRoute = "component/demo"
 
@@ -47,7 +47,7 @@ object MainDestinations {
 
 @Composable
 fun rememberMainState(
-    themeState: MainThemeState,
+    themeState: ThemeState,
     navController: NavHostController = rememberNavController(),
     topAppBarState: MainTopAppBarState = rememberMainTopAppBarState(),
     uiFramework: MutableState<UiFramework> = rememberSaveable { mutableStateOf(UiFramework.Compose) }
@@ -57,7 +57,7 @@ fun rememberMainState(
     }
 
 class MainState(
-    val themeState: MainThemeState,
+    val themeState: ThemeState,
     val navController: NavHostController,
     val topAppBarState: MainTopAppBarState,
     val uiFramework: MutableState<UiFramework>
@@ -84,6 +84,10 @@ class MainState(
         get() = navController.currentDestination?.route
 
     fun upPress() {
+        with(topAppBarState) {
+            updateTopAppBar(MainTopAppBarState.DefaultConfiguration)
+            clearTopAppBarTabs()
+        }
         navController.navigateUp()
     }