Skip to content

Commit 480824b

Browse files
florentmaitreflorentmaitre
committed
Various fixes
1 parent ffeceff commit 480824b

23 files changed

Lines changed: 546 additions & 390 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
android:roundIcon="@mipmap/ic_launcher_round"
2323
android:supportsRtl="true"
2424
android:theme="@style/Theme.MaterialComponents.NoActionBar">
25-
<!-- <provider-->
26-
<!-- android:name="com.orange.ouds.theme.orange.OrangeFontProvider"-->
27-
<!-- android:authorities="com.orange.ouds.theme.orange.fontprovider"-->
28-
<!-- android:exported="false" />-->
25+
<provider
26+
android:name="com.orange.ouds.theme.orange.OrangeFontProvider"
27+
android:authorities="com.orange.ouds.theme.orange.fontprovider"
28+
android:exported="false" />
2929
<activity
3030
android:name="com.orange.ouds.app.ui.MainActivity"
3131
android:exported="true">

‎app/src/main/java/com/orange/ouds/app/OudsApplication.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import androidx.compose.runtime.mutableStateOf
1818
import androidx.compose.runtime.setValue
1919
import com.google.firebase.Firebase
2020
import com.google.firebase.crashlytics.crashlytics
21-
//import com.orange.ouds.theme.orange.OrangeFontFamily
22-
//import com.orange.ouds.theme.orange.OrangeHelveticaNeueArabic
23-
//import com.orange.ouds.theme.orange.OrangeHelveticaNeueLatin
21+
import com.orange.ouds.theme.orange.OrangeHelveticaNeueArabic
22+
import com.orange.ouds.theme.orange.OrangeHelveticaNeueLatin
23+
import com.orange.ouds.theme.orange.preloadDownloadableFontFamilies
2424
import dagger.hilt.android.HiltAndroidApp
2525

2626
@HiltAndroidApp
@@ -39,9 +39,9 @@ class OudsApplication : Application() {
3939
// Thus we use the Android Downloadable Fonts feature to retrieve the files on a remote server.
4040
// However the preferred way of using the Helvetica Neue font in the Orange themes is configuring
4141
// bundled font files with `OrangeHelveticaNeueLatin.Bundled` and/or `OrangeHelveticaNeueArabic.Bundled`.
42-
// OrangeFontFamily.preloadDownloadableFontFamilies(this, listOf(OrangeHelveticaNeueLatin.Downloadable, OrangeHelveticaNeueArabic.Downloadable)) {
43-
// areDownloadableOrangeFontFamiliesPreloaded = true
44-
// }
42+
preloadDownloadableFontFamilies(this, listOf(OrangeHelveticaNeueLatin.Downloadable, OrangeHelveticaNeueArabic.Downloadable)) {
43+
areDownloadableOrangeFontFamiliesPreloaded = true
44+
}
4545
}
4646

