From f9e81c477b4181754c6a8576b30a0f21edf49c88 Mon Sep 17 00:00:00 2001 From: Florent Maitre Date: Fri, 3 Feb 2023 11:41:01 +0100 Subject: [PATCH 01/96] [#418] Fix crash when exiting the fixed tabs screen --- changelog.md | 1 + demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index fe7c0677a..ba67e5fd7 100644 --- a/changelog.md +++ b/changelog.md @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \[Demo\] Fix an accessibility bug where icon buttons were not focusable with Talkback ([#393](https://github.com/Orange-OpenSource/ods-android/issues/393)) - \[Demo\] Fix list item selection controls trailing vocalization: Checkboxes, Switches and Radio Buttons in lists ([#387](https://github.com/Orange-OpenSource/ods-android/issues/387)) - \[Demo\] Screens in about section now use current theme colors ([#390](https://github.com/Orange-OpenSource/ods-android/issues/390)) +- \[Demo\] Fix crash when exiting the fixed tabs screen ([#418](https://github.com/Orange-OpenSource/ods-android/issues/418)) - \[Lib\] Fix cards vocalization when clickable ([#391](https://github.com/Orange-OpenSource/ods-android/issues/391)) ### Removed diff --git a/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt index 62409652a..bbc037059 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/MainScreen.kt @@ -204,6 +204,9 @@ 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, From 2111b1754c7763a7865f7e884ada4478da897735 Mon Sep 17 00:00:00 2001 From: Doline Touko Date: Thu, 9 Feb 2023 11:06:54 +0100 Subject: [PATCH 02/96] [#419] Update about page --- .../java/com/orange/ods/demo/ui/about/AboutScreen.kt | 9 ++++++++- demo/src/main/res/values/strings.xml | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt b/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt index 51f293b81..88ddce9fb 100644 --- a/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt +++ b/demo/src/main/java/com/orange/ods/demo/ui/about/AboutScreen.kt @@ -64,7 +64,14 @@ fun AboutScreen(onAboutItemClick: (Long) -> Unit) { text = getVersion(context), modifier = Modifier.padding(top = dimensionResource(id = R.dimen.spacing_xs)) ) - OdsTextCaption(text = stringResource(id = R.string.about_copyright)) + OdsTextCaption( + text = stringResource(id = R.string.about_description), + modifier = Modifier.padding(top = dimensionResource(id = R.dimen.spacing_xs)) + ) + OdsTextCaption( + text = stringResource(id = R.string.about_copyright), + modifier = Modifier.padding(top = dimensionResource(id = R.dimen.spacing_xs)) + ) } Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.spacing_m))) diff --git a/demo/src/main/res/values/strings.xml b/demo/src/main/res/values/strings.xml index 6e564f649..cf545bb56 100644 --- a/demo/src/main/res/values/strings.xml +++ b/demo/src/main/res/values/strings.xml @@ -301,9 +301,10 @@ Coming soon… - Orange Design + ODS Demo Version %1$s (%2$d) Copyright notice + In this app you\'ll find implemented code examples of the guidelines, components and modules, for the themes of the Orange Design System. Design guidelines Legal notice Privacy policy From 1f4a5016aee012cde4e72e370b439d3cc31dee48 Mon Sep 17 00:00:00 2001 From: Doline Touko Date: Thu, 9 Feb 2023 11:48:55 +0100 Subject: [PATCH 03/96] [#419] Update changelog --- .idea/codeStyles/Project.xml | 3 +++ changelog.md | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 9ddf43779..a92b7a9a0 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -5,6 +5,9 @@