diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 1c33fff42..a92c80000 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -816,10 +816,10 @@ class NotificationsManager @MainThread constructor(private val context: Context) try { style.setIsVideo(isVideo) style.setAnswerButtonColorHint( - context.resources.getColor(R.color.green_success_500, context.theme) + context.getColor(R.color.success_500) ) style.setDeclineButtonColorHint( - context.resources.getColor(R.color.red_danger_500, context.theme) + context.getColor(R.color.danger_500) ) setStyle(style) } catch (iae: IllegalArgumentException) { @@ -834,7 +834,6 @@ class NotificationsManager @MainThread constructor(private val context: Context) setAutoCancel(false) setShowWhen(true) setOngoing(true) - color = AppUtils.getColor(R.color.orange_main_500) setFullScreenIntent(pendingIntent, true) } @@ -1088,7 +1087,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.orange_main_500) + channel.lightColor = context.getColor(R.color.main1_500) channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC channel.enableVibration(true) channel.enableLights(true) @@ -1103,7 +1102,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.orange_main_500) + channel.lightColor = context.getColor(R.color.main1_500) channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC channel.enableVibration(true) channel.enableLights(true) @@ -1132,7 +1131,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.orange_main_500) + channel.lightColor = context.getColor(R.color.main1_500) channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC channel.enableLights(true) channel.enableVibration(true) diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt index 3584cb45b..9ee8484e3 100644 --- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt @@ -260,9 +260,9 @@ class CallActivity : GenericActivity() { callsViewModel.changeSystemTopBarColorToMultipleCallsEvent.observe(this) { it.consume { useInCallColor -> val color = if (useInCallColor) { - AppUtils.getColor(R.color.green_success_500) + getColor(R.color.success_500) } else { - AppUtils.getColor(R.color.orange_main_500) + getColor(R.color.main1_500) } window.statusBarColor = color } diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt index c2ea037f7..150dafe54 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt @@ -55,7 +55,6 @@ import org.linphone.ui.main.help.fragment.DebugFragmentDirections import org.linphone.ui.main.viewmodel.MainViewModel import org.linphone.ui.main.viewmodel.SharedMainViewModel import org.linphone.ui.welcome.WelcomeActivity -import org.linphone.utils.AppUtils import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils import org.linphone.utils.ToastUtils @@ -105,15 +104,15 @@ class MainActivity : GenericActivity() { it.consume { mode -> window.statusBarColor = when (mode) { MainViewModel.SINGLE_CALL, MainViewModel.MULTIPLE_CALLS -> { - AppUtils.getColor(R.color.green_success_500) + getColor(R.color.success_500) } MainViewModel.NETWORK_NOT_REACHABLE, MainViewModel.NON_DEFAULT_ACCOUNT_NOT_CONNECTED -> { - AppUtils.getColor(R.color.red_danger_500) + getColor(R.color.danger_500) } MainViewModel.NON_DEFAULT_ACCOUNT_NOTIFICATIONS -> { - AppUtils.getColor(R.color.gray_main2_500) + getColor(R.color.main2_500) } - else -> AppUtils.getColor(R.color.orange_main_500) + else -> getColor(R.color.main1_500) } } } diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt index 66c780ac0..21108ce37 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt @@ -73,7 +73,6 @@ import org.linphone.ui.main.chat.viewmodel.ConversationViewModel import org.linphone.ui.main.chat.viewmodel.ConversationViewModel.Companion.SCROLLING_POSITION_NOT_SET import org.linphone.ui.main.chat.viewmodel.SendMessageInConversationViewModel import org.linphone.ui.main.fragment.GenericFragment -import org.linphone.utils.AppUtils import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils @@ -636,7 +635,7 @@ class ConversationFragment : GenericFragment() { WindowManager.LayoutParams.MATCH_PARENT ) val d: Drawable = ColorDrawable( - AppUtils.getColor(R.color.gray_300) + requireContext().getColor(R.color.grey_300) ) d.alpha = 102 dialog.window?.setBackgroundDrawable(d) diff --git a/app/src/main/java/org/linphone/utils/AndroidUtils.kt b/app/src/main/java/org/linphone/utils/AndroidUtils.kt index a540b21ea..d40938cbe 100644 --- a/app/src/main/java/org/linphone/utils/AndroidUtils.kt +++ b/app/src/main/java/org/linphone/utils/AndroidUtils.kt @@ -27,14 +27,11 @@ import android.util.DisplayMetrics import android.util.Rational import android.view.View import androidx.annotation.AnyThread -import androidx.annotation.ColorInt -import androidx.annotation.ColorRes import androidx.annotation.DimenRes import androidx.annotation.MainThread import androidx.annotation.PluralsRes import androidx.annotation.StringRes import androidx.annotation.UiThread -import androidx.core.content.ContextCompat import androidx.core.view.SoftwareKeyboardControllerCompat import androidx.emoji2.text.EmojiCompat import java.util.Locale @@ -83,14 +80,6 @@ class AppUtils { return coreContext.context.resources.getQuantityString(id, count, value) } - @AnyThread @ColorInt - fun getColor(@ColorRes colorId: Int): Int { - return ContextCompat.getColor( - coreContext.context, - colorId - ) - } - @MainThread fun getPipRatio( activity: Activity, diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 5feb3a087..caea2b615 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -206,13 +206,13 @@ fun ImageView.setPresenceIcon(presence: ConsolidatedPresence?) { @BindingAdapter("tint", "disableTint") fun ImageView.setTintColor(@ColorRes color: Int, disable: Boolean) { if (!disable) { - setColorFilter(AppUtils.getColor(color), PorterDuff.Mode.SRC_IN) + setColorFilter(context.getColor(color), PorterDuff.Mode.SRC_IN) } } @BindingAdapter("textColor") fun AppCompatTextView.setColor(@ColorRes color: Int) { - setTextColor(AppUtils.getColor(color)) + setTextColor(context.getColor(color)) } @UiThread @@ -371,12 +371,12 @@ private fun loadContactPictureWithCoil( if (model.showTrust.value == true) { when (model.trust.value) { ChatRoom.SecurityLevel.Safe -> { - imageView.setStrokeColorResource(R.color.blue_info_500) + imageView.setStrokeColorResource(R.color.info_500) imageView.setStrokeWidthResource(R.dimen.avatar_trust_border_width) } ChatRoom.SecurityLevel.Unsafe -> { - imageView.setStrokeColorResource(R.color.red_danger_500) + imageView.setStrokeColorResource(R.color.danger_500) imageView.setStrokeWidthResource(R.dimen.avatar_trust_border_width) } diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt index bdc9782bb..616274726 100644 --- a/app/src/main/java/org/linphone/utils/DialogUtils.kt +++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt @@ -329,7 +329,7 @@ class DialogUtils { WindowManager.LayoutParams.MATCH_PARENT ) val d: Drawable = ColorDrawable( - AppUtils.getColor(R.color.black) + context.getColor(R.color.black) ) d.alpha = 153 // 60% dialog.window?.setBackgroundDrawable(d) diff --git a/app/src/main/java/org/linphone/utils/ToastUtils.kt b/app/src/main/java/org/linphone/utils/ToastUtils.kt index 5541750a5..ceb705044 100644 --- a/app/src/main/java/org/linphone/utils/ToastUtils.kt +++ b/app/src/main/java/org/linphone/utils/ToastUtils.kt @@ -97,7 +97,7 @@ class ToastUtils { redToast.message = message redToast.icon = icon redToast.shadowColor = R.drawable.shape_toast_red_background - redToast.textColor = R.color.red_danger_500 + redToast.textColor = R.color.danger_500 redToast.root.visibility = View.GONE return redToast } @@ -120,7 +120,7 @@ class ToastUtils { greenToast.message = message greenToast.icon = icon greenToast.shadowColor = R.drawable.shape_toast_green_background - greenToast.textColor = R.color.green_success_500 + greenToast.textColor = R.color.success_500 greenToast.root.visibility = View.GONE return greenToast } @@ -143,7 +143,7 @@ class ToastUtils { blueToast.message = message blueToast.icon = icon blueToast.shadowColor = R.drawable.shape_toast_blue_background - blueToast.textColor = R.color.blue_info_500 + blueToast.textColor = R.color.info_500 blueToast.root.visibility = View.GONE return blueToast } 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 21cc7405c..02d431961 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/danger_500.xml b/app/src/main/res/color/danger_500.xml new file mode 100644 index 000000000..bb7792121 --- /dev/null +++ b/app/src/main/res/color/danger_500.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/grey_300.xml b/app/src/main/res/color/grey_300.xml new file mode 100644 index 000000000..4ee296cd9 --- /dev/null +++ b/app/src/main/res/color/grey_300.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/icon_color_selector.xml b/app/src/main/res/color/icon_color_selector.xml index 52a1d4d2d..978dca6bf 100644 --- a/app/src/main/res/color/icon_color_selector.xml +++ b/app/src/main/res/color/icon_color_selector.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/color/icon_primary_color_selector.xml b/app/src/main/res/color/icon_primary_color_selector.xml index 2f6a070af..f05cdbb0e 100644 --- a/app/src/main/res/color/icon_primary_color_selector.xml +++ b/app/src/main/res/color/icon_primary_color_selector.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/color/in_call_button_tint_color.xml b/app/src/main/res/color/in_call_button_tint_color.xml index 1eda9d9d7..7ba9fea56 100644 --- a/app/src/main/res/color/in_call_button_tint_color.xml +++ b/app/src/main/res/color/in_call_button_tint_color.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/color/info_500.xml b/app/src/main/res/color/info_500.xml new file mode 100644 index 000000000..d531e21ab --- /dev/null +++ b/app/src/main/res/color/info_500.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/main1_500.xml b/app/src/main/res/color/main1_500.xml new file mode 100644 index 000000000..ea11776be --- /dev/null +++ b/app/src/main/res/color/main1_500.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/main2_000.xml b/app/src/main/res/color/main2_000.xml new file mode 100644 index 000000000..b7ada56e2 --- /dev/null +++ b/app/src/main/res/color/main2_000.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/main2_100.xml b/app/src/main/res/color/main2_100.xml new file mode 100644 index 000000000..4cbff3fd8 --- /dev/null +++ b/app/src/main/res/color/main2_100.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/main2_500.xml b/app/src/main/res/color/main2_500.xml new file mode 100644 index 000000000..a2d2d9f03 --- /dev/null +++ b/app/src/main/res/color/main2_500.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/main2_600.xml b/app/src/main/res/color/main2_600.xml new file mode 100644 index 000000000..32b244483 --- /dev/null +++ b/app/src/main/res/color/main2_600.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/primary_button_label_color.xml b/app/src/main/res/color/primary_button_label_color.xml index 04316885a..76d77769a 100644 --- a/app/src/main/res/color/primary_button_label_color.xml +++ b/app/src/main/res/color/primary_button_label_color.xml @@ -1,9 +1,9 @@ + android:color="?attr/color_main2_000" /> + android:color="?attr/color_main2_000" /> + android:color="?attr/color_main2_000"/> diff --git a/app/src/main/res/color/primary_color_selector.xml b/app/src/main/res/color/primary_color_selector.xml index 313b37b15..ef163e8da 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 b1a6e427d..4788ca05b 100644 --- a/app/src/main/res/color/secondary_button_label_color.xml +++ b/app/src/main/res/color/secondary_button_label_color.xml @@ -1,9 +1,9 @@ + android:color="?attr/color_main1_500" /> + android:color="?attr/color_main2_000" /> + android:color="?attr/color_main1_500"/> diff --git a/app/src/main/res/color/success_500.xml b/app/src/main/res/color/success_500.xml new file mode 100644 index 000000000..9fc4599be --- /dev/null +++ b/app/src/main/res/color/success_500.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/color/switch_track_color.xml b/app/src/main/res/color/switch_track_color.xml index 6fb2090bb..2d08a4407 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 1918dc88c..9511595ca 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/color/warning_600.xml b/app/src/main/res/color/warning_600.xml new file mode 100644 index 000000000..af521ac93 --- /dev/null +++ b/app/src/main/res/color/warning_600.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/drawable/led_away.xml b/app/src/main/res/drawable/led_away.xml index cb3df8caf..3df6eb9a4 100644 --- a/app/src/main/res/drawable/led_away.xml +++ b/app/src/main/res/drawable/led_away.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/led_background.xml b/app/src/main/res/drawable/led_background.xml index 74e69848c..15c16096e 100644 --- a/app/src/main/res/drawable/led_background.xml +++ b/app/src/main/res/drawable/led_background.xml @@ -1,5 +1,5 @@ - + 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 42c4e9a2b..20473be3c 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_not_registered.xml b/app/src/main/res/drawable/led_not_registered.xml index 5aebe3eda..1092a6f4b 100644 --- a/app/src/main/res/drawable/led_not_registered.xml +++ b/app/src/main/res/drawable/led_not_registered.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 3f1163679..916367694 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/linphone.xml b/app/src/main/res/drawable/linphone.xml index e0e8e1829..2a373a596 100644 --- a/app/src/main/res/drawable/linphone.xml +++ b/app/src/main/res/drawable/linphone.xml @@ -14,7 +14,7 @@ diff --git a/app/src/main/res/drawable/primary_cell_background.xml b/app/src/main/res/drawable/primary_cell_background.xml index 545585474..5e8211efa 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/main2_100" /> + android:drawable="@color/main2_100" /> + android:drawable="@color/main2_000" /> \ 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 1f7317d3b..b9bc2752a 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/main2_100" /> + android:drawable="@color/main2_100" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml b/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml index 6401b0ec9..dbba7e3d0 100644 --- a/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml +++ b/app/src/main/res/drawable/shape_assistant_sms_code_confirmation.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml b/app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml index dc96ac7ea..32a79568b 100644 --- a/app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml +++ b/app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_bottom_sheet_white_background.xml b/app/src/main/res/drawable/shape_bottom_sheet_white_background.xml index 8675a28f4..859fc0e01 100644 --- a/app/src/main/res/drawable/shape_bottom_sheet_white_background.xml +++ b/app/src/main/res/drawable/shape_bottom_sheet_white_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml index 37ea330b5..7e898c824 100644 --- a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml +++ b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml index 513b02d4d..5a2c08770 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml index 96c7ddcc0..ab50757f6 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml index 6ea2e234d..6a04a3d9f 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml index 7808f65fe..8f2abde86 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml index 57fe57f90..722fe4b27 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml index 1df1843b4..2a1722898 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml index 348f7f12f..f68d24a70 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml index c1123eb28..12440db03 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml b/app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml index 1389886ba..e4cda3f2f 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_reply.xml b/app/src/main/res/drawable/shape_chat_bubble_reply.xml index b76a97c7c..dfc900752 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_reply.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_reply.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_gray_100_background.xml b/app/src/main/res/drawable/shape_circle_gray_100_background.xml index ec4482f7b..4edefc970 100644 --- a/app/src/main/res/drawable/shape_circle_gray_100_background.xml +++ b/app/src/main/res/drawable/shape_circle_gray_100_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 32f3e19db..cbd763d6f 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 4cb89ed32..3f0b6ad4c 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 fb7df193e..f0cf8d405 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_primary_background.xml b/app/src/main/res/drawable/shape_circle_primary_background.xml index 6ae983625..001b05201 100644 --- a/app/src/main/res/drawable/shape_circle_primary_background.xml +++ b/app/src/main/res/drawable/shape_circle_primary_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_white_background.xml b/app/src/main/res/drawable/shape_circle_white_background.xml index 07f066002..a73ea70ec 100644 --- a/app/src/main/res/drawable/shape_circle_white_background.xml +++ b/app/src/main/res/drawable/shape_circle_white_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 59858036f..e1ac1adbd 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 d145f5f91..06cdc917e 100644 --- a/app/src/main/res/drawable/shape_dialog_background.xml +++ b/app/src/main/res/drawable/shape_dialog_background.xml @@ -4,14 +4,14 @@ - + + android:color="?attr/color_main2_000" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_drawer_handle.xml b/app/src/main/res/drawable/shape_drawer_handle.xml index 28cf5927e..6ef1f4236 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 e7bc0f46a..b0b4215c1 100644 --- a/app/src/main/res/drawable/shape_edit_text_background.xml +++ b/app/src/main/res/drawable/shape_edit_text_background.xml @@ -1,6 +1,6 @@ - - + + \ 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 95af56ae5..b5eeed4fd 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 @@ -1,6 +1,6 @@ - - + + \ 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 67848caa2..09bca10a4 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 @@ -1,6 +1,6 @@ - - + + \ 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 7a2d21e44..933466e99 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 @@ -1,6 +1,6 @@ - - + + \ 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 ff5b7e11d..577f52ad8 100644 --- a/app/src/main/res/drawable/shape_gradient.xml +++ b/app/src/main/res/drawable/shape_gradient.xml @@ -3,6 +3,6 @@ + android:startColor="?attr/color_main2_100" + android:endColor="?attr/color_main2_000" /> diff --git a/app/src/main/res/drawable/shape_line_main2_200.xml b/app/src/main/res/drawable/shape_line_main2_200.xml index 532840742..f2349378f 100644 --- a/app/src/main/res/drawable/shape_line_main2_200.xml +++ b/app/src/main/res/drawable/shape_line_main2_200.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file 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 c3fc659bd..6833fdcf5 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_orange_round.xml b/app/src/main/res/drawable/shape_orange_round.xml index ab3651d7e..1b6aa733a 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 e37a59731..c6e0c9be5 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_pressed_background.xml b/app/src/main/res/drawable/shape_primary_button_pressed_background.xml index 4361c48ed..d6f55a8dd 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 62afaf704..e73719af7 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 87800ff28..a7cb8b978 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_red_round.xml b/app/src/main/res/drawable/shape_red_round.xml index f8bd6c05d..abdfa74f1 100644 --- a/app/src/main/res/drawable/shape_red_round.xml +++ b/app/src/main/res/drawable/shape_red_round.xml @@ -1,5 +1,5 @@ - + \ 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 97def84bb..5ddeee1f7 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_disabled_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml index d242fd79e..6644edc2e 100644 --- a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_disabled_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_gray_background.xml b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml index 62367e1b1..1c0bbc272 100644 --- a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_gray_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 2ce614341..327ee432c 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_round_in_call_selected_green_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_selected_green_button_background.xml index 55509c60e..ec14b84d6 100644 --- a/app/src/main/res/drawable/shape_round_in_call_selected_green_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_selected_green_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_selected_red_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_selected_red_button_background.xml index d1b842841..c531331eb 100644 --- a/app/src/main/res/drawable/shape_round_in_call_selected_red_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_selected_red_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_popup_menu_background.xml b/app/src/main/res/drawable/shape_round_popup_menu_background.xml index 18bb74022..c5dcef1ac 100644 --- a/app/src/main/res/drawable/shape_round_popup_menu_background.xml +++ b/app/src/main/res/drawable/shape_round_popup_menu_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 cc345b5e5..00e88a9e7 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_pressed_background.xml b/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml index e37a59731..c6e0c9be5 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_100_background.xml b/app/src/main/res/drawable/shape_squircle_gray_100_background.xml index 7c0a66fa0..065709ef3 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_100_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_100_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_100_top_r10_background.xml b/app/src/main/res/drawable/shape_squircle_gray_100_top_r10_background.xml index 9a31c9bf0..9edf4536d 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_100_top_r10_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_100_top_r10_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_600_background.xml b/app/src/main/res/drawable/shape_squircle_gray_600_background.xml index deffe1a5e..4841cd8d1 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_600_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_600_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml b/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml index 8a888a493..48ecb5101 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_main2_100_r10_background.xml b/app/src/main/res/drawable/shape_squircle_gray_main2_100_r10_background.xml index 324fbdb57..1bb3d3deb 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_main2_100_r10_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_main2_100_r10_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 0ebd4e210..dc98966af 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_disabled_background.xml b/app/src/main/res/drawable/shape_squircle_green_disabled_background.xml index a6b71d712..cc0b3a62e 100644 --- a/app/src/main/res/drawable/shape_squircle_green_disabled_background.xml +++ b/app/src/main/res/drawable/shape_squircle_green_disabled_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 230c6572f..83e249150 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_main2_100_background.xml b/app/src/main/res/drawable/shape_squircle_main2_100_background.xml index c0c2b3b43..3ed5726d4 100644 --- a/app/src/main/res/drawable/shape_squircle_main2_100_background.xml +++ b/app/src/main/res/drawable/shape_squircle_main2_100_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_background.xml b/app/src/main/res/drawable/shape_squircle_main2_200_background.xml index d412b5061..d3f4c5165 100644 --- a/app/src/main/res/drawable/shape_squircle_main2_200_background.xml +++ b/app/src/main/res/drawable/shape_squircle_main2_200_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_border.xml b/app/src/main/res/drawable/shape_squircle_main2_200_border.xml index 891993dc0..ef2e9e813 100644 --- a/app/src/main/res/drawable/shape_squircle_main2_200_border.xml +++ b/app/src/main/res/drawable/shape_squircle_main2_200_border.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_left.xml b/app/src/main/res/drawable/shape_squircle_main2_200_left.xml index 6d29d89f8..779a7ed44 100644 --- a/app/src/main/res/drawable/shape_squircle_main2_200_left.xml +++ b/app/src/main/res/drawable/shape_squircle_main2_200_left.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_main2_400_border.xml b/app/src/main/res/drawable/shape_squircle_main2_400_border.xml index 3c6394fc4..a08105337 100644 --- a/app/src/main/res/drawable/shape_squircle_main2_400_border.xml +++ b/app/src/main/res/drawable/shape_squircle_main2_400_border.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 1c0a467b1..47874f10e 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 c629ae1e8..1e5cd1821 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 271026c39..af37874a9 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_squircle_white_background.xml b/app/src/main/res/drawable/shape_squircle_white_background.xml index 706ef93e2..3251f7fd6 100644 --- a/app/src/main/res/drawable/shape_squircle_white_background.xml +++ b/app/src/main/res/drawable/shape_squircle_white_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_background_blue_border.xml b/app/src/main/res/drawable/shape_squircle_white_background_blue_border.xml index b3ddaf751..46695c931 100644 --- a/app/src/main/res/drawable/shape_squircle_white_background_blue_border.xml +++ b/app/src/main/res/drawable/shape_squircle_white_background_blue_border.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_background_orange_border.xml b/app/src/main/res/drawable/shape_squircle_white_background_orange_border.xml index c124c16d6..0b0bfd6a4 100644 --- a/app/src/main/res/drawable/shape_squircle_white_background_orange_border.xml +++ b/app/src/main/res/drawable/shape_squircle_white_background_orange_border.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_r10_background.xml b/app/src/main/res/drawable/shape_squircle_white_r10_background.xml index 139f19f5d..72d82c99f 100644 --- a/app/src/main/res/drawable/shape_squircle_white_r10_background.xml +++ b/app/src/main/res/drawable/shape_squircle_white_r10_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_r50_background.xml b/app/src/main/res/drawable/shape_squircle_white_r50_background.xml index 3906225f0..08f6b7837 100644 --- a/app/src/main/res/drawable/shape_squircle_white_r50_background.xml +++ b/app/src/main/res/drawable/shape_squircle_white_r50_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_right.xml b/app/src/main/res/drawable/shape_squircle_white_right.xml index b686ccd82..4015ec80e 100644 --- a/app/src/main/res/drawable/shape_squircle_white_right.xml +++ b/app/src/main/res/drawable/shape_squircle_white_right.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 a265a2d62..49c2f23dc 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 a265a2d62..49c2f23dc 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 954e2a09e..812b57ca4 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 2315eaa25..289622fbd 100644 --- a/app/src/main/res/drawable/shape_toast_blue_background.xml +++ b/app/src/main/res/drawable/shape_toast_blue_background.xml @@ -1,6 +1,6 @@ - - + + \ 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 7fa1a615d..78977550d 100644 --- a/app/src/main/res/drawable/shape_toast_green_background.xml +++ b/app/src/main/res/drawable/shape_toast_green_background.xml @@ -1,6 +1,6 @@ - - + + \ 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 9abfd8acf..fb13605bc 100644 --- a/app/src/main/res/drawable/shape_toast_red_background.xml +++ b/app/src/main/res/drawable/shape_toast_red_background.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/voice_recording_gradient_progress.xml b/app/src/main/res/drawable/voice_recording_gradient_progress.xml index f976cad8d..184474e9c 100644 --- a/app/src/main/res/drawable/voice_recording_gradient_progress.xml +++ b/app/src/main/res/drawable/voice_recording_gradient_progress.xml @@ -6,7 +6,7 @@ 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 62f9407c5..b695c73da 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -15,7 +15,7 @@ android:id="@+id/bottom_nav_bar" android:layout_width="@dimen/landscape_nav_bar_width" android:layout_height="match_parent" - android:background="@color/white"> + android:background="?attr/color_main2_000"> + android:background="?attr/color_main1_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 4fac212f9..df890798a 100644 --- a/app/src/main/res/layout-land/contacts_list_fragment.xml +++ b/app/src/main/res/layout-land/contacts_list_fragment.xml @@ -28,7 +28,7 @@ + android:background="?attr/color_main1_500"> @@ -76,7 +76,7 @@ android:layout_height="0dp" android:layout_marginTop="@dimen/top_bar_height" android:orientation="vertical" - android:background="@color/white" + android:background="?attr/color_main2_000" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" @@ -154,8 +154,8 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/user_plus" - app:tint="@color/gray_main2_700" - app:backgroundTint="@color/white" + app:tint="?attr/color_main2_700" + app:backgroundTint="?attr/color_main2_000" app:shapeAppearanceOverlay="@style/rounded" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml index a753a3112..b3242a3c5 100644 --- a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml @@ -162,7 +162,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_500" + android:textColor="?attr/color_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-land/file_viewer_fragment.xml b/app/src/main/res/layout-land/file_viewer_fragment.xml index f7f97960a..7fab5a93e 100644 --- a/app/src/main/res/layout-land/file_viewer_fragment.xml +++ b/app/src/main/res/layout-land/file_viewer_fragment.xml @@ -44,7 +44,7 @@ app:layout_constraintBottom_toTopOf="@id/file_name" app:layout_constraintStart_toStartOf="@id/pdf_view_pager" app:layout_constraintEnd_toEndOf="@id/pdf_view_pager" - app:tint="@color/orange_main_500"/> + app:tint="?attr/color_main1_500"/> @@ -101,7 +101,7 @@ android:id="@+id/title" android:layout_width="0dp" android:layout_height="@dimen/top_bar_height" - android:background="@color/white" + android:background="?attr/color_main2_000" android:paddingStart="10dp" android:paddingEnd="10dp" android:text="" @@ -115,12 +115,12 @@ android:onClick="@{shareClickListener}" android:layout_width="wrap_content" android:layout_height="0dp" - android:background="@color/white" + android:background="?attr/color_main2_000" android:adjustViewBounds="true" android:padding="15dp" android:src="@drawable/share_network" android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toStartOf="@id/save" app:layout_constraintTop_toTopOf="@id/title" /> @@ -130,12 +130,12 @@ android:onClick="@{() -> viewModel.exportToMediaStore()}" android:layout_width="wrap_content" android:layout_height="0dp" - android:background="@color/white" + android:background="?attr/color_main2_000" android:adjustViewBounds="true" android:padding="15dp" android:src="@drawable/download_simple" android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -145,12 +145,12 @@ android:id="@+id/file_name" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@color/white" + android:background="?attr/color_main2_000" android:paddingTop="16dp" android:paddingBottom="16dp" android:text="@{viewModel.fileName, default=`nomdufichier.jpg\nenvoyé le 02/05/2023 à 11h05`}" android:textSize="12sp" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:textAlignment="center" android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout-land/history_list_fragment.xml b/app/src/main/res/layout-land/history_list_fragment.xml index 3beb72f1f..06512bdd3 100644 --- a/app/src/main/res/layout-land/history_list_fragment.xml +++ b/app/src/main/res/layout-land/history_list_fragment.xml @@ -34,7 +34,7 @@ + android:background="?attr/color_main1_500"> @@ -80,7 +80,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@color/white" + android:src="?attr/color_main2_000" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" @@ -125,8 +125,8 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/phone_plus" - app:tint="@color/gray_main2_700" - app:backgroundTint="@color/white" + app:tint="?attr/color_main2_700" + app:backgroundTint="?attr/color_main2_000" app:shapeAppearanceOverlay="@style/rounded" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout-land/meetings_list_fragment.xml b/app/src/main/res/layout-land/meetings_list_fragment.xml index 975e22e89..2096a9a91 100644 --- a/app/src/main/res/layout-land/meetings_list_fragment.xml +++ b/app/src/main/res/layout-land/meetings_list_fragment.xml @@ -31,7 +31,7 @@ + android:background="?attr/color_main1_500"> @@ -77,7 +77,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@color/white" + android:src="?attr/color_main2_000" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" @@ -122,8 +122,8 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/plus_circle" - app:tint="@color/gray_main2_700" - app:backgroundTint="@color/white" + app:tint="?attr/color_main2_700" + app:backgroundTint="?attr/color_main2_000" app:shapeAppearanceOverlay="@style/rounded" 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 1fdab0d12..6250bc961 100644 --- a/app/src/main/res/layout-land/welcome_page_1.xml +++ b/app/src/main/res/layout-land/welcome_page_1.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:text="@string/welcome_page_title" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:text="@string/welcome_page_subtitle" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> 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 5aee053ef..d68c924b1 100644 --- a/app/src/main/res/layout-land/welcome_page_2.xml +++ b/app/src/main/res/layout-land/welcome_page_2.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:text="@string/welcome_page_title" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:text="@string/welcome_page_subtitle" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> 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 ef73ed0de..de30608d0 100644 --- a/app/src/main/res/layout-land/welcome_page_3.xml +++ b/app/src/main/res/layout-land/welcome_page_3.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:text="@string/welcome_page_title" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:text="@string/welcome_page_subtitle" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index a1f7f9488..4132a5313 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -16,7 +16,7 @@ android:onClick="@{() -> model.setAsDefault()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@{model.isDefault ? @color/gray_main2_100 : @color/white, default=@color/gray_main2_100}"> + android:background="@{model.isDefault ? @color/main2_100 : @color/main2_000, default=@color/main2_100}"> diff --git a/app/src/main/res/layout/account_popup_menu.xml b/app/src/main/res/layout/account_popup_menu.xml index 2e14d623a..c12f0e3c4 100644 --- a/app/src/main/res/layout/account_popup_menu.xml +++ b/app/src/main/res/layout/account_popup_menu.xml @@ -25,10 +25,10 @@ android:layout_margin="20dp" android:text="@string/drawer_menu_manage_account" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:drawableStart="@drawable/user_circle_gear" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_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 94ff83b0b..6a80897a0 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 @@ -77,7 +77,7 @@ android:layout_marginStart="10dp" android:text="@{model.lastConnectionDate, default=`03/10/2023`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:drawableStart="@drawable/calendar_blank" android:drawablePadding="6dp" app:layout_constraintTop_toTopOf="@id/last_connection" @@ -93,7 +93,7 @@ android:layout_marginStart="10dp" android:text="@{model.lastConnectionTime, default=`9h25`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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 08d52b777..25273d150 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -35,7 +35,7 @@ + android:background="?attr/color_main2_000"> @@ -59,7 +59,7 @@ android:layout_marginEnd="10dp" android:gravity="center_vertical" android:text="@string/manage_account_title" - android:textColor="@color/orange_main_500" + android:textColor="?attr/color_main1_500" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" @@ -69,7 +69,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -176,7 +176,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_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/avatar_barrier"/> @@ -507,7 +507,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 a1b1a076b..385a6dc4e 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 @@ -25,7 +25,7 @@ + android:background="?attr/color_main2_000"> @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -90,7 +90,7 @@ android:checked="@{viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" - app:buttonTint="@color/blue_info_500" + app:buttonTint="?attr/color_info_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -176,7 +176,7 @@ android:visibility="gone" coilAvatarNoTrust="@{viewModel.accountModel}" app:strokeWidth="@dimen/avatar_trust_border_width" - app:strokeColor="@color/blue_info_500" + app:strokeColor="?attr/color_info_500" app:layout_constraintStart_toEndOf="@id/arrow" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/image1" @@ -227,7 +227,7 @@ android:checked="@{!viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" - app:buttonTint="@color/orange_main_500" + app:buttonTint="?attr/color_main1_500" app:layout_constraintTop_toBottomOf="@id/image1" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml index 4ed50ade4..d5c06ee97 100644 --- a/app/src/main/res/layout/account_settings_fragment.xml +++ b/app/src/main/res/layout/account_settings_fragment.xml @@ -16,7 +16,7 @@ + android:background="?attr/color_main2_000"> @@ -40,7 +40,7 @@ android:layout_marginEnd="10dp" android:gravity="center_vertical" android:text="@string/account_settings_title" - android:textColor="@color/orange_main_500" + android:textColor="?attr/color_main1_500" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" @@ -50,7 +50,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title" diff --git a/app/src/main/res/layout/address_selected_list_cell.xml b/app/src/main/res/layout/address_selected_list_cell.xml index 665764635..fd0faaa29 100644 --- a/app/src/main/res/layout/address_selected_list_cell.xml +++ b/app/src/main/res/layout/address_selected_list_cell.xml @@ -57,7 +57,7 @@ android:src="@drawable/x" android:padding="5dp" android:background="@drawable/shape_circle_gray_100_background" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintTop_toTopOf="@id/avatar" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml index 9c09c3344..a61971bf0 100644 --- a/app/src/main/res/layout/assistant_login_fragment.xml +++ b/app/src/main/res/layout/assistant_login_fragment.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="@color/white"> + android:background="?attr/color_main2_000"> @@ -97,7 +97,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.username, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:background="@drawable/edit_text_background" android:inputType="text" android:hint="@string/username" @@ -129,7 +129,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.password, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:background="@drawable/edit_text_background" android:hint="@string/password" app:layout_constraintWidth_max="@dimen/text_input_max_width" @@ -146,7 +146,7 @@ android:padding="4dp" android:layout_marginEnd="20dp" android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="@id/password" app:layout_constraintTop_toTopOf="@id/password" app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -182,7 +182,7 @@ android:paddingEnd="20dp" android:text="@string/assistant_forgotten_password" android:textSize="13sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/login"/> @@ -197,7 +197,7 @@ android:paddingEnd="10dp" android:text="@string/or" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/forgotten_password"/> @@ -206,7 +206,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginStart="16dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/or" app:layout_constraintTop_toTopOf="@id/or" @@ -216,7 +216,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="16dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" app:layout_constraintStart_toEndOf="@id/or" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/or" @@ -285,7 +285,7 @@ android:paddingEnd="20dp" android:text="@string/assistant_no_account_yet" android:textSize="14sp" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_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_permissions_fragment.xml b/app/src/main/res/layout/assistant_permissions_fragment.xml index 6ddc9a2a1..0d531fba3 100644 --- a/app/src/main/res/layout/assistant_permissions_fragment.xml +++ b/app/src/main/res/layout/assistant_permissions_fragment.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="@color/white"> + android:background="?attr/color_main2_000"> @@ -97,7 +97,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="12dp" android:src="@drawable/bell_ringing" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintTop_toBottomOf="@id/subtitle" app:layout_constraintStart_toStartOf="parent"/> @@ -125,7 +125,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="12dp" android:src="@drawable/address_book" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintTop_toBottomOf="@id/post_notifications_icon" app:layout_constraintStart_toStartOf="parent"/> @@ -153,7 +153,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="12dp" android:src="@drawable/microphone" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintTop_toBottomOf="@id/read_contacts_icon" app:layout_constraintStart_toStartOf="parent"/> @@ -181,7 +181,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="12dp" android:src="@drawable/video_camera" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintTop_toBottomOf="@id/record_audio_icon" app:layout_constraintStart_toStartOf="parent"/> diff --git a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml index a8154ce3a..c5ed46c45 100644 --- a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml +++ b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml @@ -36,7 +36,7 @@ android:layout_height="@dimen/top_bar_height" android:padding="15dp" android:src="@drawable/caret_left" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> 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 a2a3ceb9e..7faf45f94 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 @@ -29,7 +29,7 @@ android:layout_height="@dimen/top_bar_height" android:padding="15dp" android:src="@drawable/caret_left" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -67,7 +67,7 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.confirmationMessage, default=@string/assistant_account_creation_sms_confirmation_explanation}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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 e6cbe2c3d..0a63cf9cf 100644 --- a/app/src/main/res/layout/assistant_register_fragment.xml +++ b/app/src/main/res/layout/assistant_register_fragment.xml @@ -26,7 +26,7 @@ + android:background="?attr/color_main2_000"> @@ -96,7 +96,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.username, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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" @@ -113,7 +113,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.usernameError, default=`Error`}" android:textSize="13sp" - android:textColor="@color/red_danger_500" + android:textColor="?attr/color_danger_500" app:layout_constraintTop_toBottomOf="@id/username" app:layout_constraintStart_toStartOf="@id/username" app:layout_constraintEnd_toEndOf="@id/username"/> @@ -148,7 +148,7 @@ android:paddingStart="20dp" android:paddingEnd="25dp" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:gravity="center_vertical" android:overlapAnchor="false" android:dropDownVerticalOffset="25dp" @@ -178,7 +178,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:inputType="phone" android:drawableStart="@drawable/separator" android:drawablePadding="10dp" @@ -197,7 +197,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.phoneNumberError, default=`Error`}" android:textSize="13sp" - android:textColor="@color/red_danger_500" + android:textColor="?attr/color_danger_500" app:layout_constraintTop_toBottomOf="@id/prefix" app:layout_constraintStart_toStartOf="@id/prefix" app:layout_constraintEnd_toEndOf="@id/phone_number"/> @@ -225,7 +225,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.password, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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}" @@ -242,7 +242,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.passwordError, default=`Error`}" android:textSize="13sp" - android:textColor="@color/red_danger_500" + android:textColor="?attr/color_danger_500" app:layout_constraintTop_toBottomOf="@id/password" app:layout_constraintStart_toStartOf="@id/password" app:layout_constraintEnd_toEndOf="@id/password"/> @@ -255,7 +255,7 @@ android:padding="4dp" android:layout_marginEnd="20dp" android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="@id/password" app:layout_constraintTop_toTopOf="@id/password" app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -285,7 +285,7 @@ android:gravity="center" android:text="@string/assistant_create_account_using_email_on_our_web_platform" android:textSize="14sp" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" app:layout_constraintTop_toBottomOf="@id/create" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -319,7 +319,7 @@ android:paddingEnd="20dp" android:text="@string/assistant_already_have_an_account" android:textSize="14sp" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_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 94e3b9aed..411f84410 100644 --- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml +++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="@color/white"> + android:background="?attr/color_main2_000"> @@ -76,7 +76,7 @@ android:paddingBottom="25dp" android:text="@string/assistant_account_secure_mode_subtitle" android:textSize="14sp" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -95,7 +95,7 @@ android:checked="@{viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" - app:buttonTint="@color/blue_info_500" + app:buttonTint="?attr/color_info_500" app:layout_constraintTop_toBottomOf="@id/sub_title" app:layout_constraintStart_toStartOf="parent" /> @@ -180,7 +180,7 @@ android:src="@drawable/user_circle" coilInitials="@{`JD`}" app:strokeWidth="@dimen/avatar_trust_border_width" - app:strokeColor="@color/blue_info_500" + app:strokeColor="?attr/color_info_500" app:layout_constraintStart_toEndOf="@id/arrow" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/image1" @@ -219,7 +219,7 @@ android:checked="@{!viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" - app:buttonTint="@color/orange_main_500" + app:buttonTint="?attr/color_main1_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 628019921..b983b6d3e 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 @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="@color/white"> + android:background="?attr/color_main2_000"> @@ -82,7 +82,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.username, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:background="@drawable/edit_text_background" android:inputType="text" android:hint="@string/username" @@ -114,7 +114,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.password, default=`johndoe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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}" @@ -131,7 +131,7 @@ android:layout_marginEnd="20dp" android:padding="4dp" android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="@id/password" app:layout_constraintTop_toTopOf="@id/password" app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -159,7 +159,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.domain, default=`sip.example.net`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:background="@drawable/edit_text_background" android:inputType="text|textUri" android:hint="@string/sip_address_domain" @@ -191,7 +191,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.displayName, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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 7f1825e5c..e3f953322 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 @@ -23,12 +23,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="@color/white"> + android:background="?attr/color_main2_000"> + android:layout_height="wrap_content"> @@ -48,7 +47,7 @@ android:layout_height="wrap_content" android:layout_marginTop="100dp" android:text="@string/assistant_login_third_party_sip_account" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -62,7 +61,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/chat_teardrop_text" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/no_video" @@ -76,7 +75,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/video_camera_slash" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_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 1e5d2b05e..989df5588 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="16dp" - android:background="@color/white"> + android:background="?attr/color_main2_000"> + android:background="?attr/color_grey_900"> @@ -127,7 +127,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/conference_subject" app:layout_constraintBottom_toBottomOf="@id/conference_subject" - app:tint="@color/orange_main_500" /> + app:tint="?attr/color_main1_500" /> @@ -201,7 +201,7 @@ android:visibility="@{viewModel.isRecording ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toTopOf="@id/background" app:layout_constraintStart_toStartOf="@id/background" - app:tint="@color/red_danger_500" /> + app:tint="?attr/color_danger_500" /> diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml index 78159657f..a16dc9ecc 100644 --- a/app/src/main/res/layout/call_active_fragment.xml +++ b/app/src/main/res/layout/call_active_fragment.xml @@ -31,7 +31,7 @@ android:id="@+id/constraint_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/gray_900"> + android:background="?attr/color_grey_900"> @@ -242,7 +242,7 @@ android:visibility="@{viewModel.isRecording ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toTopOf="@id/background" app:layout_constraintStart_toStartOf="@id/background" - app:tint="@color/red_danger_500" /> + app:tint="?attr/color_danger_500" /> diff --git a/app/src/main/res/layout/call_activity_other_calls_top_bar.xml b/app/src/main/res/layout/call_activity_other_calls_top_bar.xml index 58c4f4ac5..ca0937c61 100644 --- a/app/src/main/res/layout/call_activity_other_calls_top_bar.xml +++ b/app/src/main/res/layout/call_activity_other_calls_top_bar.xml @@ -13,7 +13,7 @@ + app:buttonTint="?attr/color_main2_000"/> \ No newline at end of file diff --git a/app/src/main/res/layout/call_common_actions.xml b/app/src/main/res/layout/call_common_actions.xml index 5600b4db7..27d12e35e 100644 --- a/app/src/main/res/layout/call_common_actions.xml +++ b/app/src/main/res/layout/call_common_actions.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -43,7 +43,7 @@ android:paddingBottom="15dp" android:src="@drawable/phone_disconnect" android:background="@drawable/squircle_red_button_background" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"/> diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml index 9ecbcf012..512c203fc 100644 --- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml @@ -45,7 +45,7 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/screencast" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="@id/screen_sharing_label" app:layout_constraintEnd_toEndOf="@id/screen_sharing_label" @@ -91,7 +91,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" @@ -122,7 +122,7 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/chat_teardrop_text" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/screen_sharing_label" app:layout_constraintStart_toStartOf="@id/screen_sharing" @@ -138,7 +138,7 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/pause" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/participants_label" app:layout_constraintStart_toStartOf="@id/participants" @@ -153,7 +153,7 @@ android:src="@drawable/record_fill" android:selected="@{viewModel.isRecording()}" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/calls_list_label" app:layout_constraintStart_toStartOf="@id/calls_list" diff --git a/app/src/main/res/layout/call_conference_grid_cell.xml b/app/src/main/res/layout/call_conference_grid_cell.xml index 2750625df..2a830e2f0 100644 --- a/app/src/main/res/layout/call_conference_grid_cell.xml +++ b/app/src/main/res/layout/call_conference_grid_cell.xml @@ -80,7 +80,7 @@ android:layout_marginStart="12dp" android:layout_marginBottom="8dp" android:text="@{model.avatarModel.name, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/call_conference_layout_menu.xml b/app/src/main/res/layout/call_conference_layout_menu.xml index 46d9d6dc2..f6a490aa1 100644 --- a/app/src/main/res/layout/call_conference_layout_menu.xml +++ b/app/src/main/res/layout/call_conference_layout_menu.xml @@ -32,14 +32,14 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@string/conference_layout_grid" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:gravity="center_vertical" android:layout_marginBottom="1dp" android:drawableEnd="@drawable/squares_four" - android:drawableTint="@color/white" + android:drawableTint="?attr/color_main2_000" android:checked="@{viewModel.conferenceLayout == 0}" app:useMaterialThemeColors="false" - app:buttonTint="@color/white"/> + app:buttonTint="?attr/color_main2_000"/> + app:buttonTint="?attr/color_main2_000"/> + app:buttonTint="?attr/color_main2_000"/> diff --git a/app/src/main/res/layout/call_conference_participant_list_cell.xml b/app/src/main/res/layout/call_conference_participant_list_cell.xml index 9e79d502e..47afb27b3 100644 --- a/app/src/main/res/layout/call_conference_participant_list_cell.xml +++ b/app/src/main/res/layout/call_conference_participant_list_cell.xml @@ -71,7 +71,7 @@ android:layout_marginStart="10dp" android:text="@string/conversation_info_participant_is_admin_label" android:textSize="12sp" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:gravity="center" android:visibility="@{model.isAdmin ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toEndOf="@id/name" @@ -84,7 +84,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml index 966223b7a..2e1842b03 100644 --- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml +++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml @@ -15,7 +15,7 @@ + android:background="?attr/color_main2_000"> diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml index 4291a77f7..6e31a7ce3 100644 --- a/app/src/main/res/layout/call_ended_actions.xml +++ b/app/src/main/res/layout/call_ended_actions.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/call_main_actions_menu_height" android:paddingBottom="5dp" - android:background="@color/gray_900"> + android:background="?attr/color_grey_900"> @@ -36,7 +36,7 @@ android:enabled="false" android:src="@drawable/video_camera_slash" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintBottom_toBottomOf="parent" @@ -51,7 +51,7 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/microphone_slash" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_video" app:layout_constraintEnd_toStartOf="@id/change_audio_output" /> @@ -64,7 +64,7 @@ android:padding="@dimen/call_button_icon_padding" android:src="@drawable/speaker_slash" android:background="@drawable/shape_round_in_call_disabled_button_background" - app:tint="@color/gray_500" + app:tint="?attr/color_grey_500" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_mute_mic" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml index 0da659466..8c6b0a076 100644 --- a/app/src/main/res/layout/call_ended_fragment.xml +++ b/app/src/main/res/layout/call_ended_fragment.xml @@ -13,7 +13,7 @@ + android:background="?attr/color_grey_900"> + app:tint="?attr/color_main1_500" /> + app:tint="?attr/color_main2_000" /> + app:tint="?attr/color_main2_000" /> diff --git a/app/src/main/res/layout/call_incoming_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml index 891b8882c..61df46f0d 100644 --- a/app/src/main/res/layout/call_incoming_fragment.xml +++ b/app/src/main/res/layout/call_incoming_fragment.xml @@ -14,7 +14,7 @@ + android:background="?attr/color_grey_900"> @@ -99,7 +99,7 @@ android:id="@+id/chronometer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="30sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -113,7 +113,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="22sp" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="14sp" android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toBottomOf="@id/name" diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml index dae463556..70cc2f91d 100644 --- a/app/src/main/res/layout/call_list_cell.xml +++ b/app/src/main/res/layout/call_list_cell.xml @@ -56,7 +56,7 @@ android:layout_height="24dp" android:layout_marginEnd="5dp" android:src="@{model.isPaused ? @drawable/pause_call : @drawable/phone_call, default=@drawable/pause_call}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> @@ -81,7 +81,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_numpad_bottom_sheet.xml b/app/src/main/res/layout/call_numpad_bottom_sheet.xml index a86deb752..da01ed850 100644 --- a/app/src/main/res/layout/call_numpad_bottom_sheet.xml +++ b/app/src/main/res/layout/call_numpad_bottom_sheet.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="30sp" android:text="@{model.digits, default=`0123456789`}" android:background="@color/transparent_color" @@ -64,7 +64,7 @@ android:src="@drawable/backspace_fill" android:padding="20dp" android:elevation="3dp" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintStart_toEndOf="@id/digits_history" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml index 3138aea26..96e1679b4 100644 --- a/app/src/main/res/layout/call_outgoing_fragment.xml +++ b/app/src/main/res/layout/call_outgoing_fragment.xml @@ -14,7 +14,7 @@ + android:background="?attr/color_grey_900"> + app:tint="?attr/color_main2_000" /> @@ -113,7 +113,7 @@ android:id="@+id/chronometer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="30sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -127,7 +127,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="22sp" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -139,7 +139,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/name" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml index e741e426e..75b08060d 100644 --- a/app/src/main/res/layout/calls_list_fragment.xml +++ b/app/src/main/res/layout/calls_list_fragment.xml @@ -15,7 +15,7 @@ + android:background="?attr/color_main2_000"> 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 ebf0ef108..6c03a7d58 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 @@ -18,7 +18,7 @@ + android:background="?attr/color_main2_200"> + app:tint="?attr/color_main1_500" /> diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml index d1777203e..80287921d 100644 --- a/app/src/main/res/layout/chat_bubble_incoming.xml +++ b/app/src/main/res/layout/chat_bubble_incoming.xml @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:textSize="12sp" android:text="@{model.avatarModel.name, default=`John Doe`}" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:maxLines="1" android:ellipsize="end" android:visibility="@{!model.isFromGroup ? View.GONE: model.groupedWithPreviousMessage ? View.GONE : View.VISIBLE}" @@ -85,8 +85,8 @@ android:layout_marginStart="8dp" android:text="@{model.replyTo, default=`John Doe`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" - app:drawableTint="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" + app:drawableTint="?attr/color_main2_500" app:layout_constraintStart_toEndOf="@id/reply_icon" app:layout_constraintTop_toBottomOf="@id/name" app:layout_constraintBottom_toTopOf="@id/reply" /> @@ -120,7 +120,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="32dp" android:text="@{model.replyText, default=`Reply`}" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:textSize="14sp" android:maxLines="2" android:ellipsize="end" @@ -195,7 +195,7 @@ android:layout_height="wrap_content" android:text="@{model.text, default=`Lorem ipsum dolor sit amet`}" android:textSize="14sp" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:gravity="center_vertical|start" android:visibility="@{model.text.length() > 0 ? View.VISIBLE : View.GONE}"/> @@ -226,7 +226,7 @@ android:layout_marginTop="2dp" android:src="@{model.statusIcon, default=@drawable/checks}" android:visibility="@{!model.groupedWithNextMessage ? View.VISIBLE : View.GONE}" - app:tint="@color/orange_main_500" /> + app:tint="?attr/color_main1_500" /> @@ -243,7 +243,7 @@ android:background="@drawable/shape_chat_bubble_reactions_background" android:text="@{model.reactions, default=@string/emoji_love}" android:textSize="15sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:paddingStart="16dp" android:paddingEnd="16dp" android:paddingTop="12dp" diff --git a/app/src/main/res/layout/chat_bubble_long_press_menu.xml b/app/src/main/res/layout/chat_bubble_long_press_menu.xml index bba560552..3b3b4578a 100644 --- a/app/src/main/res/layout/chat_bubble_long_press_menu.xml +++ b/app/src/main/res/layout/chat_bubble_long_press_menu.xml @@ -186,7 +186,7 @@ android:id="@+id/actions_background" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" app:layout_constraintTop_toTopOf="@id/bottom_barrier" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml index 170e8641f..7346842cd 100644 --- a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml +++ b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml @@ -52,7 +52,7 @@ android:paddingEnd="12dp" android:paddingTop="4dp" android:text="@{model.meetingDay, default=`Mon.`}" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:textSize="14sp" app:layout_constraintStart_toStartOf="@id/day_background" app:layout_constraintTop_toTopOf="@id/day_background"/> @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{model.meetingDayNumber, default=`19`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="20sp" android:paddingBottom="4dp" app:layout_constraintStart_toStartOf="@id/today_background" @@ -89,12 +89,12 @@ android:layout_marginStart="10dp" android:text="@{model.meetingSubject, default=`Meeting with John`}" android:textSize="13sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/meeting" android:drawablePadding="8dp" - app:drawableTint="@color/gray_main2_600" + app:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toEndOf="@id/day_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:text="@{model.meetingDate, default=`Tue. 12 November`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" app:layout_constraintStart_toStartOf="@id/title" @@ -120,7 +120,7 @@ android:layout_height="wrap_content" android:text="@{model.meetingTime, default=`10:00 PM to 12:00 PM`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" app:layout_constraintStart_toStartOf="@id/title" @@ -136,7 +136,7 @@ android:layout_marginTop="12dp" android:text="@string/meeting_schedule_description_title" android:textSize="12sp" - android:textColor="@color/gray_main2_800" + android:textColor="?attr/color_main2_800" android:visibility="@{model.meetingDescription.length() > 0 ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -151,7 +151,7 @@ android:layout_marginEnd="16dp" android:text="@{model.meetingDescription, default=`Meeting with John Doe.`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:visibility="@{model.meetingDescription.length() > 0 ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -167,12 +167,12 @@ android:layout_marginTop="16dp" android:text="@{model.meetingParticipants, default=`24 participants`}" android:textSize="12sp" - android:textColor="@color/gray_main2_800" + android:textColor="?attr/color_main2_800" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/users" android:drawablePadding="4dp" - app:drawableTint="@color/gray_main2_600" + app:drawableTint="?attr/color_main2_600" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/join" diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml index b2d112309..fdfb34e45 100644 --- a/app/src/main/res/layout/chat_bubble_outgoing.xml +++ b/app/src/main/res/layout/chat_bubble_outgoing.xml @@ -48,8 +48,8 @@ android:layout_marginEnd="8dp" android:text="@{model.replyTo, default=`John Doe`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" - app:drawableTint="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" + app:drawableTint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="@id/reply" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/reply" /> @@ -83,7 +83,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="@{model.replyText, default=`Reply`}" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:textSize="14sp" android:maxLines="2" android:ellipsize="end" @@ -157,7 +157,7 @@ android:layout_height="wrap_content" android:text="@{model.text, default=`Lorem ipsum dolor sit amet`}" android:textSize="14sp" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:gravity="center_vertical|start" android:visibility="@{model.text.length() > 0 ? View.VISIBLE : View.GONE}"/> @@ -188,7 +188,7 @@ android:layout_marginTop="2dp" android:src="@{model.statusIcon, default=@drawable/checks}" android:visibility="@{!model.groupedWithNextMessage ? View.VISIBLE : View.GONE}" - app:tint="@color/orange_main_500" /> + app:tint="?attr/color_main1_500" /> @@ -205,7 +205,7 @@ android:background="@drawable/shape_chat_bubble_reactions_background" android:text="@{model.reactions, default=@string/emoji_love}" android:textSize="20sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:paddingStart="16dp" android:paddingEnd="16dp" android:paddingTop="12dp" diff --git a/app/src/main/res/layout/chat_bubble_voice_record_content.xml b/app/src/main/res/layout/chat_bubble_voice_record_content.xml index c492621a0..cb38f018a 100644 --- a/app/src/main/res/layout/chat_bubble_voice_record_content.xml +++ b/app/src/main/res/layout/chat_bubble_voice_record_content.xml @@ -46,7 +46,7 @@ app:layout_constraintBottom_toBottomOf="@id/voice_record_duration" app:layout_constraintStart_toStartOf="@id/voice_record_progress" app:layout_constraintTop_toTopOf="@id/voice_record_duration" - app:tint="@color/orange_main_500" /> + app:tint="?attr/color_main1_500" /> + android:background="?attr/color_main2_000"> + android:drawableTint="?attr/color_grey_400"/> \ No newline at end of file diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml index aac3bf9af..86ab97728 100644 --- a/app/src/main/res/layout/chat_conversation_fragment.xml +++ b/app/src/main/res/layout/chat_conversation_fragment.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="80dp" - android:background="@color/white"> + android:background="?attr/color_main2_000"> @@ -120,7 +120,7 @@ android:ellipsize="end" android:text="@{viewModel.isGroup ? viewModel.subject : viewModel.avatarModel.name, default=`John Doe`}" android:textSize="16sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:gravity="center_vertical" app:layout_constraintEnd_toStartOf="@id/search_toggle" app:layout_constraintStart_toEndOf="@id/avatar" @@ -137,7 +137,7 @@ app:layout_constraintTop_toTopOf="@id/title" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toEndOf="parent" - app:tint="@color/gray_main2_500"/> + app:tint="?attr/color_main2_500"/> + app:tint="?attr/color_main2_500" /> + app:tint="?attr/color_main2_500" /> + app:tint="?attr/color_main2_500" /> + android:background="?attr/color_main2_000"> + app:tint="?attr/color_main1_500" /> + app:tint="?attr/color_main1_500" /> + app:tint="?attr/color_main1_500" /> + android:background="?attr/color_main2_000"> @@ -55,7 +55,7 @@ android:layout_marginStart="5dp" android:text="@{viewModel.isReplyingTo, default=`John Doe`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/reply_header" app:layout_constraintEnd_toStartOf="@id/cancel" /> @@ -69,7 +69,7 @@ android:layout_marginBottom="10dp" android:text="@{viewModel.isReplyingToMessage, default=`Hello this is John! How are you?`}" android:textSize="12sp" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:maxLines="1" android:ellipsize="end" app:layout_constraintTop_toBottomOf="@id/reply_header" diff --git a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml index 90eedd62d..5f19caeab 100644 --- a/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml +++ b/app/src/main/res/layout/chat_conversation_send_area_bottom_sheet.xml @@ -16,7 +16,7 @@ @@ -56,7 +56,7 @@ android:id="@+id/emoji_picker" android:layout_width="match_parent" android:layout_height="@dimen/chat_room_emoji_picker_height" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" android:visibility="@{viewModel.isEmojiPickerOpen ? View.VISIBLE : View.GONE, default=gone}" app:emojiPickedListener="@{(emoji) -> viewModel.insertEmoji(emoji.emoji)}" app:layout_constraintTop_toBottomOf="@id/attachments" /> @@ -123,7 +123,7 @@ android:maxLines="3" android:minHeight="48dp" android:text="@={viewModel.textToSend}" - android:textColorHint="@color/gray_main2_400" + android:textColorHint="?attr/color_main2_400" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/send_barrier" @@ -163,7 +163,7 @@ app:layout_constraintBottom_toBottomOf="@id/message_area_background" app:layout_constraintEnd_toEndOf="@id/message_area_background" app:layout_constraintTop_toTopOf="@id/message_area_background" - app:tint="@color/gray_main2_500" /> + app:tint="?attr/color_main2_500" /> + android:background="?attr/color_main2_000"> @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -76,7 +76,7 @@ android:layout_marginEnd="25dp" android:layout_marginTop="25dp" android:text="@string/conversation_ephemeral_messages_subtitle" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="14sp" android:textAlignment="center" app:layout_constraintTop_toBottomOf="@id/illu"/> @@ -103,17 +103,17 @@ android:checked="@{viewModel.currentlySelectedValue == 60}" android:text="@string/conversation_ephemeral_messages_duration_one_minute" android:textSize="17sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:textAlignment="textStart" app:useMaterialThemeColors="false" - app:buttonTint="@color/orange_main_500" /> + app:buttonTint="?attr/color_main1_500" /> + android:background="?attr/color_main2_300"/> + app:buttonTint="?attr/color_main1_500" /> + android:background="?attr/color_main2_300"/> + app:buttonTint="?attr/color_main1_500" /> + android:background="?attr/color_main2_300"/> + app:buttonTint="?attr/color_main1_500" /> + android:background="?attr/color_main2_300"/> + app:buttonTint="?attr/color_main1_500" /> + android:background="?attr/color_main2_300"/> + app:buttonTint="?attr/color_main1_500" /> diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index 980d108cc..6a05f8a93 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -32,7 +32,7 @@ + android:background="?attr/color_main2_000"> @@ -63,7 +63,7 @@ android:id="@+id/scrollView" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" android:fillViewport="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -111,7 +111,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{viewModel.isGroup ? viewModel.subject : viewModel.avatarModel.name, default=`John Doe`}" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -139,7 +139,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{viewModel.sipUri, default=`sip:john.doe@sip.example.org`}" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:textSize="14sp" android:visibility="@{viewModel.isGroup ? View.GONE : View.VISIBLE, default=gone}" app:layout_constraintEnd_toEndOf="parent" @@ -152,7 +152,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.avatarModel.lastPresenceInfo, default=@string/friend_presence_status_online}" - android:textColor="@{viewModel.avatarModel.presenceStatus == ConsolidatedPresence.Online ? @color/green_success_500 : @color/orange_warning_600, default=@color/green_success_500}" + android:textColor="@{viewModel.avatarModel.presenceStatus == ConsolidatedPresence.Online ? @color/success_500 : @color/warning_600, default=@color/success_500}" android:textSize="14sp" android:visibility="@{viewModel.isGroup || viewModel.avatarModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" app:layout_constraintEnd_toEndOf="parent" @@ -171,7 +171,7 @@ app:layout_constraintEnd_toStartOf="@id/call" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status" - app:tint="@color/gray_main2_500" /> + app:tint="?attr/color_main2_500" /> + app:tint="?attr/color_main2_500" /> + app:tint="?attr/color_main2_500" /> @@ -385,7 +385,7 @@ @@ -409,7 +409,7 @@ @@ -433,7 +433,7 @@ diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml index 78c0db2a7..40b869544 100644 --- a/app/src/main/res/layout/chat_list_cell.xml +++ b/app/src/main/res/layout/chat_list_cell.xml @@ -100,7 +100,7 @@ android:ellipsize="end" android:text="@{model.isGroup ? model.subject : model.avatarModel.name, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_800" + android:textColor="?attr/color_main2_800" android:textStyle="@{model.unreadMessageCount > 0 ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/right_border" @@ -119,7 +119,7 @@ android:ellipsize="end" android:text="@{model.isBeingDeleted ? @string/conversations_list_is_being_removed_label : model.isComposing ? model.composingLabel : model.lastMessageText, default=`Hello there!`}" android:textSize="14sp" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:textStyle="@{model.isBeingDeleted || model.unreadMessageCount > 0 ? Typeface.BOLD : Typeface.NORMAL}" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toStartOf="@id/right_border" @@ -135,7 +135,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(model.unreadMessageCount), default=`1`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{model.unreadMessageCount > 0 ? View.VISIBLE : View.GONE}" @@ -153,7 +153,7 @@ android:layout_marginEnd="10dp" android:text="@{model.dateTime, default=`16:45`}" android:textSize="12sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name" app:layout_constraintBottom_toBottomOf="@id/name" /> @@ -168,7 +168,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/date_time" app:layout_constraintBottom_toTopOf="@id/separator" - app:tint="@color/orange_main_500" /> + app:tint="?attr/color_main1_500" /> + app:tint="?attr/color_main2_400" /> + app:tint="?attr/color_main2_400" /> + android:background="?attr/color_main1_500"> diff --git a/app/src/main/res/layout/chat_long_press_menu.xml b/app/src/main/res/layout/chat_long_press_menu.xml index c1c44f18c..c5a0e9114 100644 --- a/app/src/main/res/layout/chat_long_press_menu.xml +++ b/app/src/main/res/layout/chat_long_press_menu.xml @@ -30,7 +30,7 @@ + android:background="?attr/color_main2_200"> @@ -40,13 +40,13 @@ app:layout_constraintBottom_toTopOf="@id/bottom_sheet_list" app:tabMode="fixed" app:tabUnboundedRipple="true" - app:tabRippleColor="@color/orange_main_100" + app:tabRippleColor="?attr/color_main1_100" app:tabGravity="fill" app:tabPadding="0dp" app:tabInlineLabel="true" - app:tabIndicatorColor="@color/orange_main_500" - app:tabTextColor="@color/gray_main2_400" - app:tabSelectedTextColor="@color/gray_main2_600" /> + app:tabIndicatorColor="?attr/color_main1_500" + app:tabTextColor="?attr/color_main2_400" + app:tabSelectedTextColor="?attr/color_main2_600" /> diff --git a/app/src/main/res/layout/chat_participant_admin_popup_menu.xml b/app/src/main/res/layout/chat_participant_admin_popup_menu.xml index fd73c9fb7..4814c090c 100644 --- a/app/src/main/res/layout/chat_participant_admin_popup_menu.xml +++ b/app/src/main/res/layout/chat_participant_admin_popup_menu.xml @@ -49,12 +49,12 @@ android:visibility="@{isParticipantContact ? View.VISIBLE : View.GONE}" android:text="@string/conversation_info_menu_go_to_contact" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/address_book" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -73,12 +73,12 @@ android:visibility="@{isParticipantContact ? View.GONE : View.VISIBLE, default=gone}" android:text="@string/conversation_info_menu_add_to_contacts" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/user_plus" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -97,12 +97,12 @@ android:visibility="@{isParticipantAdmin || !isMeAdmin ? View.GONE : View.VISIBLE}" android:text="@string/conversation_info_admin_menu_set_participant_admin" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/user_circle" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -121,12 +121,12 @@ android:visibility="@{isParticipantAdmin && isMeAdmin ? View.VISIBLE : View.GONE, default=gone}" android:text="@string/conversation_info_admin_menu_unset_participant_admin" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/user_circle" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -140,7 +140,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:layout_marginTop="16dp" - android:background="@color/gray_main2_400" + android:background="?attr/color_main2_400" android:visibility="@{isMeAdmin ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -158,13 +158,13 @@ android:layout_marginEnd="20dp" android:text="@string/conversation_info_admin_menu_remove_participant" android:textSize="14sp" - android:textColor="@color/red_danger_500" + android:textColor="?attr/color_danger_500" android:maxLines="1" android:ellipsize="end" android:visibility="@{isMeAdmin ? View.VISIBLE : View.GONE}" android:drawableStart="@drawable/trash_simple" android:drawablePadding="5dp" - app:drawableTint="@color/red_danger_500" + app:drawableTint="?attr/color_danger_500" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml index 4a5bd4385..2a048dd5c 100644 --- a/app/src/main/res/layout/chat_participant_list_cell.xml +++ b/app/src/main/res/layout/chat_participant_list_cell.xml @@ -16,7 +16,7 @@ android:onClick="@{() -> model.onClicked()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="?attr/color_main2_000" android:layout_marginStart="16dp" android:layout_marginEnd="16dp"> @@ -73,7 +73,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/conversation_info_participant_is_admin_label" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:textSize="12sp" android:visibility="@{model.isParticipantAdmin ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toBottomOf="@id/name" @@ -97,7 +97,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 321282480..92fe5b919 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -28,7 +28,7 @@ + android:background="?attr/color_main2_000"> @@ -64,7 +64,7 @@ android:padding="15dp" android:adjustViewBounds="true" android:src="@drawable/pencil_simple" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintBottom_toBottomOf="@id/invisible_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/invisible_title" /> @@ -73,7 +73,7 @@ android:id="@+id/scrollView" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" android:fillViewport="true" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -141,7 +141,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{viewModel.contact.name, default=`John Doe`}" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -154,7 +154,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_success_500 : @color/orange_warning_600, default=@color/green_success_500}" + android:textColor="@{viewModel.contact.presenceStatus == ConsolidatedPresence.Online ? @color/success_500 : @color/warning_600, default=@color/success_500}" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -169,7 +169,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/phone" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toStartOf="@id/chat" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -197,7 +197,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/chat_teardrop_text" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toStartOf="@id/video_call" app:layout_constraintStart_toEndOf="@id/call" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -226,7 +226,7 @@ android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/video_camera" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintStart_toEndOf="@id/chat" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -257,7 +257,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_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/call_label"/> @@ -360,7 +360,7 @@ android:padding="5dp" android:text="@string/contact_details_trust_title" android:drawableEnd="@drawable/question" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:drawablePadding="8dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/info_background"/> @@ -375,7 +375,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_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toEndOf="@id/trust_label" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/info_background"/> @@ -415,8 +415,8 @@ android:layout_marginEnd="16dp" app:trackCornerRadius="50dp" app:trackThickness="22dp" - app:trackColor="@color/gray_main2_100" - app:indicatorColor="@color/blue_info_500" + app:trackColor="?attr/color_main2_100" + app:indicatorColor="?attr/color_info_500" android:max="100" android:progress="75" app:layout_constraintStart_toStartOf="@id/trust_background" @@ -429,7 +429,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:text="75%" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="12sp" android:gravity="center" app:layout_constraintStart_toStartOf="@id/trusted_devices_progress" @@ -496,7 +496,7 @@ @@ -512,7 +512,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_500 : @color/gray_main2_500, default=@color/gray_main2_500}" + android:drawableTint="@{viewModel.isFavourite ? @color/danger_500 : @color/main2_500, default=@color/main2_500}" app:layout_constraintTop_toBottomOf="@id/action_edit" app:layout_constraintStart_toStartOf="@id/actions_background" app:layout_constraintEnd_toEndOf="@id/actions_background"/> @@ -520,7 +520,7 @@ @@ -543,7 +543,7 @@ diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml index 3f568cb4d..59b3b6fbf 100644 --- a/app/src/main/res/layout/contact_list_cell.xml +++ b/app/src/main/res/layout/contact_list_cell.xml @@ -49,7 +49,7 @@ android:layout_marginStart="12dp" android:text="@{model.firstLetter, default=`A`}" android:visibility="@{firstContactStartingByThatLetter ? View.VISIBLE : View.INVISIBLE}" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:textSize="20sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -106,7 +106,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="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 95bb9b361..aee8903d3 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 @@ -27,7 +27,7 @@ android:paddingEnd="20dp" android:text="@={model.value}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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" @@ -45,7 +45,7 @@ android:layout_height="@dimen/icon_size" android:layout_marginStart="10dp" android:src="@drawable/x" - app:tint="@color/gray_main2_700" + app:tint="?attr/color_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 475f38439..ee7bfdbac 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 @@ -22,7 +22,7 @@ + android:background="?attr/color_grey_100"> @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="@dimen/top_bar_height" android:paddingStart="10dp" - android:background="@color/white" + android:background="?attr/color_main2_000" android:text="@{viewModel.isEdit ? @string/contact_edit_title : @string/contact_new_title, default=@string/contact_new_title}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" 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 e966d5ba9..de154d28c 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 @@ -53,7 +53,7 @@ android:layout_marginEnd="10dp" android:src="@drawable/phone" android:visibility="@{model.enabled ? View.VISIBLE : View.GONE}" - app:tint="@color/gray_main2_600" + app:tint="?attr/color_main2_600" app:layout_constraintTop_toTopOf="@id/header" app:layout_constraintBottom_toBottomOf="@id/number_or_address" app:layout_constraintEnd_toEndOf="parent" /> @@ -64,7 +64,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" 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 0e2124edc..e69f8c55d 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="?attr/color_main2_200"> @@ -78,7 +78,7 @@ android:layout_marginEnd="20dp" android:src="@drawable/check" android:visibility="@{seeAllSelected ? View.INVISIBLE : View.VISIBLE}" - app:tint="@color/green_success_500" + app:tint="?attr/color_success_500" app:layout_constraintTop_toTopOf="@id/linphone_filter" app:layout_constraintBottom_toBottomOf="@id/linphone_filter" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml index f03d63f0a..e6c34fd19 100644 --- a/app/src/main/res/layout/contacts_list_fragment.xml +++ b/app/src/main/res/layout/contacts_list_fragment.xml @@ -28,7 +28,7 @@ + android:background="?attr/color_main1_500"> @@ -66,7 +66,7 @@ android:layout_height="0dp" android:layout_marginTop="@dimen/top_bar_height" android:orientation="vertical" - android:background="@color/white" + android:background="?attr/color_main2_000" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -85,7 +85,7 @@ android:layout_marginTop="16dp" android:text="@string/contacts_list_favourites_title" android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_main2_600" /> + android:drawableTint="?attr/color_main2_600" /> 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 e7808e841..abc029793 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="?attr/color_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 1e12f8922..786e70ca4 100644 --- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml @@ -163,7 +163,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_500" + android:textColor="?attr/color_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 c1f71db64..0a5359e12 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/orange_main_500" + app:buttonTint="?attr/color_main1_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_edit_group_conversation_subject.xml b/app/src/main/res/layout/dialog_edit_group_conversation_subject.xml index 5cbff6146..a77140c77 100644 --- a/app/src/main/res/layout/dialog_edit_group_conversation_subject.xml +++ b/app/src/main/res/layout/dialog_edit_group_conversation_subject.xml @@ -56,7 +56,7 @@ android:paddingEnd="20dp" android:text="@={viewModel.subject, default=`Lorem Ipsum`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:background="@drawable/edit_text_background" android:inputType="text|textCapSentences" 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 a2f9f15c7..44b89de76 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 @@ -51,7 +51,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index 129c17320..2a0ae00ef 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -21,7 +21,7 @@ @@ -49,7 +49,7 @@ android:gravity="center_vertical" android:drawableEnd="@drawable/x" android:drawablePadding="15dp" - app:drawableTint="@color/gray_main2_600" + app:drawableTint="?attr/color_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/gray_main2_200" + android:background="?attr/color_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_main2_500" + app:drawableTint="?attr/color_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/microphone_stage" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - app:drawableTint="@color/gray_main2_500" + app:drawableTint="?attr/color_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_main2_500" + app:drawableTint="?attr/color_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 e71685b77..aeaa2a586 100644 --- a/app/src/main/res/layout/drop_down_item.xml +++ b/app/src/main/res/layout/drop_down_item.xml @@ -7,5 +7,5 @@ android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:gravity="center_vertical"/> \ No newline at end of file diff --git a/app/src/main/res/layout/empty_fragment.xml b/app/src/main/res/layout/empty_fragment.xml index 2b5a61afd..12bc2b29e 100644 --- a/app/src/main/res/layout/empty_fragment.xml +++ b/app/src/main/res/layout/empty_fragment.xml @@ -9,7 +9,7 @@ + android:background="?attr/color_main2_000"> diff --git a/app/src/main/res/layout/file_viewer_fragment.xml b/app/src/main/res/layout/file_viewer_fragment.xml index a2d00e1d5..4e6965d47 100644 --- a/app/src/main/res/layout/file_viewer_fragment.xml +++ b/app/src/main/res/layout/file_viewer_fragment.xml @@ -44,7 +44,7 @@ app:layout_constraintBottom_toTopOf="@id/file_name" app:layout_constraintStart_toStartOf="@id/pdf_view_pager" app:layout_constraintEnd_toEndOf="@id/pdf_view_pager" - app:tint="@color/orange_main_500"/> + app:tint="?attr/color_main1_500"/> @@ -101,7 +101,7 @@ android:id="@+id/title" android:layout_width="0dp" android:layout_height="@dimen/top_bar_height" - android:background="@color/white" + android:background="?attr/color_main2_000" android:paddingStart="10dp" android:paddingEnd="10dp" android:text="" @@ -115,12 +115,12 @@ android:onClick="@{shareClickListener}" android:layout_width="wrap_content" android:layout_height="0dp" - android:background="@color/white" + android:background="?attr/color_main2_000" android:adjustViewBounds="true" android:padding="15dp" android:src="@drawable/share_network" android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toStartOf="@id/save" app:layout_constraintTop_toTopOf="@id/title" /> @@ -130,12 +130,12 @@ android:onClick="@{() -> viewModel.exportToMediaStore()}" android:layout_width="wrap_content" android:layout_height="0dp" - android:background="@color/white" + android:background="?attr/color_main2_000" android:adjustViewBounds="true" android:padding="15dp" android:src="@drawable/download_simple" android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -145,12 +145,12 @@ android:id="@+id/file_name" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@color/white" + android:background="?attr/color_main2_000" android:paddingTop="16dp" android:paddingBottom="16dp" android:text="@{viewModel.fileName, default=`nomdufichier.jpg\nenvoyé le 02/05/2023 à 11h05`}" android:textSize="12sp" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:textAlignment="center" android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/generic_add_participants_fragment.xml b/app/src/main/res/layout/generic_add_participants_fragment.xml index e2341d076..b46d16f43 100644 --- a/app/src/main/res/layout/generic_add_participants_fragment.xml +++ b/app/src/main/res/layout/generic_add_participants_fragment.xml @@ -19,7 +19,7 @@ + android:background="?attr/color_main2_000"> @@ -96,7 +96,7 @@ android:background="@drawable/edit_text_background" android:drawableStart="@drawable/magnifying_glass" android:drawablePadding="10dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:hint="@string/new_conversation_search_bar_filter_hint" android:inputType="textPersonName|textNoSuggestions" android:paddingStart="15dp" @@ -122,7 +122,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_main2_600" /> + app:tint="?attr/color_main2_600" /> + android:background="?attr/color_main2_000"> @@ -65,7 +65,7 @@ android:layout_marginEnd="16dp" android:text="@string/help_troubleshooting_debug_subtitle" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" app:layout_constraintTop_toBottomOf="@id/debug_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/debug_mode_switch" /> @@ -134,7 +134,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/info" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/version_title" app:layout_constraintTop_toTopOf="@id/version_title" diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml index 5a259ecee..dc7ef607b 100644 --- a/app/src/main/res/layout/help_fragment.xml +++ b/app/src/main/res/layout/help_fragment.xml @@ -29,7 +29,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" - android:background="@color/white"> + android:background="?attr/color_main2_000"> @@ -80,7 +80,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/detective" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/privacy_policy_title" app:layout_constraintTop_toTopOf="@id/privacy_policy_title" @@ -110,7 +110,7 @@ android:layout_marginEnd="16dp" android:text="@string/help_about_privacy_policy_subtitle" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" app:layout_constraintTop_toBottomOf="@id/privacy_policy_title" app:layout_constraintStart_toEndOf="@id/privacy_policy_icon" app:layout_constraintEnd_toEndOf="parent" /> @@ -121,7 +121,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/info" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/version_title" app:layout_constraintTop_toTopOf="@id/version_title" @@ -149,7 +149,7 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.version, default=`6.0.0`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" app:layout_constraintTop_toBottomOf="@id/version_title" app:layout_constraintStart_toEndOf="@id/version_icon" app:layout_constraintEnd_toStartOf="@id/check_for_update" /> @@ -182,7 +182,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/check_square_offset" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/open_source_licenses_title" app:layout_constraintTop_toTopOf="@id/open_source_licenses_title" @@ -212,7 +212,7 @@ android:layout_marginEnd="16dp" android:text="@string/help_about_open_source_licenses_subtitle" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_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" /> @@ -224,7 +224,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/globe_hemisphere_west" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/translate_title" app:layout_constraintTop_toTopOf="@id/translate_title" @@ -263,7 +263,7 @@ android:layout_height="32dp" android:layout_marginStart="16dp" android:src="@drawable/wrench" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/debug_title" app:layout_constraintTop_toTopOf="@id/debug_title" @@ -282,7 +282,7 @@ android:text="@string/help_troubleshooting_title" android:drawableEnd="@drawable/caret_right" android:drawablePadding="8dp" - app:drawableTint="@color/gray_main2_500" + app:drawableTint="?attr/color_main2_500" app:layout_constraintVertical_bias="0" app:layout_constraintTop_toBottomOf="@id/advanced_title" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/history_contact_fragment.xml b/app/src/main/res/layout/history_contact_fragment.xml index bfeceb40f..283c5d817 100644 --- a/app/src/main/res/layout/history_contact_fragment.xml +++ b/app/src/main/res/layout/history_contact_fragment.xml @@ -25,7 +25,7 @@ + android:background="?attr/color_main2_000"> @@ -61,7 +61,7 @@ android:padding="15dp" android:adjustViewBounds="true" android:src="@drawable/dots_three_vertical" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/title" /> @@ -70,7 +70,7 @@ android:id="@+id/scrollView" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/gray_100" + android:background="?attr/color_grey_100" android:fillViewport="true" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -129,7 +129,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{viewModel.callLogModel.avatarModel.name, default=`John Doe`}" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" @@ -145,7 +145,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{viewModel.callLogModel.displayedAddress, default=`+33601020304`}" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" @@ -161,7 +161,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_success_500 : @color/orange_warning_600, default=@color/green_success_500}" + android:textColor="@{viewModel.callLogModel.avatarModel.presenceStatus == ConsolidatedPresence.Online ? @color/success_500 : @color/warning_600, default=@color/success_500}" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -177,7 +177,7 @@ android:padding="16dp" android:src="@drawable/phone" android:visibility="@{viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toStartOf="@id/chat" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -206,7 +206,7 @@ android:padding="16dp" android:src="@drawable/chat_teardrop_text" android:visibility="@{viewModel.chatDisabled || viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toStartOf="@id/video_call" app:layout_constraintStart_toEndOf="@id/call" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -235,7 +235,7 @@ android:padding="16dp" android:src="@drawable/video_camera" android:visibility="@{viewModel.videoCallDisabled || viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintStart_toEndOf="@id/chat" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> @@ -264,7 +264,7 @@ android:padding="16dp" android:src="@drawable/meeting" android:visibility="@{viewModel.isConferenceCallLog ? View.VISIBLE : View.GONE, default=gone}" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status" /> diff --git a/app/src/main/res/layout/history_contact_list_cell.xml b/app/src/main/res/layout/history_contact_list_cell.xml index f9d089504..a0549d00d 100644 --- a/app/src/main/res/layout/history_contact_list_cell.xml +++ b/app/src/main/res/layout/history_contact_list_cell.xml @@ -36,7 +36,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_main2_700" + android:textColor="?attr/color_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_main2_600 : @color/red_danger_500, default=@color/gray_main2_600}" + android:textColor="@{model.isSuccessful ? @color/main2_600 : @color/danger_500, default=@color/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/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/history_contact_popup_menu.xml b/app/src/main/res/layout/history_contact_popup_menu.xml index fbebd2b52..cf1067aea 100644 --- a/app/src/main/res/layout/history_contact_popup_menu.xml +++ b/app/src/main/res/layout/history_contact_popup_menu.xml @@ -44,10 +44,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_add_address_to_contacts" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:drawableStart="@drawable/plus_circle" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -67,10 +67,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_see_existing_contact" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:drawableStart="@drawable/user_circle" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/add_to_contact" @@ -88,10 +88,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_copy_sip_address" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:drawableStart="@drawable/copy" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_700" + app:drawableTint="?attr/color_main2_700" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/go_to_contact" @@ -110,10 +110,10 @@ android:gravity="start|center_vertical" android:text="@string/menu_delete_history" android:textSize="14sp" - android:textColor="@color/red_danger_500" + android:textColor="?attr/color_danger_500" android:drawableStart="@drawable/trash_simple" android:drawablePadding="5dp" - app:drawableTint="@color/red_danger_500" + app:drawableTint="?attr/color_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/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml index b9da75845..fe4c0cc37 100644 --- a/app/src/main/res/layout/history_list_cell.xml +++ b/app/src/main/res/layout/history_list_cell.xml @@ -74,7 +74,7 @@ android:layout_marginStart="10dp" android:text="@{model.avatarModel.name, default=`John Doe`}" android:textSize="14sp" - android:textColor="@color/gray_main2_700" + android:textColor="?attr/color_main2_700" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/date_time"/> @@ -110,7 +110,7 @@ android:layout_height="@dimen/icon_size" android:layout_marginEnd="6dp" android:src="@drawable/phone" - app:tint="@color/gray_main2_500" + app:tint="?attr/color_main2_500" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name" app:layout_constraintBottom_toBottomOf="@id/date_time" /> @@ -120,7 +120,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml index b834725a5..afcfe4eb0 100644 --- a/app/src/main/res/layout/history_list_fragment.xml +++ b/app/src/main/res/layout/history_list_fragment.xml @@ -34,7 +34,7 @@ + android:background="?attr/color_main1_500"> @@ -70,7 +70,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@color/white" + android:src="?attr/color_main2_000" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -126,8 +126,8 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/phone_plus" - app:tint="@color/gray_main2_700" - app:backgroundTint="@color/white" + app:tint="?attr/color_main2_700" + app:backgroundTint="?attr/color_main2_000" app:shapeAppearanceOverlay="@style/rounded" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" /> diff --git a/app/src/main/res/layout/history_list_long_press_menu.xml b/app/src/main/res/layout/history_list_long_press_menu.xml index 3be5c8f2a..a077f0f31 100644 --- a/app/src/main/res/layout/history_list_long_press_menu.xml +++ b/app/src/main/res/layout/history_list_long_press_menu.xml @@ -24,7 +24,7 @@ + android:background="?attr/color_main2_200"> diff --git a/app/src/main/res/layout/main_activity_notification_top_bar.xml b/app/src/main/res/layout/main_activity_notification_top_bar.xml index d13ab1cfa..4f5e8b8a5 100644 --- a/app/src/main/res/layout/main_activity_notification_top_bar.xml +++ b/app/src/main/res/layout/main_activity_notification_top_bar.xml @@ -13,7 +13,7 @@ + app:tint="?attr/color_main2_000" /> + android:background="?attr/color_main2_000"> @@ -102,12 +102,12 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.subject, default=`Broadcast about agility in software development`}" android:textSize="20sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="2" android:ellipsize="end" android:drawableStart="@{viewModel.isBroadcast ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:background="@color/transparent_color" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -118,7 +118,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/subject" /> @@ -133,12 +133,12 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.sipUri, default=`linphone.com/wjre.fr`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/video_camera" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintTop_toBottomOf="@id/separator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/share" /> @@ -165,12 +165,12 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.dateTime, default=`October 11th, 2023 | 17:00 - 18:00`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/clock" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintTop_toBottomOf="@id/sip_uri" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -185,12 +185,12 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.timezone, default=@string/meeting_schedule_timezone_title}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/globe_hemisphere_west" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintTop_toBottomOf="@id/date_time" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -200,7 +200,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/timezone" /> @@ -215,12 +215,12 @@ android:layout_marginEnd="16dp" android:text="@{viewModel.description, default=`Lorem ipsum dolor sit amet`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="3" android:ellipsize="end" android:drawableStart="@drawable/file_text" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:visibility="@{viewModel.description.length() > 0 ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toBottomOf="@id/separator_2" app:layout_constraintStart_toStartOf="parent" @@ -231,7 +231,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="@{viewModel.description.length() > 0 ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -254,7 +254,7 @@ android:visibility="@{viewModel.isBroadcast ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toBottomOf="@id/separator_3" app:layout_constraintStart_toStartOf="parent" - app:tint="@color/gray_main2_600" /> + app:tint="?attr/color_main2_600" /> + app:tint="?attr/color_main2_600"/> diff --git a/app/src/main/res/layout/meeting_list_cell.xml b/app/src/main/res/layout/meeting_list_cell.xml index 7c71e8649..8b6aecb88 100644 --- a/app/src/main/res/layout/meeting_list_cell.xml +++ b/app/src/main/res/layout/meeting_list_cell.xml @@ -30,7 +30,7 @@ android:layout_marginStart="10dp" android:text="@string/meetings_list_today_indicator" android:textSize="12sp" - android:textColor="@color/orange_main_500" + android:textColor="?attr/color_main1_500" android:visibility="@{model.displayTodayIndicator ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toTopOf="parent" /> @@ -38,7 +38,7 @@ android:id="@+id/today_separator" android:layout_width="match_parent" android:layout_height="2dp" - android:background="@color/orange_main_500" + android:background="?attr/color_main1_500" android:visibility="@{model.displayTodayIndicator ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/today_indicator" /> @@ -51,7 +51,7 @@ android:layout_marginStart="5dp" android:text="@{model.day, default=`Mon.`}" android:visibility="@{model.firstMeetingOfTheDay ? View.VISIBLE : View.INVISIBLE}" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:textSize="14sp" app:layout_constraintStart_toStartOf="@id/header_day_number" app:layout_constraintEnd_toEndOf="@id/header_day_number" @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:text="@{model.dayNumber, default=`19`}" android:visibility="@{model.firstMeetingOfTheDay ? View.VISIBLE : View.INVISIBLE}" - android:textColor="@{model.isToday ? @color/white : @color/gray_main2_500, default=@color/gray_main2_500}" + android:textColor="@{model.isToday ? @color/main2_000 : @color/main2_500, default=@color/main2_500}" android:textSize="20sp" android:paddingBottom="4dp" app:layout_constraintStart_toStartOf="@id/today_background" @@ -109,7 +109,7 @@ android:layout_marginEnd="16dp" android:text="@{model.subject, default=`Meeting with John`}" android:textSize="13sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:ellipsize="end" android:drawableStart="@{model.isBroadcast ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}" @@ -129,7 +129,7 @@ android:layout_marginEnd="16dp" android:text="@{model.time, default=`10:00 - 12:00`}" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:maxLines="1" android:ellipsize="end" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/meeting_participant_list_cell.xml b/app/src/main/res/layout/meeting_participant_list_cell.xml index 15d239de4..b5ff9f96d 100644 --- a/app/src/main/res/layout/meeting_participant_list_cell.xml +++ b/app/src/main/res/layout/meeting_participant_list_cell.xml @@ -62,7 +62,7 @@ android:layout_marginEnd="10dp" android:text="@string/meeting_info_organizer_label" android:textSize="12sp" - android:textColor="@color/gray_main2_400" + android:textColor="?attr/color_main2_400" android:gravity="center" android:visibility="@{model.isOrganizer ? View.VISIBLE : View.GONE}" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/meeting_popup_menu.xml b/app/src/main/res/layout/meeting_popup_menu.xml index 8f3e1d5a0..80c38b00d 100644 --- a/app/src/main/res/layout/meeting_popup_menu.xml +++ b/app/src/main/res/layout/meeting_popup_menu.xml @@ -30,10 +30,10 @@ android:layout_marginEnd="20dp" android:text="@string/meeting_info_export_as_calendar_event" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:drawableStart="@drawable/calendar_blank" android:drawablePadding="5dp" - app:drawableTint="@color/gray_main2_500" + app:drawableTint="?attr/color_main2_500" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -52,10 +52,10 @@ android:layout_marginEnd="20dp" android:text="@string/meeting_info_delete" android:textSize="14sp" - android:textColor="@color/red_danger_500" + android:textColor="?attr/color_danger_500" android:drawableStart="@drawable/trash_simple" android:drawablePadding="5dp" - app:drawableTint="@color/red_danger_500" + app:drawableTint="?attr/color_danger_500" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml index d45bd6174..bd13f46eb 100644 --- a/app/src/main/res/layout/meeting_schedule_fragment.xml +++ b/app/src/main/res/layout/meeting_schedule_fragment.xml @@ -35,7 +35,7 @@ + android:background="?attr/color_main2_000"> @@ -193,7 +193,7 @@ android:paddingEnd="16dp" android:text="@string/meeting_schedule_broadcast_help" android:textSize="14sp" - android:textColor="@color/gray_main2_500" + android:textColor="?attr/color_main2_500" android:drawableStart="@drawable/info" android:drawablePadding="5dp" android:gravity="center" @@ -224,14 +224,14 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:hint="@string/meeting_schedule_subject_hint" - android:textColorHint="@color/gray_main2_600" + android:textColorHint="?attr/color_main2_600" android:text="@={viewModel.subject}" android:textSize="20sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:inputType="text|textCapSentences" android:drawableStart="@{viewModel.isBroadcastSelected ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:background="@color/transparent_color" app:layout_constraintTop_toBottomOf="@id/broadcast_help" app:layout_constraintStart_toStartOf="parent" @@ -245,7 +245,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/subject" - android:background="@color/gray_main2_200" /> + android:background="?attr/color_main2_200" /> @@ -299,7 +299,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.fromTime, default=`17:00`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:visibility="@{viewModel.allDayMeeting ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="@id/all_day_switch" app:layout_constraintTop_toTopOf="@id/from_date" /> @@ -313,7 +313,7 @@ android:layout_marginTop="16dp" android:text="@{viewModel.toDate, default=`Tue. October 10th, 2023`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:visibility="@{viewModel.allDayMeeting ? View.GONE : View.VISIBLE}" app:layout_constraintStart_toStartOf="@id/from_date" app:layout_constraintTop_toBottomOf="@id/from_date" /> @@ -326,7 +326,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.toTime, default=`17:00`}" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:visibility="@{viewModel.allDayMeeting ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toEndOf="@id/all_day_switch" app:layout_constraintTop_toTopOf="@id/to_date" /> @@ -340,13 +340,13 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{viewModel.timezone, default=@string/meeting_schedule_timezone_title}" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" android:drawableStart="@drawable/globe_hemisphere_west" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/to_date" /> @@ -360,11 +360,11 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@string/meeting_schedule_one_time_label" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="14sp" android:drawableStart="@drawable/arrow_clockwise" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/timezone" /> @@ -377,7 +377,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/repeat" - android:background="@color/gray_main2_200" /> + android:background="?attr/color_main2_200" /> + android:background="?attr/color_main2_200" /> + android:background="?attr/color_main2_200" /> + android:background="?attr/color_main2_200" /> + android:background="?attr/color_grey_900"> @@ -38,7 +38,7 @@ android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:text="@{viewModel.subject, default=`Meeting with John Doe`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" app:layout_constraintTop_toTopOf="parent"/> @@ -52,7 +52,7 @@ android:layout_marginEnd="10dp" android:text="@{viewModel.dateTime, default=`Wed. 25 Oct. 14:00 - 15:00`}" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" app:layout_constraintTop_toBottomOf="@id/title"/> @@ -101,7 +101,7 @@ android:layout_marginStart="12dp" android:layout_marginBottom="8dp" android:text="@{viewModel.selfAvatar.name, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="@id/no_video_background" app:layout_constraintStart_toStartOf="@id/no_video_background" /> @@ -115,7 +115,7 @@ android:layout_marginTop="10dp" android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled && viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}" android:src="@drawable/camera_rotate" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintTop_toTopOf="@id/video_preview" app:layout_constraintEnd_toEndOf="@id/video_preview" /> diff --git a/app/src/main/res/layout/meetings_list_decoration.xml b/app/src/main/res/layout/meetings_list_decoration.xml index 015af597d..2a18742df 100644 --- a/app/src/main/res/layout/meetings_list_decoration.xml +++ b/app/src/main/res/layout/meetings_list_decoration.xml @@ -9,7 +9,7 @@ + android:background="?attr/color_main1_500"> @@ -67,7 +67,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@color/white" + android:src="?attr/color_main2_000" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -123,8 +123,8 @@ android:layout_gravity="end|bottom" android:layout_margin="16dp" android:src="@drawable/plus_circle" - app:tint="@color/gray_main2_700" - app:backgroundTint="@color/white" + app:tint="?attr/color_main2_700" + app:backgroundTint="?attr/color_main2_000" app:shapeAppearanceOverlay="@style/rounded" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" /> diff --git a/app/src/main/res/layout/meetings_list_long_press_menu.xml b/app/src/main/res/layout/meetings_list_long_press_menu.xml index 8bdb82b04..931b4cf63 100644 --- a/app/src/main/res/layout/meetings_list_long_press_menu.xml +++ b/app/src/main/res/layout/meetings_list_long_press_menu.xml @@ -12,7 +12,7 @@ + android:background="?attr/color_main2_200"> @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - app:indicatorColor="@color/orange_main_500" + app:indicatorColor="?attr/color_main1_500" android:indeterminate="true" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintTop_toTopOf="@id/dialog_background" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/operation_in_progress_overlay" - android:textColor="@color/orange_main_500" + android:textColor="?attr/color_main1_500" android:textSize="18sp" android:layout_below="@id/progress" android:layout_centerHorizontal="true" diff --git a/app/src/main/res/layout/recordings_fragment.xml b/app/src/main/res/layout/recordings_fragment.xml index 2092a8944..22f0482ec 100644 --- a/app/src/main/res/layout/recordings_fragment.xml +++ b/app/src/main/res/layout/recordings_fragment.xml @@ -13,7 +13,7 @@ + android:background="?attr/color_main2_000"> diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml index 5a5d401d1..9a6b47ebc 100644 --- a/app/src/main/res/layout/settings_fragment.xml +++ b/app/src/main/res/layout/settings_fragment.xml @@ -16,7 +16,7 @@ + android:background="?attr/color_main2_000"> @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:fillViewport="true" - android:background="@color/gray_100" + android:background="?attr/color_grey_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_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml index 21e0df0cb..6f2a0ef95 100644 --- a/app/src/main/res/layout/start_call_fragment.xml +++ b/app/src/main/res/layout/start_call_fragment.xml @@ -23,7 +23,7 @@ + android:background="?attr/color_main2_000"> @@ -70,7 +70,7 @@ android:background="@drawable/edit_text_background" android:drawableStart="@drawable/magnifying_glass" android:drawablePadding="10dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:hint="@string/history_call_start_search_bar_filter_hint" android:inputType="textPersonName|textNoSuggestions" android:paddingStart="15dp" @@ -96,7 +96,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_main2_600" /> + app:tint="?attr/color_main2_600" /> + app:tint="?attr/color_main2_600" /> + app:tint="?attr/color_main2_000" /> @@ -182,7 +182,7 @@ android:src="@drawable/phone" android:elevation="3dp" android:background="@drawable/squircle_green_button_background" - app:tint="@color/white" + app:tint="?attr/color_main2_000" app:layout_constraintTop_toBottomOf="@id/flow" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/start_call_suggestion_list_cell.xml b/app/src/main/res/layout/start_call_suggestion_list_cell.xml index 653125fe4..bfd964be7 100644 --- a/app/src/main/res/layout/start_call_suggestion_list_cell.xml +++ b/app/src/main/res/layout/start_call_suggestion_list_cell.xml @@ -50,7 +50,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/gray_main2_200" + android:background="?attr/color_main2_200" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/start_call_suggestion_list_decoration.xml b/app/src/main/res/layout/start_call_suggestion_list_decoration.xml index 22580d364..077850db6 100644 --- a/app/src/main/res/layout/start_call_suggestion_list_decoration.xml +++ b/app/src/main/res/layout/start_call_suggestion_list_decoration.xml @@ -9,7 +9,7 @@ + android:background="?attr/color_main2_000"> @@ -81,7 +81,7 @@ android:layout_marginTop="16dp" android:text="@string/required" android:textSize="12sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" app:layout_constraintEnd_toEndOf="@id/group_name" app:layout_constraintTop_toTopOf="@id/background" /> @@ -98,7 +98,7 @@ android:text="@={viewModel.subject, default=`Dummy subject`}" android:hint="@string/new_conversation_group_name_title" android:textSize="14sp" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:maxLines="1" android:background="@drawable/edit_text_background" android:inputType="text|textCapSentences" @@ -148,7 +148,7 @@ android:background="@drawable/edit_text_background" android:drawableStart="@drawable/magnifying_glass" android:drawablePadding="10dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:hint="@string/new_conversation_search_bar_filter_hint" android:inputType="textPersonName|textNoSuggestions" android:paddingStart="15dp" @@ -174,7 +174,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_main2_600" /> + app:tint="?attr/color_main2_600" /> + app:tint="?attr/color_main2_000" /> + android:background="?attr/color_main1_500"> + app:tint="?attr/color_on_main" /> + app:tint="?attr/color_on_main" /> + app:tint="?attr/color_on_main" /> diff --git a/app/src/main/res/layout/welcome_activity.xml b/app/src/main/res/layout/welcome_activity.xml index 5a87a7f85..326cfa60c 100644 --- a/app/src/main/res/layout/welcome_activity.xml +++ b/app/src/main/res/layout/welcome_activity.xml @@ -54,12 +54,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp" - app:dotsColor="@color/gray_main2_200" + app:dotsColor="?attr/color_main2_200" app:dotsCornerRadius="8dp" app:dotsSize="13dp" app:dotsSpacing="5dp" app:dotsWidthFactor="2.5" - app:selectedDotColor="@color/orange_main_500" + app:selectedDotColor="?attr/color_main1_500" app:progressMode="false" app:layout_constraintTop_toBottomOf="@id/pager" app:layout_constraintBottom_toTopOf="@id/next" diff --git a/app/src/main/res/layout/welcome_page_1.xml b/app/src/main/res/layout/welcome_page_1.xml index 2ebd95be2..fe791afdf 100644 --- a/app/src/main/res/layout/welcome_page_1.xml +++ b/app/src/main/res/layout/welcome_page_1.xml @@ -24,7 +24,7 @@ android:layout_marginStart="65dp" android:layout_marginTop="16dp" android:text="@string/welcome_page_title" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -37,7 +37,7 @@ android:layout_marginEnd="65dp" android:paddingBottom="16dp" android:text="@string/welcome_page_subtitle" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> @@ -48,7 +48,7 @@ android:layout_height="@dimen/welcome_icon_size" android:layout_marginTop="110dp" android:src="@drawable/welcome_linphone_logo" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/title_second_line" app:layout_constraintStart_toStartOf="parent" @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/app_name" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="29sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/image" @@ -77,7 +77,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="25dp" android:text="@string/welcome_page_1_message" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="14sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/page_title" diff --git a/app/src/main/res/layout/welcome_page_2.xml b/app/src/main/res/layout/welcome_page_2.xml index 90c4cc27d..8ae8c065a 100644 --- a/app/src/main/res/layout/welcome_page_2.xml +++ b/app/src/main/res/layout/welcome_page_2.xml @@ -24,7 +24,7 @@ android:layout_marginStart="65dp" android:layout_marginTop="16dp" android:text="@string/welcome_page_title" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -37,7 +37,7 @@ android:layout_marginEnd="65dp" android:paddingBottom="16dp" android:text="@string/welcome_page_subtitle" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> @@ -48,7 +48,7 @@ android:layout_height="@dimen/welcome_icon_size" android:layout_marginTop="110dp" android:src="@drawable/welcome_secured_logo" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/title_second_line" app:layout_constraintStart_toStartOf="parent" @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/welcome_page_2_title" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="29sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/image" @@ -77,7 +77,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="25dp" android:text="@string/welcome_page_2_message" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="14sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/page_title" diff --git a/app/src/main/res/layout/welcome_page_3.xml b/app/src/main/res/layout/welcome_page_3.xml index de9fbfc3e..d276ad671 100644 --- a/app/src/main/res/layout/welcome_page_3.xml +++ b/app/src/main/res/layout/welcome_page_3.xml @@ -24,7 +24,7 @@ android:layout_marginStart="65dp" android:layout_marginTop="16dp" android:text="@string/welcome_page_title" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -37,7 +37,7 @@ android:layout_marginEnd="65dp" android:paddingBottom="16dp" android:text="@string/welcome_page_subtitle" - android:textColor="@color/white" + android:textColor="?attr/color_main2_000" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> @@ -48,7 +48,7 @@ android:layout_height="@dimen/welcome_icon_size" android:layout_marginTop="110dp" android:src="@drawable/welcome_open_source_logo" - app:tint="@color/orange_main_500" + app:tint="?attr/color_main1_500" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/title_second_line" app:layout_constraintStart_toStartOf="parent" @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="@string/welcome_page_3_title" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="29sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/image" @@ -77,7 +77,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="25dp" android:text="@string/welcome_page_3_message" - android:textColor="@color/gray_main2_600" + android:textColor="?attr/color_main2_600" android:textSize="14sp" android:gravity="center" app:layout_constraintTop_toBottomOf="@id/page_title" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml deleted file mode 100644 index bebe91daa..000000000 --- a/app/src/main/res/values-night/colors.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - #00000000 - #FFFFFF - #000000 - - #D13400 - #FF5E00 - #FFB266 - #4D2E00 - #80FFEACB - - #2A3F5F - #364860 - #4E6074 - #6C7A87 - #9AABB5 - #30454F - #142932 - #191919 - - #131313 - #1F1F1F - #C9C9C9 - #949494 - #4E4E4E - #CFD1D1 - #E7D2D8 - #FFFFFF - - #57200D - #E17474 - #B13B51 - #843B3B - - #60B78D - #60B78D - #0D6A27 - - #64B4FF - - #E1C133 - - #FF923F - #80FFFFFF - \ 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 02344ec9d..74e7f80c8 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -9,11 +9,44 @@ shortEdges true - @color/white - + @color/black - \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 4a83f3dea..213b08bbb 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -9,4 +9,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c2f74855f..bb2cdd383 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,42 +4,61 @@ #000000 #FFFFFF - #B72D00 - #FF5E00 - #FFB266 #FFEACB #80FFEACB + #FFB266 + #FF5E00 + #B72D00 - #22334D - #364860 - #4E6074 - #6C7A87 - #9AABB5 - #C0D1D9 - #DFECF2 #EEF6F8 + #191919 + #DFECF2 + #142932 + #C0D1D9 + #30454F + #9AABB5 + #4E6074 + #6C7A87 + #4E6074 + #9AABB5 + #364860 + #C0D1D9 + #22334D + #2A3F5F #F9F9F9 + #131313 #EDEDED + #1F1F1F #C9C9C9 #949494 #4E4E4E #2E3030 + #CFD1D1 #0F0F0F + #E7D2D8 #070707 + #FFFFFF - #F5CCBE #DD5F5F + #E17474 #9E3548 + #B13B51 #723333 + #843B3B - #4FAE80 - #377D71 #ACF5C1 + #0D6A27 + #4FAE80 + #60B78D + #377D71 + #3F8F81 #4AA8FF + #64B4FF #DBB820 + #E1C133 #FF923F #80FFFFFF diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ef4b91017..bfb0ee4ce 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -2,68 +2,68 @@