4747
private fun initializeCrashlytics() {

‎app/src/main/java/com/orange/ouds/app/ui/MainScreen.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ import com.orange.ouds.core.theme.OudsTheme
5757
import com.orange.ouds.foundation.RestrictedOudsApi
5858
import com.orange.ouds.foundation.extensions.orElse
5959
import com.orange.ouds.theme.OudsThemeSettings
60-
import com.orange.ouds.theme.wireframe.WIREFRAME_THEME_NAME
61-
//import com.orange.ouds.theme.orange.ORANGE_THEME_NAME
60+
import com.orange.ouds.theme.orange.ORANGE_THEME_NAME
6261
import dev.chrisbanes.haze.HazeStyle
6362
import dev.chrisbanes.haze.hazeEffect
6463
import dev.chrisbanes.haze.hazeSource
@@ -68,8 +67,7 @@ import dev.chrisbanes.haze.rememberHazeState
6867
fun MainScreen(mainViewModel: MainViewModel = hiltViewModel()) {
6968
MainScreen(
7069
themeSettings = mainViewModel.getUserThemeSettings().orElse { OudsThemeSettings() },
71-
//currentThemeName = mainViewModel.getUserThemeName().orElse { ORANGE_THEME_NAME },
72-
currentThemeName = mainViewModel.getUserThemeName().orElse { WIREFRAME_THEME_NAME },
70+
currentThemeName = mainViewModel.getUserThemeName().orElse { ORANGE_THEME_NAME },
7371
onThemeChange = { themeName ->
7472
mainViewModel.storeUserThemeName(themeName)
7573
},
@@ -206,7 +204,7 @@ private fun PreviewMainScreen() = AppPreview {
206204
// See https://issuetracker.google.com/issues/240601093
207205
MainScreen(
208206
themeSettings = OudsThemeSettings(),
209-
currentThemeName = WIREFRAME_THEME_NAME,//ORANGE_THEME_NAME,
207+
currentThemeName = ORANGE_THEME_NAME,
210208
onThemeChange = {},
211209
onThemeSettingsChange = {}
212210
)

‎app/src/main/java/com/orange/ouds/app/ui/ThemeState.kt‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ import com.orange.ouds.theme.orangecompact.ORANGE_COMPACT_THEME_NAME
3030
import com.orange.ouds.theme.orangecompact.OrangeCompactTheme
3131
import com.orange.ouds.theme.sosh.SOSH_THEME_NAME
3232
import com.orange.ouds.theme.sosh.SoshTheme
33-
//import com.orange.ouds.theme.orange.ORANGE_THEME_NAME
34-
//import com.orange.ouds.theme.orange.OrangeFontFamily
35-
//import com.orange.ouds.theme.orange.OrangeHelveticaNeueArabic
36-
//import com.orange.ouds.theme.orange.OrangeHelveticaNeueLatin
37-
//import com.orange.ouds.theme.orange.OrangeTheme
38-
//import com.orange.ouds.theme.orangecompact.ORANGE_COMPACT_THEME_NAME
39-
//import com.orange.ouds.theme.orangecompact.OrangeCompactTheme
40-
//import com.orange.ouds.theme.sosh.SOSH_THEME_NAME
41-
//import com.orange.ouds.theme.sosh.SoshTheme
4233
import com.orange.ouds.theme.wireframe.WIREFRAME_THEME_NAME
4334
import com.orange.ouds.theme.wireframe.WireframeTheme
4435

@@ -51,7 +42,7 @@ fun rememberThemeState(
5142
SOSH_THEME_NAME,
5243
WIREFRAME_THEME_NAME
5344
),
54-
currentThemeName: String = WIREFRAME_THEME_NAME,//ORANGE_THEME_NAME,
45+
currentThemeName: String = ORANGE_THEME_NAME,
5546
areDownloadableOrangeFontFamiliesPreloaded: Boolean = false
5647
) = rememberSaveable(settings, themeNames, currentThemeName, areDownloadableOrangeFontFamiliesPreloaded, saver = ThemeState.Saver) {
5748
ThemeState(settings, themeNames, currentThemeName, areDownloadableOrangeFontFamiliesPreloaded)
@@ -117,7 +108,7 @@ class ThemeState(
117108

118109
private fun getCurrentTheme(name: String): OudsThemeContract {
119110
return themes.firstOrNull { it.name == name }
120-
.orElse { themes.firstOrNull { it.name == WIREFRAME_THEME_NAME } }
111+
.orElse { themes.firstOrNull { it.name == ORANGE_THEME_NAME } }
121112
.orElse { themes.first() }
122113
}
123114

‎app/src/main/java/com/orange/ouds/app/ui/utilities/ThemeDrawableResources.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ class ThemeDrawableResources(val theme: OudsThemeContract) {
4444
else -> error(ThemeDrawableResources::call)
4545
}
4646

47+
val close: Int
48+
@DrawableRes
49+
get() = when (theme) {
50+
is OrangeTheme, is OrangeCompactTheme -> R.drawable.ic_orange_close
51+
is SoshTheme -> R.drawable.ic_sosh_close
52+
is WireframeTheme -> R.drawable.ic_wireframe_close
53+
else -> error(ThemeDrawableResources::close)
54+
}
55+
4756
val filters: Int
4857
@DrawableRes
4958
get() = when (theme) {

‎app/src/main/java/com/orange/ouds/app/ui/utilities/composable/AppPreview.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ import com.orange.ouds.foundation.InternalOudsApi
2525
import com.orange.ouds.theme.orange.OrangeTheme
2626
import com.orange.ouds.theme.orange.getPreviewOrangeFontFamily
2727

28-
//import com.orange.ouds.theme.orange.OrangeTheme
29-
//import com.orange.ouds.theme.orange.getPreviewOrangeFontFamily
30-
3128
@OptIn(InternalOudsApi::class)
3229
@Composable
3330
fun AppPreview(

‎app/src/main/java/com/orange/ouds/app/ui/utilities/composable/CustomizationElements.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import androidx.compose.ui.text.TextStyle
4848
import androidx.compose.ui.text.input.TextFieldValue
4949
import androidx.compose.ui.unit.Dp
5050
import com.orange.ouds.app.R
51+
import com.orange.ouds.app.ui.utilities.LocalThemeDrawableResources
5152
import com.orange.ouds.core.component.OudsFilterChip
5253
import com.orange.ouds.core.component.OudsSwitchItem
5354
import com.orange.ouds.core.component.OudsTextInput
@@ -202,7 +203,7 @@ fun CustomizationTextInput(
202203
keyboardOptions = keyboardOptions,
203204
trailingIconButton = if (value.text.isNotEmpty()) {
204205
OudsTextInputTrailingIconButton(
205-
painter = painterResource(R.drawable.ic_copy),
206+
painter = painterResource(id = LocalThemeDrawableResources.current.close),
206207
contentDescription = stringResource(R.string.app_components_common_textInputClearIcon_a11y),
207208
onClick = {
208209
onValueChange(value.copy(text = resetValue))

‎app/src/main/res/drawable/ic_orange_close.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="m18.75,7.178 l-1.928,-1.929L12,10.071 7.178,5.25 5.249,7.18 10.071,12 5.25,16.822l1.93,1.929L12,13.929l4.822,4.822 1.929,-1.929L13.929,12l4.822,-4.822Z"
8+
android:fillColor="#000000"/>
9+
</vector>

‎app/src/main/res/drawable/ic_sosh_close.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M18.397,5.603c0.47,0.47 0.47,1.235 0,1.706l-4.691,4.69 4.69,4.692a1.207,1.207 0,0 1,-1.705 1.706L12,13.705l-4.691,4.692a1.207,1.207 0,0 1,-1.706 -1.706l4.691,-4.692 -4.69,-4.69a1.207,1.207 0,0 1,1.705 -1.706L12,10.293l4.691,-4.69c0.47,-0.47 1.235,-0.47 1.706,0Z"
8+
android:fillColor="#000000"
9+
android:fillType="evenOdd"/>
10+
</vector>

‎app/src/main/res/drawable/ic_wireframe_close.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M17.293,5.293a1,1 0,1 1,1.414 1.414L13.414,12l5.293,5.293 0.068,0.076a1,1 0,0 1,-1.406 1.406l-0.076,-0.068L12,13.414l-5.293,5.293a1,1 0,1 1,-1.414 -1.414L10.586,12 5.293,6.707l-0.068,-0.076A1,1 0,0 1,6.63 5.225l0.076,0.068L12,10.586l5.293,-5.293Z"
8+
android:fillColor="#000000"/>
9+
</vector>

0 commit comments

Comments
 (0)