diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 2bae66e30..08c120b97 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -637,10 +637,10 @@ class NotificationsManager @MainThread constructor(private val context: Context) try { style.setIsVideo(isVideo) style.setAnswerButtonColorHint( - context.resources.getColor(R.color.green_online, context.theme) + context.resources.getColor(R.color.green_success_500, context.theme) ) style.setDeclineButtonColorHint( - context.resources.getColor(R.color.red_danger, context.theme) + context.resources.getColor(R.color.red_danger_500, context.theme) ) setStyle(style) } catch (iae: IllegalArgumentException) { @@ -655,7 +655,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) setAutoCancel(false) setShowWhen(true) setOngoing(true) - color = ContextCompat.getColor(context, R.color.primary_color) + color = ContextCompat.getColor(context, R.color.orange_main_500) setFullScreenIntent(pendingIntent, true) } @@ -711,7 +711,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) .setSmallIcon(R.drawable.chat_text) .setAutoCancel(true) .setLargeIcon(largeIcon) - .setColor(ContextCompat.getColor(context, R.color.primary_color)) + .setColor(ContextCompat.getColor(context, R.color.orange_main_500)) .setCategory(NotificationCompat.CATEGORY_MESSAGE) .setGroup(CHAT_NOTIFICATIONS_GROUP) .setVisibility(NotificationCompat.VISIBILITY_PRIVATE) @@ -794,7 +794,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH) channel.description = name - channel.lightColor = context.getColor(R.color.primary_color) + channel.lightColor = context.getColor(R.color.orange_main_500) channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC channel.enableVibration(true) channel.enableLights(true) @@ -823,7 +823,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH) channel.description = name - channel.lightColor = context.getColor(R.color.primary_color) + channel.lightColor = context.getColor(R.color.orange_main_500) channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC channel.enableLights(true) channel.enableVibration(true) diff --git a/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt index da7e8c544..29ab7ef22 100644 --- a/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt @@ -42,12 +42,12 @@ abstract class AbstractTopBarFragment : GenericFragment() { val color = if (useInCallColor) { ContextCompat.getColor( requireContext(), - R.color.green_online + R.color.green_success_500 ) } else { ContextCompat.getColor( requireContext(), - R.color.primary_color + R.color.orange_main_500 ) } requireActivity().window.statusBarColor = color diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt index a4bc15bee..677ab4d2a 100644 --- a/app/src/main/java/org/linphone/utils/AppUtils.kt +++ b/app/src/main/java/org/linphone/utils/AppUtils.kt @@ -108,7 +108,7 @@ class AppUtils { redToast.message = message redToast.icon = icon redToast.shadowColor = R.drawable.shape_toast_red_background - redToast.textColor = R.color.red_danger + redToast.textColor = R.color.red_danger_500 redToast.root.visibility = View.GONE return redToast } @@ -129,7 +129,7 @@ class AppUtils { greenToast.message = message greenToast.icon = icon greenToast.shadowColor = R.drawable.shape_toast_green_background - greenToast.textColor = R.color.green_online + greenToast.textColor = R.color.green_success_500 greenToast.root.visibility = View.GONE return greenToast } @@ -150,7 +150,7 @@ class AppUtils { blueToast.message = message blueToast.icon = icon blueToast.shadowColor = R.drawable.shape_toast_blue_background - blueToast.textColor = R.color.blue_trusted + blueToast.textColor = R.color.blue_info_500 blueToast.root.visibility = View.GONE return blueToast } diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 76343f23b..0ede06567 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -233,7 +233,7 @@ fun AvatarView.loadAccountAvatar(account: AccountModel?) { if (account.showTrust.value == true) { avatarBorderColor = - resources.getColor(R.color.blue_trusted, context.theme) + resources.getColor(R.color.blue_info_500, context.theme) avatarBorderWidth = AppUtils.getDimension(R.dimen.avatar_trust_border_width).toInt() } else { @@ -257,7 +257,7 @@ fun AvatarView.loadAccountAvatar(account: AccountModel?) { } if (account.showTrust.value == true) { - avatarBorderColor = resources.getColor(R.color.blue_trusted, context.theme) + avatarBorderColor = resources.getColor(R.color.blue_info_500, context.theme) avatarBorderWidth = AppUtils.getDimension(R.dimen.avatar_trust_border_width).toInt() } else { avatarBorderWidth = AppUtils.getDimension(R.dimen.zero).toInt() @@ -290,7 +290,7 @@ fun AvatarView.loadContactAvatar(contact: ContactAvatarModel?) { if (contact.showTrust.value == true) { avatarBorderColor = - resources.getColor(R.color.blue_trusted, context.theme) + resources.getColor(R.color.blue_info_500, context.theme) avatarBorderWidth = AppUtils.getDimension(R.dimen.avatar_trust_border_width).toInt() } else { diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt index 2fa96dd03..cf2a411e3 100644 --- a/app/src/main/java/org/linphone/utils/DialogUtils.kt +++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt @@ -230,7 +230,7 @@ class DialogUtils { dialog.setContentView(binding.root) val d: Drawable = ColorDrawable( - ContextCompat.getColor(dialog.context, R.color.dialog_background) + ContextCompat.getColor(dialog.context, R.color.gray_main2_800_alpha_65) ) // d.alpha = 166 dialog.window diff --git a/app/src/main/res/color/assistant_sms_confirmation_code_color.xml b/app/src/main/res/color/assistant_sms_confirmation_code_color.xml index 46e40e914..21cc7405c 100644 --- a/app/src/main/res/color/assistant_sms_confirmation_code_color.xml +++ b/app/src/main/res/color/assistant_sms_confirmation_code_color.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/color/primary_color_selector.xml b/app/src/main/res/color/primary_color_selector.xml index 4dadd96c4..313b37b15 100644 --- a/app/src/main/res/color/primary_color_selector.xml +++ b/app/src/main/res/color/primary_color_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/secondary_button_label_color.xml b/app/src/main/res/color/secondary_button_label_color.xml index af19c785a..564ff89c6 100644 --- a/app/src/main/res/color/secondary_button_label_color.xml +++ b/app/src/main/res/color/secondary_button_label_color.xml @@ -1,6 +1,6 @@ - + - + diff --git a/app/src/main/res/color/switch_track_color.xml b/app/src/main/res/color/switch_track_color.xml index bb693d14d..6fb2090bb 100644 --- a/app/src/main/res/color/switch_track_color.xml +++ b/app/src/main/res/color/switch_track_color.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/color/tertiary_button_label_color.xml b/app/src/main/res/color/tertiary_button_label_color.xml index dcd1ec9d2..1918dc88c 100644 --- a/app/src/main/res/color/tertiary_button_label_color.xml +++ b/app/src/main/res/color/tertiary_button_label_color.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/drawable/led_do_not_disturb.xml b/app/src/main/res/drawable/led_do_not_disturb.xml index ead9d2698..42c4e9a2b 100644 --- a/app/src/main/res/drawable/led_do_not_disturb.xml +++ b/app/src/main/res/drawable/led_do_not_disturb.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/led_online.xml b/app/src/main/res/drawable/led_online.xml index 5293f0745..3f1163679 100644 --- a/app/src/main/res/drawable/led_online.xml +++ b/app/src/main/res/drawable/led_online.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/primary_cell_background.xml b/app/src/main/res/drawable/primary_cell_background.xml index 683a126e4..545585474 100644 --- a/app/src/main/res/drawable/primary_cell_background.xml +++ b/app/src/main/res/drawable/primary_cell_background.xml @@ -1,9 +1,9 @@ + android:drawable="@color/gray_main2_100" /> + android:drawable="@color/gray_main2_100" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/secondary_cell_background.xml b/app/src/main/res/drawable/secondary_cell_background.xml index 269221cf3..1f7317d3b 100644 --- a/app/src/main/res/drawable/secondary_cell_background.xml +++ b/app/src/main/res/drawable/secondary_cell_background.xml @@ -1,9 +1,9 @@ + android:drawable="@color/gray_main2_100" /> + android:drawable="@color/gray_main2_100" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_green_background.xml b/app/src/main/res/drawable/shape_circle_green_background.xml index d36f85dd7..d85e09b4c 100644 --- a/app/src/main/res/drawable/shape_circle_green_background.xml +++ b/app/src/main/res/drawable/shape_circle_green_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_green_disabled_background.xml b/app/src/main/res/drawable/shape_circle_green_disabled_background.xml index 9cf045c2f..f78730669 100644 --- a/app/src/main/res/drawable/shape_circle_green_disabled_background.xml +++ b/app/src/main/res/drawable/shape_circle_green_disabled_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_green_pressed_background.xml b/app/src/main/res/drawable/shape_circle_green_pressed_background.xml index 4539ffb87..2094742c3 100644 --- a/app/src/main/res/drawable/shape_circle_green_pressed_background.xml +++ b/app/src/main/res/drawable/shape_circle_green_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_light_blue_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_background.xml index 9140653db..32f3e19db 100644 --- a/app/src/main/res/drawable/shape_circle_light_blue_background.xml +++ b/app/src/main/res/drawable/shape_circle_light_blue_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml index 778289ee4..4cb89ed32 100644 --- a/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml +++ b/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml index 6f4cde864..fb7df193e 100644 --- a/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml +++ b/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_white_pressed_background.xml b/app/src/main/res/drawable/shape_circle_white_pressed_background.xml index 032b95cad..59858036f 100644 --- a/app/src/main/res/drawable/shape_circle_white_pressed_background.xml +++ b/app/src/main/res/drawable/shape_circle_white_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_dialog_background.xml b/app/src/main/res/drawable/shape_dialog_background.xml index a9e6c9e4f..d145f5f91 100644 --- a/app/src/main/res/drawable/shape_dialog_background.xml +++ b/app/src/main/res/drawable/shape_dialog_background.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/drawable/shape_drawer_handle.xml b/app/src/main/res/drawable/shape_drawer_handle.xml index 05e6dd4e5..28cf5927e 100644 --- a/app/src/main/res/drawable/shape_drawer_handle.xml +++ b/app/src/main/res/drawable/shape_drawer_handle.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_edit_text_background.xml b/app/src/main/res/drawable/shape_edit_text_background.xml index 162c2b8e7..e7bc0f46a 100644 --- a/app/src/main/res/drawable/shape_edit_text_background.xml +++ b/app/src/main/res/drawable/shape_edit_text_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_edit_text_disabled_background.xml b/app/src/main/res/drawable/shape_edit_text_disabled_background.xml index ba0cc52fe..95af56ae5 100644 --- a/app/src/main/res/drawable/shape_edit_text_disabled_background.xml +++ b/app/src/main/res/drawable/shape_edit_text_disabled_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_edit_text_error_background.xml b/app/src/main/res/drawable/shape_edit_text_error_background.xml index ff2e4875f..67848caa2 100644 --- a/app/src/main/res/drawable/shape_edit_text_error_background.xml +++ b/app/src/main/res/drawable/shape_edit_text_error_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_edit_text_focused_background.xml b/app/src/main/res/drawable/shape_edit_text_focused_background.xml index ef67db014..7a2d21e44 100644 --- a/app/src/main/res/drawable/shape_edit_text_focused_background.xml +++ b/app/src/main/res/drawable/shape_edit_text_focused_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_gradient.xml b/app/src/main/res/drawable/shape_gradient.xml index 6a283b840..ff5b7e11d 100644 --- a/app/src/main/res/drawable/shape_gradient.xml +++ b/app/src/main/res/drawable/shape_gradient.xml @@ -3,6 +3,6 @@ diff --git a/app/src/main/res/drawable/shape_menu_item_background.xml b/app/src/main/res/drawable/shape_menu_item_background.xml index 935d0e04b..c3fc659bd 100644 --- a/app/src/main/res/drawable/shape_menu_item_background.xml +++ b/app/src/main/res/drawable/shape_menu_item_background.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_numpad_background.xml b/app/src/main/res/drawable/shape_numpad_background.xml index 334cf259c..dc96ac7ea 100644 --- a/app/src/main/res/drawable/shape_numpad_background.xml +++ b/app/src/main/res/drawable/shape_numpad_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_orange_round.xml b/app/src/main/res/drawable/shape_orange_round.xml index 23a0d6ebc..ab3651d7e 100644 --- a/app/src/main/res/drawable/shape_orange_round.xml +++ b/app/src/main/res/drawable/shape_orange_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_primary_button_background.xml b/app/src/main/res/drawable/shape_primary_button_background.xml index d1be0cfad..e37a59731 100644 --- a/app/src/main/res/drawable/shape_primary_button_background.xml +++ b/app/src/main/res/drawable/shape_primary_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_primary_button_disabled_background.xml b/app/src/main/res/drawable/shape_primary_button_disabled_background.xml index 9979db9ef..41e28b7e1 100644 --- a/app/src/main/res/drawable/shape_primary_button_disabled_background.xml +++ b/app/src/main/res/drawable/shape_primary_button_disabled_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_primary_button_pressed_background.xml b/app/src/main/res/drawable/shape_primary_button_pressed_background.xml index 4d212f8c6..4361c48ed 100644 --- a/app/src/main/res/drawable/shape_primary_button_pressed_background.xml +++ b/app/src/main/res/drawable/shape_primary_button_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rectangle_gray_background.xml b/app/src/main/res/drawable/shape_rectangle_gray_background.xml index c7bbd34bb..62afaf704 100644 --- a/app/src/main/res/drawable/shape_rectangle_gray_background.xml +++ b/app/src/main/res/drawable/shape_rectangle_gray_background.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_red_outlined_button_background.xml b/app/src/main/res/drawable/shape_red_outlined_button_background.xml index 7a9c9f98a..87800ff28 100644 --- a/app/src/main/res/drawable/shape_red_outlined_button_background.xml +++ b/app/src/main/res/drawable/shape_red_outlined_button_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_in_call_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_button_background.xml index 912287c36..97def84bb 100644 --- a/app/src/main/res/drawable/shape_round_in_call_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml index f2c42f6c2..f64d098d4 100644 --- a/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_secondary_button_background.xml b/app/src/main/res/drawable/shape_secondary_button_background.xml index 6814dee61..cc345b5e5 100644 --- a/app/src/main/res/drawable/shape_secondary_button_background.xml +++ b/app/src/main/res/drawable/shape_secondary_button_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml b/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml index 9979db9ef..41e28b7e1 100644 --- a/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml +++ b/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml b/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml index d1be0cfad..e37a59731 100644 --- a/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml +++ b/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_2_background.xml b/app/src/main/res/drawable/shape_squircle_gray_2_background.xml index 31ec2d7dc..7c0a66fa0 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_2_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_2_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_3_background.xml b/app/src/main/res/drawable/shape_squircle_gray_3_background.xml index 163c0ed7a..ebd76d280 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_3_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_3_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_green_background.xml b/app/src/main/res/drawable/shape_squircle_green_background.xml index f4b346b75..0ebd4e210 100644 --- a/app/src/main/res/drawable/shape_squircle_green_background.xml +++ b/app/src/main/res/drawable/shape_squircle_green_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_green_pressed_background.xml b/app/src/main/res/drawable/shape_squircle_green_pressed_background.xml index e9370e89e..230c6572f 100644 --- a/app/src/main/res/drawable/shape_squircle_green_pressed_background.xml +++ b/app/src/main/res/drawable/shape_squircle_green_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_red_background.xml b/app/src/main/res/drawable/shape_squircle_red_background.xml index 126936545..1c0a467b1 100644 --- a/app/src/main/res/drawable/shape_squircle_red_background.xml +++ b/app/src/main/res/drawable/shape_squircle_red_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_red_disabled_background.xml b/app/src/main/res/drawable/shape_squircle_red_disabled_background.xml index 1ee158c3f..5e52c7360 100644 --- a/app/src/main/res/drawable/shape_squircle_red_disabled_background.xml +++ b/app/src/main/res/drawable/shape_squircle_red_disabled_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_red_pressed_background.xml b/app/src/main/res/drawable/shape_squircle_red_pressed_background.xml index 3ab6cb40b..271026c39 100644 --- a/app/src/main/res/drawable/shape_squircle_red_pressed_background.xml +++ b/app/src/main/res/drawable/shape_squircle_red_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_tertiary_button_background.xml b/app/src/main/res/drawable/shape_tertiary_button_background.xml index 4ed69d22c..a265a2d62 100644 --- a/app/src/main/res/drawable/shape_tertiary_button_background.xml +++ b/app/src/main/res/drawable/shape_tertiary_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml b/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml index 9979db9ef..a265a2d62 100644 --- a/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml +++ b/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml b/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml index c05beaba3..954e2a09e 100644 --- a/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml +++ b/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_toast_blue_background.xml b/app/src/main/res/drawable/shape_toast_blue_background.xml index bd2efcbb7..2315eaa25 100644 --- a/app/src/main/res/drawable/shape_toast_blue_background.xml +++ b/app/src/main/res/drawable/shape_toast_blue_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_toast_green_background.xml b/app/src/main/res/drawable/shape_toast_green_background.xml index a4f85efa0..7fa1a615d 100644 --- a/app/src/main/res/drawable/shape_toast_green_background.xml +++ b/app/src/main/res/drawable/shape_toast_green_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_toast_red_background.xml b/app/src/main/res/drawable/shape_toast_red_background.xml index 04951e349..9abfd8acf 100644 --- a/app/src/main/res/drawable/shape_toast_red_background.xml +++ b/app/src/main/res/drawable/shape_toast_red_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml index 267faf642..c1769c648 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:drawableTop="@drawable/address_book" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.contactsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:onClick="@{onContactsClicked}" android:text="@string/bottom_navigation_contacts_label" android:textStyle="@{viewModel.contactsSelected ? Typeface.BOLD : Typeface.NORMAL}" @@ -52,7 +52,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:drawableTop="@drawable/phone" - android:drawableTint="@{viewModel.callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.callsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:drawablePadding="10dp" android:text="@string/bottom_navigation_calls_label" android:textStyle="@{viewModel.callsSelected ? Typeface.BOLD : Typeface.NORMAL}" @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:drawableTop="@drawable/chat_text" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.conversationsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:onClick="@{onConversationsClicked}" android:text="@string/bottom_navigation_conversations_label" android:textStyle="@{viewModel.conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}" @@ -102,7 +102,7 @@ android:layout_height="wrap_content" android:drawableTop="@drawable/users_three" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.meetingsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:text="@string/bottom_navigation_meetings_label" android:textStyle="@{viewModel.meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout-land/calls_list_fragment.xml b/app/src/main/res/layout-land/calls_list_fragment.xml index 829c04785..cc36c204a 100644 --- a/app/src/main/res/layout-land/calls_list_fragment.xml +++ b/app/src/main/res/layout-land/calls_list_fragment.xml @@ -25,7 +25,7 @@ + android:background="@color/orange_main_500"> diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml index 44aa6a34f..3f6542cd9 100644 --- a/app/src/main/res/layout-land/contacts_list_fragment.xml +++ b/app/src/main/res/layout-land/contacts_list_fragment.xml @@ -19,7 +19,7 @@ + android:background="@color/orange_main_500"> @@ -167,7 +167,7 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/user_plus" - app:tint="@color/gray_8" + app:tint="@color/gray_main2_700" app:backgroundTint="@color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout-land/welcome_page_1.xml b/app/src/main/res/layout-land/welcome_page_1.xml index ebe500512..e6099470e 100644 --- a/app/src/main/res/layout-land/welcome_page_1.xml +++ b/app/src/main/res/layout-land/welcome_page_1.xml @@ -47,7 +47,7 @@ android:layout_marginTop="55dp" android:layout_marginStart="55dp" android:text="Title 1" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:textSize="20sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/title_second_line" @@ -61,7 +61,7 @@ android:layout_marginEnd="32dp" android:layout_marginTop="16dp" android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas commodo augue ut dictum. Fusce egestas tellus ut velit pulvinar commodo." - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:textSize="14sp" android:gravity="start" app:layout_constraintTop_toBottomOf="@id/page_title" diff --git a/app/src/main/res/layout-land/welcome_page_2.xml b/app/src/main/res/layout-land/welcome_page_2.xml index bd20d2c46..645082bce 100644 --- a/app/src/main/res/layout-land/welcome_page_2.xml +++ b/app/src/main/res/layout-land/welcome_page_2.xml @@ -47,7 +47,7 @@ android:layout_marginTop="55dp" android:layout_marginStart="55dp" android:text="Title 2" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:textSize="20sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/title_second_line" @@ -61,7 +61,7 @@ android:layout_marginEnd="32dp" android:layout_marginTop="16dp" android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas commodo augue ut dictum. Fusce egestas tellus ut velit pulvinar commodo." - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:textSize="14sp" android:gravity="start" app:layout_constraintTop_toBottomOf="@id/page_title" diff --git a/app/src/main/res/layout-land/welcome_page_3.xml b/app/src/main/res/layout-land/welcome_page_3.xml index 9f528113e..ff3298c16 100644 --- a/app/src/main/res/layout-land/welcome_page_3.xml +++ b/app/src/main/res/layout-land/welcome_page_3.xml @@ -47,7 +47,7 @@ android:layout_marginTop="55dp" android:layout_marginStart="55dp" android:text="Title 3" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:textSize="20sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/title_second_line" @@ -61,7 +61,7 @@ android:layout_marginEnd="32dp" android:layout_marginTop="16dp" android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas commodo augue ut dictum. Fusce egestas tellus ut velit pulvinar commodo." - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:textSize="14sp" android:gravity="start" app:layout_constraintTop_toBottomOf="@id/page_title" diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index 06ffd61c2..1066c09f5 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -35,8 +35,8 @@ android:background="@drawable/shape_circle_light_blue_background" accountAvatar="@{model}" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" @@ -64,7 +64,7 @@ android:layout_marginEnd="5dp" android:text="@{model.displayName, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" android:layout_marginStart="10dp" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/menu" @@ -85,7 +85,7 @@ android:background="@drawable/shape_squircle_gray_3_background" android:gravity="center" android:text="@{model.registrationState, default=@string/drawer_menu_account_connection_status_connected}" - android:textColor="@{model.isConnected ? @color/green_online : model.inError ? @color/red_danger : @color/gray_1, default=@color/green_online}" + android:textColor="@{model.isConnected ? @color/green_success_500 : model.inError ? @color/red_danger_500 : @color/gray_main2_500, default=@color/green_success_500}" android:textSize="12sp" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="@id/name" @@ -109,7 +109,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/account_popup_menu.xml b/app/src/main/res/layout/account_popup_menu.xml index 0f366a4c3..950a6d164 100644 --- a/app/src/main/res/layout/account_popup_menu.xml +++ b/app/src/main/res/layout/account_popup_menu.xml @@ -24,10 +24,10 @@ android:layout_margin="20dp" android:text="@string/drawer_menu_manage_account" android:textSize="14sp" - android:textColor="@color/gray_1" + android:textColor="@color/gray_main2_500" android:drawableStart="@drawable/user_gear" android:drawablePadding="5dp" - app:drawableTint="@color/gray_8" + app:drawableTint="@color/gray_main2_700" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/account_profile_device_list_cell.xml b/app/src/main/res/layout/account_profile_device_list_cell.xml index 1fef8bec3..54707827c 100644 --- a/app/src/main/res/layout/account_profile_device_list_cell.xml +++ b/app/src/main/res/layout/account_profile_device_list_cell.xml @@ -75,7 +75,7 @@ android:layout_marginStart="10dp" android:text="@{model.lastConnectionDate, default=`03/10/2023`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:drawableStart="@drawable/calendar_blank" android:drawablePadding="6dp" app:layout_constraintTop_toTopOf="@id/last_connection" @@ -91,7 +91,7 @@ android:layout_marginStart="10dp" android:text="@{model.lastConnectionTime, default=`9h25`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:drawableStart="@drawable/clock" android:drawablePadding="6dp" app:layout_constraintTop_toTopOf="@id/last_connection" diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 4f26666c7..24b73b1f4 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -36,7 +36,7 @@ android:adjustViewBounds="true" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -50,7 +50,7 @@ android:layout_marginEnd="10dp" android:gravity="center_vertical" android:text="@string/manage_account_title" - android:textColor="@color/primary_color" + android:textColor="@color/orange_main_500" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" @@ -60,7 +60,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_7" + android:background="@color/gray_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -86,8 +86,8 @@ android:background="@drawable/shape_circle_light_blue_background" accountAvatar="@{viewModel.accountModel}" app:avatarViewInitials="JD" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="21sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewPlaceholder="@drawable/user_circle" @@ -142,7 +142,7 @@ android:layout_marginTop="32dp" android:text="@string/manage_account_details_title" android:drawableEnd="@{viewModel.expandDetails ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/add_picture_label"/> @@ -212,7 +212,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.displayName, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:maxLines="1" android:background="@drawable/edit_text_background" android:inputType="text|textPersonName" @@ -345,7 +345,7 @@ android:layout_marginTop="32dp" android:text="@string/manage_account_devices_title" android:drawableEnd="@{viewModel.expandDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/mode_background"/> @@ -416,7 +416,7 @@ diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml index f1a408a09..e4db0bf7d 100644 --- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml +++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml @@ -33,7 +33,7 @@ android:adjustViewBounds="true" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -54,7 +54,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_7" + android:background="@color/gray_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -76,7 +76,7 @@ android:textColor="@color/black" android:checked="true" app:useMaterialThemeColors="false" - app:buttonTint="@color/primary_color" + app:buttonTint="@color/orange_main_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -122,8 +122,8 @@ android:background="@drawable/shape_circle_light_blue_background" android:src="@drawable/user_circle" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" @@ -165,14 +165,14 @@ android:background="@drawable/shape_circle_light_blue_background" android:src="@drawable/user_circle" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" app:avatarViewInitials="JD" app:avatarViewBorderWidth="2dp" - app:avatarViewBorderColor="@color/blue_trusted" + app:avatarViewBorderColor="@color/blue_info_500" app:layout_constraintStart_toEndOf="@id/arrow" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/image1" @@ -208,7 +208,7 @@ android:textSize="16sp" android:textColor="@color/black" app:useMaterialThemeColors="false" - app:buttonTint="@color/primary_color" + app:buttonTint="@color/orange_main_500" app:layout_constraintTop_toBottomOf="@id/image1" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml index ef9c35f45..b8b770cdc 100644 --- a/app/src/main/res/layout/assistant_country_picker_fragment.xml +++ b/app/src/main/res/layout/assistant_country_picker_fragment.xml @@ -71,7 +71,7 @@ android:layout_height="0dp" android:layout_weight="1" android:cacheColorHint="@color/transparent_color" - android:divider="@color/blue_light" + android:divider="@color/gray_main2_200" android:dividerHeight="1dp" /> @@ -94,7 +94,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.username, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:inputType="text" android:hint="@string/username" @@ -126,7 +126,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.password, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:hint="@string/password" app:layout_constraintWidth_max="@dimen/text_input_max_width" @@ -143,7 +143,7 @@ android:padding="4dp" android:layout_marginEnd="20dp" android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toEndOf="@id/password" app:layout_constraintTop_toTopOf="@id/password" app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -179,7 +179,7 @@ android:paddingEnd="20dp" android:text="@string/assistant_forgotten_password" android:textSize="13sp" - android:textColor="@color/gray_1" + android:textColor="@color/gray_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/login"/> @@ -194,7 +194,7 @@ android:paddingEnd="10dp" android:text="@string/or" android:textSize="14sp" - android:textColor="@color/gray_1" + android:textColor="@color/gray_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/forgotten_password"/> @@ -203,7 +203,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginStart="16dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/or" app:layout_constraintTop_toTopOf="@id/or" @@ -213,7 +213,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="16dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toEndOf="@id/or" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/or" @@ -265,7 +265,7 @@ android:paddingEnd="20dp" android:text="@string/assistant_no_account_yet" android:textSize="14sp" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/register" diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml index 9fd6e7de7..f496def4a 100644 --- a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml +++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml @@ -30,7 +30,7 @@ android:layout_marginTop="7dp" android:layout_marginStart="15dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -68,7 +68,7 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.confirmationMessage, default=@string/assistant_account_creation_sms_confirmation_explanation}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:gravity="center_horizontal" app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml index 01637e735..f2f266949 100644 --- a/app/src/main/res/layout/assistant_register_fragment.xml +++ b/app/src/main/res/layout/assistant_register_fragment.xml @@ -48,7 +48,7 @@ android:layout_marginTop="7dp" android:layout_marginStart="15dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -99,7 +99,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.username, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@{viewModel.usernameError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}" android:inputType="text" android:hint="@string/username" @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.usernameError, default=`Error`}" android:textSize="13sp" - android:textColor="@color/red_danger" + android:textColor="@color/red_danger_500" app:layout_constraintTop_toBottomOf="@id/username" app:layout_constraintStart_toStartOf="@id/username" app:layout_constraintEnd_toEndOf="@id/username"/> @@ -141,7 +141,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@{viewModel.phoneNumberError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}" android:inputType="phone" android:drawableStart="@drawable/separator" @@ -161,7 +161,7 @@ android:paddingStart="20dp" android:text="@{viewModel.internationalPrefix, default=`+33`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:gravity="center_vertical" android:drawableEnd="@drawable/caret_down" android:drawablePadding="10dp" @@ -178,7 +178,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.phoneNumberError, default=`Error`}" android:textSize="13sp" - android:textColor="@color/red_danger" + android:textColor="@color/red_danger_500" app:layout_constraintTop_toBottomOf="@id/prefix" app:layout_constraintStart_toStartOf="@id/prefix" app:layout_constraintEnd_toEndOf="@id/phone_number"/> @@ -204,7 +204,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.password, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:hint="@string/password" android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}" @@ -221,7 +221,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.passwordError, default=`Error`}" android:textSize="13sp" - android:textColor="@color/red_danger" + android:textColor="@color/red_danger_500" app:layout_constraintTop_toBottomOf="@id/password" app:layout_constraintStart_toStartOf="@id/password" app:layout_constraintEnd_toEndOf="@id/password"/> @@ -234,7 +234,7 @@ android:padding="4dp" android:layout_marginEnd="20dp" android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toEndOf="@id/password" app:layout_constraintTop_toTopOf="@id/password" app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -264,7 +264,7 @@ android:gravity="center" android:text="@string/assistant_create_account_using_email_on_our_web_platform" android:textSize="14sp" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" app:layout_constraintTop_toBottomOf="@id/create" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -298,7 +298,7 @@ android:paddingEnd="20dp" android:text="@string/assistant_already_have_an_account" android:textSize="14sp" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/login" diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml index 46bf5ee01..b6c770b83 100644 --- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml +++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml @@ -38,7 +38,7 @@ android:layout_marginTop="7dp" android:layout_marginStart="15dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -91,7 +91,7 @@ android:textColor="@color/black" android:checked="true" app:useMaterialThemeColors="false" - app:buttonTint="@color/primary_color" + app:buttonTint="@color/orange_main_500" app:layout_constraintTop_toBottomOf="@id/sub_title" app:layout_constraintStart_toStartOf="parent" /> @@ -137,8 +137,8 @@ android:background="@drawable/shape_circle_light_blue_background" android:src="@drawable/user_circle" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" @@ -180,14 +180,14 @@ android:background="@drawable/shape_circle_light_blue_background" android:src="@drawable/user_circle" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" app:avatarViewInitials="JD" app:avatarViewBorderWidth="2dp" - app:avatarViewBorderColor="@color/blue_trusted" + app:avatarViewBorderColor="@color/blue_info_500" app:layout_constraintStart_toEndOf="@id/arrow" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/image1" @@ -223,7 +223,7 @@ android:textSize="16sp" android:textColor="@color/black" app:useMaterialThemeColors="false" - app:buttonTint="@color/primary_color" + app:buttonTint="@color/orange_main_500" app:layout_constraintTop_toBottomOf="@id/image1" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml index f30bd9d84..0f7e0251c 100644 --- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml +++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml @@ -31,7 +31,7 @@ android:layout_marginTop="7dp" android:layout_marginStart="15dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -83,7 +83,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.username, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:inputType="text" android:hint="@string/username" @@ -115,7 +115,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.password, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:hint="@string/password" android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}" @@ -132,7 +132,7 @@ android:layout_marginEnd="20dp" android:padding="4dp" android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toEndOf="@id/password" app:layout_constraintTop_toTopOf="@id/password" app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -160,7 +160,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.domain, default=`sip.example.net`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:inputType="text|textUri" android:hint="@string/sip_address_domain" @@ -192,7 +192,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.displayName, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:background="@drawable/edit_text_background" android:inputType="text|textPersonName" android:hint="@string/sip_address_display_name" diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml index d32e61ab3..4bc6c9edc 100644 --- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml +++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml @@ -38,7 +38,7 @@ android:layout_marginTop="7dp" android:layout_marginStart="15dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_marginTop="100dp" android:text="@string/assistant_login_third_party_sip_account" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -63,7 +63,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/chat_text" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/no_video" @@ -77,7 +77,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/video_camera_slash" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintStart_toEndOf="@id/no_chat" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title"/> diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index aa4921464..360ed5785 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -39,7 +39,7 @@ android:paddingBottom="16dp" android:drawableTop="@drawable/address_book" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.contactsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:text="@string/bottom_navigation_contacts_label" android:textStyle="@{viewModel.contactsSelected ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintBottom_toBottomOf="parent" @@ -58,7 +58,7 @@ android:paddingBottom="16dp" android:drawableTop="@drawable/phone" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.callsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:text="@string/bottom_navigation_calls_label" android:textStyle="@{viewModel.callsSelected ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintBottom_toBottomOf="parent" @@ -96,7 +96,7 @@ android:paddingBottom="16dp" android:drawableTop="@drawable/chat_text" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.conversationsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:text="@string/bottom_navigation_conversations_label" android:textStyle="@{viewModel.conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintBottom_toBottomOf="parent" @@ -116,7 +116,7 @@ android:paddingBottom="16dp" android:drawableTop="@drawable/users_three" android:drawablePadding="10dp" - android:drawableTint="@{viewModel.meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" + android:drawableTint="@{viewModel.meetingsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}" android:text="@string/bottom_navigation_meetings_label" android:textStyle="@{viewModel.meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml index b270562df..6cc77967c 100644 --- a/app/src/main/res/layout/call_fragment.xml +++ b/app/src/main/res/layout/call_fragment.xml @@ -31,7 +31,7 @@ android:onClick="@{backClickListener}" android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title"/> @@ -55,7 +55,7 @@ android:layout_height="0dp" android:layout_marginEnd="10dp" android:src="@drawable/dots_three_vertical" - app:tint="@color/primary_color" + app:tint="@color/orange_main_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -64,7 +64,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_7" + android:background="@color/gray_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/menu" @@ -77,8 +77,8 @@ android:layout_marginTop="8dp" android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.callLogModel.avatarModel}" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="21sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewPlaceholder="@drawable/user_circle" @@ -107,7 +107,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{viewModel.callLogModel.avatarModel.name, default=`John Doe`}" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -119,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.callLogModel.displayedAddress, default=`+33601020304`}" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -132,7 +132,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.callLogModel.avatarModel.lastPresenceInfo, default=@string/friend_presence_status_online}" - android:textColor="@{viewModel.callLogModel.avatarModel.presenceStatus == ConsolidatedPresence.Online ? @color/green_online : @color/orange_away, default=@color/green_online}" + android:textColor="@{viewModel.callLogModel.avatarModel.presenceStatus == ConsolidatedPresence.Online ? @color/green_success_500 : @color/orange_away, default=@color/green_success_500}" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -147,7 +147,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/phone" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toStartOf="@id/chat" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -174,7 +174,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/chat_dots" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toStartOf="@id/video_call" app:layout_constraintStart_toEndOf="@id/call" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -201,7 +201,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/video_camera" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintStart_toEndOf="@id/chat" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> diff --git a/app/src/main/res/layout/call_history_list_cell.xml b/app/src/main/res/layout/call_history_list_cell.xml index e1af9e6f6..7aa8a5b14 100644 --- a/app/src/main/res/layout/call_history_list_cell.xml +++ b/app/src/main/res/layout/call_history_list_cell.xml @@ -35,7 +35,7 @@ android:layout_marginStart="8dp" android:text="@{model.isOutgoing() ? @string/call_outgoing : @string/call_incoming, default=@string/call_outgoing}" android:textSize="14sp" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" app:layout_constraintStart_toEndOf="@id/call_status" app:layout_constraintTop_toTopOf="@id/call_status" app:layout_constraintBottom_toBottomOf="@id/call_status"/> @@ -50,7 +50,7 @@ android:gravity="center" android:text="@{model.dateTime, default=`August 13th 2023 | 07:47 PM`}" android:textSize="12sp" - android:textColor="@{model.isSuccessful ? @color/gray_9 : @color/red_danger, default=@color/gray_9}" + android:textColor="@{model.isSuccessful ? @color/gray_main2_600 : @color/red_danger_500, default=@color/gray_main2_600}" app:layout_constraintStart_toStartOf="@id/direction_label" app:layout_constraintTop_toBottomOf="@id/direction_label" app:layout_constraintBottom_toTopOf="@id/separator"/> @@ -74,7 +74,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginBottom="11dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml index 5a7c1cd8e..21f422479 100644 --- a/app/src/main/res/layout/call_list_cell.xml +++ b/app/src/main/res/layout/call_list_cell.xml @@ -39,8 +39,8 @@ android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{model.avatarModel}" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" @@ -70,7 +70,7 @@ android:layout_marginStart="10dp" android:text="@{model.avatarModel.name, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/date_time"/> @@ -106,7 +106,7 @@ android:layout_height="@dimen/icon_size" android:layout_marginEnd="6dp" android:src="@drawable/phone" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name" app:layout_constraintBottom_toBottomOf="@id/date_time" /> @@ -116,7 +116,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/call_popup_menu.xml b/app/src/main/res/layout/call_popup_menu.xml index 8d08cbe06..f189e0ae2 100644 --- a/app/src/main/res/layout/call_popup_menu.xml +++ b/app/src/main/res/layout/call_popup_menu.xml @@ -41,10 +41,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_add_address_to_contacts" android:textSize="14sp" - android:textColor="@color/gray_1" + android:textColor="@color/gray_main2_500" android:drawableStart="@drawable/plus_circle" android:drawablePadding="5dp" - app:drawableTint="@color/gray_8" + app:drawableTint="@color/gray_main2_700" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -64,10 +64,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_see_existing_contact" android:textSize="14sp" - android:textColor="@color/gray_1" + android:textColor="@color/gray_main2_500" android:drawableStart="@drawable/user_circle" android:drawablePadding="5dp" - app:drawableTint="@color/gray_8" + app:drawableTint="@color/gray_main2_700" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/add_to_contact" @@ -85,10 +85,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_copy_sip_address" android:textSize="14sp" - android:textColor="@color/gray_1" + android:textColor="@color/gray_main2_500" android:drawableStart="@drawable/copy" android:drawablePadding="5dp" - app:drawableTint="@color/gray_8" + app:drawableTint="@color/gray_main2_700" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/go_to_contact" @@ -107,10 +107,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_delete_history" android:textSize="14sp" - android:textColor="@color/red_danger" + android:textColor="@color/red_danger_500" android:drawableStart="@drawable/trash_simple" android:drawablePadding="5dp" - app:drawableTint="@color/red_danger" + app:drawableTint="@color/red_danger_500" app:layout_constraintWidth_min="170dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_start_fragment.xml b/app/src/main/res/layout/call_start_fragment.xml index 242441f3b..c34b939c8 100644 --- a/app/src/main/res/layout/call_start_fragment.xml +++ b/app/src/main/res/layout/call_start_fragment.xml @@ -37,7 +37,7 @@ android:onClick="@{backClickListener}" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -74,7 +74,7 @@ android:background="@drawable/edit_text_background" android:drawableStart="@drawable/magnifying_glass" android:drawablePadding="10dp" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" android:hint="@string/call_start_search_bar_filter_hint" android:inputType="textPersonName|textNoSuggestions" android:paddingStart="15dp" @@ -100,7 +100,7 @@ app:layout_constraintBottom_toBottomOf="@id/search_bar" app:layout_constraintEnd_toEndOf="@id/search_bar" app:layout_constraintTop_toTopOf="@id/search_bar" - app:tint="@color/gray_9" /> + app:tint="@color/gray_main2_600" /> + app:tint="@color/gray_main2_600" /> diff --git a/app/src/main/res/layout/call_suggestion_list_cell.xml b/app/src/main/res/layout/call_suggestion_list_cell.xml index c82286f77..d6cc158e6 100644 --- a/app/src/main/res/layout/call_suggestion_list_cell.xml +++ b/app/src/main/res/layout/call_suggestion_list_cell.xml @@ -31,8 +31,8 @@ android:background="@drawable/shape_circle_light_blue_background" avatarInitials="@{model.initials, default=`JD`}" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" @@ -57,7 +57,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml index 3096520d6..e0355e13c 100644 --- a/app/src/main/res/layout/calls_list_fragment.xml +++ b/app/src/main/res/layout/calls_list_fragment.xml @@ -25,7 +25,7 @@ + android:background="@color/orange_main_500"> diff --git a/app/src/main/res/layout/calls_list_long_press_menu.xml b/app/src/main/res/layout/calls_list_long_press_menu.xml index 79d17c4e2..3be5c8f2a 100644 --- a/app/src/main/res/layout/calls_list_long_press_menu.xml +++ b/app/src/main/res/layout/calls_list_long_press_menu.xml @@ -24,7 +24,7 @@ + android:background="@color/gray_main2_200"> @@ -68,7 +68,7 @@ android:id="@+id/scrollView" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_7" + android:background="@color/gray_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/invisible_title" @@ -104,8 +104,8 @@ android:adjustViewBounds="true" android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.contact}" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="21sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewPlaceholder="@drawable/user_circle" @@ -134,7 +134,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{viewModel.contact.name, default=`John Doe`}" - android:textColor="@color/gray_8" + android:textColor="@color/gray_main2_700" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -147,7 +147,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.contact.lastPresenceInfo, default=@string/friend_presence_status_online}" - android:textColor="@{viewModel.contact.presenceStatus == ConsolidatedPresence.Online ? @color/green_online : @color/orange_away, default=@color/green_online}" + android:textColor="@{viewModel.contact.presenceStatus == ConsolidatedPresence.Online ? @color/green_success_500 : @color/orange_away, default=@color/green_success_500}" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -162,7 +162,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/phone" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toStartOf="@id/chat" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -188,7 +188,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/chat_dots" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintEnd_toStartOf="@id/video_call" app:layout_constraintStart_toEndOf="@id/call" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -215,7 +215,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/video_camera" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintStart_toEndOf="@id/chat" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -245,7 +245,7 @@ android:layout_marginTop="32dp" android:text="@string/contact_details_numbers_and_addresses_title" android:drawableEnd="@{viewModel.expandNumbersAndAddresses ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/call_label"/> @@ -348,7 +348,7 @@ android:padding="5dp" android:text="@string/contact_details_trust_title" android:drawableEnd="@drawable/question" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" android:drawablePadding="8dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/info_background"/> @@ -363,7 +363,7 @@ android:layout_marginTop="16dp" android:padding="5dp" android:drawableEnd="@{viewModel.expandDevicesTrust ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toEndOf="@id/trust_label" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/info_background"/> @@ -403,8 +403,8 @@ android:layout_marginEnd="17dp" app:trackCornerRadius="50dp" app:trackThickness="22dp" - app:trackColor="@color/gray_3" - app:indicatorColor="@color/blue_trusted" + app:trackColor="@color/gray_main2_100" + app:indicatorColor="@color/blue_info_500" android:max="100" android:progress="75" app:layout_constraintStart_toStartOf="@id/trust_background" @@ -484,7 +484,7 @@ @@ -500,7 +500,7 @@ android:background="@drawable/action_background" android:text="@{viewModel.isFavourite ? @string/contact_details_remove_from_favourites : @string/contact_details_add_to_favourites, default=@string/contact_details_add_to_favourites}" android:drawableStart="@{viewModel.isFavourite ? @drawable/heart_fill : @drawable/heart, default=@drawable/heart_fill}" - android:drawableTint="@{viewModel.isFavourite ? @color/red_danger : @color/gray_1, default=@color/gray_1}" + android:drawableTint="@{viewModel.isFavourite ? @color/red_danger_500 : @color/gray_main2_500, default=@color/gray_main2_500}" app:layout_constraintTop_toBottomOf="@id/action_edit" app:layout_constraintStart_toStartOf="@id/actions_background" app:layout_constraintEnd_toEndOf="@id/actions_background"/> @@ -508,7 +508,7 @@ @@ -531,7 +531,7 @@ diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml index 1dc9098d5..d652298be 100644 --- a/app/src/main/res/layout/contact_list_cell.xml +++ b/app/src/main/res/layout/contact_list_cell.xml @@ -45,7 +45,7 @@ android:layout_marginStart="12dp" android:text="@{model.firstLetter, default=`A`}" android:visibility="@{model.firstContactStartingByThatLetter ? View.VISIBLE : View.INVISIBLE}" - android:textColor="@color/gray_10" + android:textColor="@color/gray_main2_400" android:textSize="20sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -62,8 +62,8 @@ android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{model}" app:avatarViewPlaceholder="@drawable/user_circle" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewShape="circle" @@ -100,7 +100,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/contact_new_or_edit_cell.xml b/app/src/main/res/layout/contact_new_or_edit_cell.xml index 081eb97b0..0bd2e9642 100644 --- a/app/src/main/res/layout/contact_new_or_edit_cell.xml +++ b/app/src/main/res/layout/contact_new_or_edit_cell.xml @@ -37,7 +37,7 @@ android:paddingEnd="20dp" android:text="@={model.value}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:hint="@{model.isSip ? @string/sip_address : @string/phone_number, default=@string/sip_address}" android:background="@drawable/edit_text_background" android:maxLines="1" @@ -55,7 +55,7 @@ android:layout_height="@dimen/icon_size" android:layout_marginStart="10dp" android:src="@drawable/x" - app:tint="@color/gray_8" + app:tint="@color/gray_main2_700" app:layout_constraintStart_toEndOf="@id/field" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/field" diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml index eb2048fd5..e270b1740 100644 --- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml @@ -30,7 +30,7 @@ android:adjustViewBounds="true" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -65,7 +65,7 @@ android:id="@+id/scrollView" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_7" + android:background="@color/gray_100" android:fillViewport="true" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -134,7 +134,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.firstName, default=`John`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:hint="@string/contact_editor_first_name" android:maxLines="1" android:background="@drawable/edit_text_background" @@ -167,7 +167,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.lastName, default=`Doe`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:hint="@string/contact_editor_last_name" android:maxLines="1" android:background="@drawable/edit_text_background" @@ -226,7 +226,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.company, default=`Belledonne Comm`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:hint="@string/contact_editor_company" android:maxLines="1" android:background="@drawable/edit_text_background" @@ -260,7 +260,7 @@ android:layout_marginBottom="@dimen/screen_bottom_margin" android:text="@={viewModel.jobTitle, default=`Android dev`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:hint="@string/contact_editor_first_name" android:maxLines="1" android:background="@drawable/edit_text_background" diff --git a/app/src/main/res/layout/contact_number_address_list_cell.xml b/app/src/main/res/layout/contact_number_address_list_cell.xml index d38a10750..585d8951b 100644 --- a/app/src/main/res/layout/contact_number_address_list_cell.xml +++ b/app/src/main/res/layout/contact_number_address_list_cell.xml @@ -52,7 +52,7 @@ android:layout_marginEnd="10dp" android:src="@drawable/phone" android:visibility="@{model.enabled ? View.VISIBLE : View.GONE}" - app:tint="@color/gray_9" + app:tint="@color/gray_main2_600" app:layout_constraintTop_toTopOf="@id/header" app:layout_constraintBottom_toBottomOf="@id/number_or_address" app:layout_constraintEnd_toEndOf="parent" /> @@ -62,7 +62,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/number_or_address" diff --git a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml index 71c1c86c1..5eea70ffe 100644 --- a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml +++ b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml @@ -21,7 +21,7 @@ + android:background="@color/gray_main2_200"> + android:background="@color/orange_main_500"> @@ -169,7 +169,7 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/user_plus" - app:tint="@color/gray_8" + app:tint="@color/gray_main2_700" app:backgroundTint="@color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" /> diff --git a/app/src/main/res/layout/contacts_list_long_press_menu.xml b/app/src/main/res/layout/contacts_list_long_press_menu.xml index 16951ede1..e7808e841 100644 --- a/app/src/main/res/layout/contacts_list_long_press_menu.xml +++ b/app/src/main/res/layout/contacts_list_long_press_menu.xml @@ -24,7 +24,7 @@ + android:background="@color/gray_main2_200"> diff --git a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml index 718b1e3da..ac5c5a9e1 100644 --- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml @@ -159,7 +159,7 @@ android:background="@drawable/shape_red_outlined_button_background" android:text="@string/dialog_zrtp_validate_trust_letters_do_not_match" android:textSize="18sp" - android:textColor="@color/red_danger" + android:textColor="@color/red_danger_500" app:layout_constraintStart_toStartOf="@id/dialog_background" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintTop_toBottomOf="@id/skip" diff --git a/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml b/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml index 6c3b5dbe4..c1f71db64 100644 --- a/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml +++ b/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml @@ -99,7 +99,7 @@ android:text="@string/dialog_do_not_show_anymore" android:textSize="14sp" android:checked="@={viewModel.doNotShowAnymore}" - app:buttonTint="@color/primary_color" + app:buttonTint="@color/orange_main_500" app:layout_constraintStart_toStartOf="@id/dialog_background" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintTop_toBottomOf="@id/confirm" diff --git a/app/src/main/res/layout/dialog_number_address_list_cell.xml b/app/src/main/res/layout/dialog_number_address_list_cell.xml index 589b536e2..1db2b42a7 100644 --- a/app/src/main/res/layout/dialog_number_address_list_cell.xml +++ b/app/src/main/res/layout/dialog_number_address_list_cell.xml @@ -49,7 +49,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/number_or_address" diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index 5ebf31eff..88d300f66 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -49,7 +49,7 @@ android:gravity="center_vertical" android:drawableEnd="@drawable/x" android:drawablePadding="15dp" - app:drawableTint="@color/gray_9" + app:drawableTint="@color/gray_main2_600" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/brand_icon" app:layout_constraintEnd_toEndOf="parent" /> @@ -128,7 +128,7 @@ android:layout_marginBottom="30dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="@color/blue_light" + android:background="@color/gray_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/settings" /> @@ -146,7 +146,7 @@ android:drawableStart="@drawable/gear" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - app:drawableTint="@color/gray_1" + app:drawableTint="@color/gray_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/recordings" /> @@ -164,7 +164,7 @@ android:drawableStart="@drawable/recordings" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - app:drawableTint="@color/gray_1" + app:drawableTint="@color/gray_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/help" /> @@ -182,7 +182,7 @@ android:drawableStart="@drawable/question" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - app:drawableTint="@color/gray_1" + app:drawableTint="@color/gray_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/drop_down_item.xml b/app/src/main/res/layout/drop_down_item.xml index c887dd6cd..2e946dc1b 100644 --- a/app/src/main/res/layout/drop_down_item.xml +++ b/app/src/main/res/layout/drop_down_item.xml @@ -7,7 +7,7 @@ android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" android:gravity="center_vertical" android:singleLine="true" android:ellipsize="marquee"/> \ No newline at end of file diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml index 4ac549b23..eb9621e1d 100644 --- a/app/src/main/res/layout/help_debug_fragment.xml +++ b/app/src/main/res/layout/help_debug_fragment.xml @@ -27,7 +27,7 @@ android:adjustViewBounds="true" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -66,7 +66,7 @@ android:layout_marginEnd="16dp" android:text="@string/help_advanced_debug_subtitle" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" app:layout_constraintTop_toBottomOf="@id/debug_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/debug_mode_switch" /> diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml index b96a2209e..ed994d51c 100644 --- a/app/src/main/res/layout/help_fragment.xml +++ b/app/src/main/res/layout/help_fragment.xml @@ -44,7 +44,7 @@ android:adjustViewBounds="true" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -81,7 +81,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/file_text" - app:tint="@color/primary_color" + app:tint="@color/orange_main_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/privacy_policy_title" app:layout_constraintTop_toTopOf="@id/privacy_policy_title" @@ -111,7 +111,7 @@ android:layout_marginEnd="16dp" android:text="@string/help_about_privacy_policy_subtitle" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" app:layout_constraintTop_toBottomOf="@id/privacy_policy_title" app:layout_constraintStart_toEndOf="@id/privacy_policy_icon" app:layout_constraintEnd_toEndOf="parent" /> @@ -122,7 +122,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/info" - app:tint="@color/primary_color" + app:tint="@color/orange_main_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/version_title" app:layout_constraintTop_toTopOf="@id/version_title" @@ -150,7 +150,7 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.version, default=`6.0.0`}" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" app:layout_constraintTop_toBottomOf="@id/version_title" app:layout_constraintStart_toEndOf="@id/version_icon" app:layout_constraintEnd_toStartOf="@id/check_for_update" /> @@ -183,7 +183,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/file_text" - app:tint="@color/primary_color" + app:tint="@color/orange_main_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/open_source_licenses_title" app:layout_constraintTop_toTopOf="@id/open_source_licenses_title" @@ -213,7 +213,7 @@ android:layout_marginEnd="16dp" android:text="@string/help_about_open_source_licenses_subtitle" android:textSize="14sp" - android:textColor="@color/gray_9" + android:textColor="@color/gray_main2_600" app:layout_constraintTop_toBottomOf="@id/open_source_licenses_title" app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon" app:layout_constraintEnd_toEndOf="parent" /> @@ -225,7 +225,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/globe_hemisphere_west" - app:tint="@color/primary_color" + app:tint="@color/orange_main_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/translate_title" app:layout_constraintTop_toTopOf="@id/translate_title" @@ -264,7 +264,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/wrench" - app:tint="@color/primary_color" + app:tint="@color/orange_main_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/debug_title" app:layout_constraintTop_toTopOf="@id/debug_title" diff --git a/app/src/main/res/layout/main_activity_in_call_top_bar.xml b/app/src/main/res/layout/main_activity_in_call_top_bar.xml index ee7ee6ef0..b48984e79 100644 --- a/app/src/main/res/layout/main_activity_in_call_top_bar.xml +++ b/app/src/main/res/layout/main_activity_in_call_top_bar.xml @@ -13,7 +13,7 @@ + android:background="@color/orange_main_500"> diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml index bb38dbaff..81d598936 100644 --- a/app/src/main/res/layout/settings_fragment.xml +++ b/app/src/main/res/layout/settings_fragment.xml @@ -26,7 +26,7 @@ android:adjustViewBounds="true" android:padding="5dp" android:src="@drawable/caret_left" - app:tint="@color/gray_1" + app:tint="@color/gray_main2_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_7" + android:background="@color/gray_100" app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +69,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_calls_title" android:drawableEnd="@{viewModel.expandCalls ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -394,7 +394,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_network_title" android:drawableEnd="@{viewModel.expandNetwork ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/calls_background"/> @@ -464,7 +464,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_user_interface_title" android:drawableEnd="@{viewModel.expandUserInterface ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/network_background"/> @@ -504,7 +504,7 @@ android:layout_marginBottom="@dimen/screen_bottom_margin" android:text="@string/settings_advanced_title" android:drawableEnd="@drawable/caret_right" - android:drawableTint="@color/gray_9" + android:drawableTint="@color/gray_main2_600" app:layout_constraintVertical_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml index 4094246f5..bbc03b833 100644 --- a/app/src/main/res/layout/toast.xml +++ b/app/src/main/res/layout/toast.xml @@ -43,7 +43,7 @@ android:layout_height="@dimen/icon_size" android:adjustViewBounds="true" android:src="@{icon, default=@drawable/check_fat_fill}" - tint="@{text_color, default=@color/blue_trusted}" + tint="@{text_color, default=@color/blue_info_500}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/toast_message" app:layout_constraintStart_toStartOf="parent" @@ -60,7 +60,7 @@ android:paddingBottom="8dp" android:text="@{message, default=@string/assistant_account_register_push_notification_not_received_error}" android:textSize="14sp" - textColor="@{text_color, default=@color/blue_trusted}" + textColor="@{text_color, default=@color/blue_info_500}" app:layout_constraintWidth_max="@dimen/toast_text_max_width" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/voip_active_call_fragment.xml b/app/src/main/res/layout/voip_active_call_fragment.xml index b24c0d976..c48628178 100644 --- a/app/src/main/res/layout/voip_active_call_fragment.xml +++ b/app/src/main/res/layout/voip_active_call_fragment.xml @@ -63,14 +63,14 @@ android:layout_marginTop="5dp" android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.contact}" - app:avatarViewInitialsBackgroundColor="@color/blue_light" - app:avatarViewInitialsTextColor="@color/gray_9" + app:avatarViewInitialsBackgroundColor="@color/gray_main2_200" + app:avatarViewInitialsTextColor="@color/gray_main2_600" app:avatarViewInitialsTextSize="36sp" app:avatarViewInitialsTextStyle="bold" app:avatarViewPlaceholder="@drawable/user_circle" app:avatarViewShape="circle" app:avatarViewBorderWidth="0dp" - app:avatarViewBorderColor="@color/blue_trusted" + app:avatarViewBorderColor="@color/blue_info_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintWidth_max="@dimen/avatar_in_call_size" app:layout_constraintHeight_max="@dimen/avatar_in_call_size" diff --git a/app/src/main/res/layout/voip_audio_device_list_cell.xml b/app/src/main/res/layout/voip_audio_device_list_cell.xml index 4e1cefbbf..8cfd98ffa 100644 --- a/app/src/main/res/layout/voip_audio_device_list_cell.xml +++ b/app/src/main/res/layout/voip_audio_device_list_cell.xml @@ -13,7 +13,7 @@ android:onClick="@{() -> model.onClicked()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/separator"> + android:background="@color/gray_main2_200"> - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml index 4fe59c4e6..d59b3c9bc 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 3ef35995a..02344ec9d 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -2,9 +2,9 @@ @@ -42,22 +42,22 @@