diff --git a/app/src/main/java/org/linphone/ui/GenericActivity.kt b/app/src/main/java/org/linphone/ui/GenericActivity.kt index 6eb20d8d0..c3de526dc 100644 --- a/app/src/main/java/org/linphone/ui/GenericActivity.kt +++ b/app/src/main/java/org/linphone/ui/GenericActivity.kt @@ -59,12 +59,15 @@ open class GenericActivity : AppCompatActivity() { mainColor = corePreferences.themeMainColor val theme = super.theme when (mainColor) { - "yellow" -> theme.applyStyle(R.style.Theme_LinphoneYellow, true) - "green" -> theme.applyStyle(R.style.Theme_LinphoneGreen, true) - "blue" -> theme.applyStyle(R.style.Theme_LinphoneBlue, true) - "red" -> theme.applyStyle(R.style.Theme_LinphoneRed, true) - "pink" -> theme.applyStyle(R.style.Theme_LinphonePink, true) - "purple" -> theme.applyStyle(R.style.Theme_LinphonePurple, true) + "terracotta" -> theme.applyStyle(R.style.Theme_LinphoneTerracotta, true) + "lavender" -> theme.applyStyle(R.style.Theme_LinphoneLavender, true) + "honey" -> theme.applyStyle(R.style.Theme_LinphoneHoney, true) + "mint" -> theme.applyStyle(R.style.Theme_LinphoneMint, true) + "coral" -> theme.applyStyle(R.style.Theme_LinphoneCoral, true) + "night_blue" -> theme.applyStyle(R.style.Theme_LinphoneNightBlue, true) + "plum" -> theme.applyStyle(R.style.Theme_LinphonePlum, true) + "titanium" -> theme.applyStyle(R.style.Theme_LinphoneTitanium, true) + "mineral_blue" -> theme.applyStyle(R.style.Theme_LinphoneMineralBlue, true) else -> theme.applyStyle(R.style.Theme_Linphone, true) } return theme diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt index 3dc732406..3202906d8 100644 --- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt @@ -114,12 +114,15 @@ class CallActivity : GenericActivity() { val mainColor = corePreferences.themeMainColor val theme = super.getTheme() when (mainColor) { - "yellow" -> theme.applyStyle(R.style.Theme_LinphoneInCallYellow, true) - "green" -> theme.applyStyle(R.style.Theme_LinphoneInCallGreen, true) - "blue" -> theme.applyStyle(R.style.Theme_LinphoneInCallBlue, true) - "red" -> theme.applyStyle(R.style.Theme_LinphoneInCallRed, true) - "pink" -> theme.applyStyle(R.style.Theme_LinphoneInCallPink, true) - "purple" -> theme.applyStyle(R.style.Theme_LinphoneInCallPurple, true) + "terracotta" -> theme.applyStyle(R.style.Theme_LinphoneInCallTerracotta, true) + "lavender" -> theme.applyStyle(R.style.Theme_LinphoneInCallLavender, true) + "honey" -> theme.applyStyle(R.style.Theme_LinphoneInCallHoney, true) + "mint" -> theme.applyStyle(R.style.Theme_LinphoneInCallMint, true) + "coral" -> theme.applyStyle(R.style.Theme_LinphoneInCallCoral, true) + "night_blue" -> theme.applyStyle(R.style.Theme_LinphoneInCallNightBlue, true) + "plum" -> theme.applyStyle(R.style.Theme_LinphoneInCallPlum, true) + "titanium" -> theme.applyStyle(R.style.Theme_LinphoneInCallTitanium, true) + "mineral_blue" -> theme.applyStyle(R.style.Theme_LinphoneInCallMineralBlue, true) else -> theme.applyStyle(R.style.Theme_LinphoneInCall, true) } return theme diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt index 2a79235a0..084c7010a 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt @@ -169,21 +169,27 @@ class SettingsViewModel val color = MutableLiveData() val availableColorsNames = arrayListOf( AppUtils.getString(R.string.orange), - AppUtils.getString(R.string.yellow), - AppUtils.getString(R.string.green), - AppUtils.getString(R.string.blue), - AppUtils.getString(R.string.red), - AppUtils.getString(R.string.pink), - AppUtils.getString(R.string.purple) + AppUtils.getString(R.string.terracotta), + AppUtils.getString(R.string.lavender), + AppUtils.getString(R.string.honey), + AppUtils.getString(R.string.mint), + AppUtils.getString(R.string.coral), + AppUtils.getString(R.string.night_blue), + AppUtils.getString(R.string.plum), + AppUtils.getString(R.string.titanium), + AppUtils.getString(R.string.mineral_blue), ) val availableColorsValues = arrayListOf( "orange", - "yellow", - "green", - "blue", - "red", - "pink", - "purple" + "terracotta", + "lavender", + "honey", + "mint", + "coral", + "night_blue", + "plum", + "titanium", + "mineral_blue" ) // Tunnel settings diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 44af1073d..dc632c954 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -838,6 +838,15 @@ Rouge Rose Violet + Terracotta + Lavande + Miel + Menthe + Corail + Bleu Nuit + Prune + Titane + Bleu Minéral Aucun résultat… diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index d331ac04c..1d746df8b 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -84,57 +84,75 @@ @color/background_color_alt_dark_mode - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 98036be3c..82e289240 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -60,39 +60,58 @@ #80FFFFFF - #FFF5D6 - #80FFF5D6 - #FFE799 - #F5BC00 - #A37D00 + #f4e1d9 + #80f4e1d9 + #dea68f + #C86B45 + #784029 - #DCF9E7 - #80DCF9E7 - #A8F0C2 - #25D366 - #1C9C4B + #e5e4f0 + #80e5e4f0 + #b2aed2 + #7F79B5 + #4c486c - #D6F4FF - #80D6F4FF - #99E4FF - #00aff0 - #0078A3 + #f7ecd9 + #80f7ecd9 + #e8c88d + #D9A441 + #826227 - #FBE1DA - #80FBE1DA - #F5B53A - #E14318 - #A63211 + #e4f4ec + #80e4f4ec + #afdec6 + #7AC9A1 + #497860 - #FFD6F1 - #80FFD6F1 - #FF99DD - #FF00A9 - #B8007A + #fce1de + #80fce1de + #f7a69e + #F26B5E + #914038 + + #d2d7db + #80d2d7db + #788994 + #1F3B4D + #12232e + + #ebdbea + #80ebdbea + #c395c0 + #9B4F96 + #5d2f5a + + #e0e2e4 + #80e0e2e4 + #a3a9af + #67717A + #3d4349 + + #dae2ed + #80dae2ed + #92a8c9 + #4A6FA5 + #2c4263 - #FFD6FF - #80FFD6FF - #FF99FF - #800080 - #520052 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index af4aaff6d..d68c95161 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -881,6 +881,15 @@ Red Pink Purple + Terracotta + Lavender + Honey + Mint + Coral + Night Blue + Plum + Titanium + Mineral Blue No result found… diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index fae1e19df..79ff74c70 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -85,58 +85,85 @@ @color/gray_100 - - - - - - + + + + + + @@ -144,27 +171,39 @@ @color/gray_600 - - - - - - + + + + + +