diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt index 056816af2..9e971a571 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt @@ -125,6 +125,9 @@ class CallFragment : GenericFragment() { goBack() // TODO FIXME : issue with tablet when pane can't be closed } } + + // TODO: remove later + binding.chat.isEnabled = false } private fun copyNumberOrAddressToClipboard(value: String) { diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt index 438c403dc..244e5b515 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt @@ -198,6 +198,9 @@ class ContactFragment : GenericFragment() { showConfirmTrustCallDialog(pair.first, pair.second) } } + + // TODO: remove later + binding.chat.isEnabled = false } override fun onPause() { diff --git a/app/src/main/res/drawable/action_background.xml b/app/src/main/res/drawable/action_background.xml index 129bdf857..7c5b2c70e 100644 --- a/app/src/main/res/drawable/action_background.xml +++ b/app/src/main/res/drawable/action_background.xml @@ -1,9 +1,9 @@ + android:drawable="@drawable/shape_rectangle_gray_background" /> + android:drawable="@drawable/shape_rectangle_gray_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/call_chat_button_background.xml b/app/src/main/res/drawable/call_chat_button_background.xml deleted file mode 100644 index 3128accc4..000000000 --- a/app/src/main/res/drawable/call_chat_button_background.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/cell_background.xml b/app/src/main/res/drawable/cell_background.xml index 52484d34d..fbc9e3cc0 100644 --- a/app/src/main/res/drawable/cell_background.xml +++ b/app/src/main/res/drawable/cell_background.xml @@ -1,9 +1,9 @@ + android:drawable="@drawable/shape_rectangle_gray_background" /> + android:drawable="@drawable/shape_rectangle_gray_background" /> + android:drawable="@drawable/shape_rectangle_white_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_green_button_background.xml b/app/src/main/res/drawable/circle_green_button_background.xml new file mode 100644 index 000000000..2e9b062ed --- /dev/null +++ b/app/src/main/res/drawable/circle_green_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_light_blue_button_background.xml b/app/src/main/res/drawable/circle_light_blue_button_background.xml new file mode 100644 index 000000000..88b35c53a --- /dev/null +++ b/app/src/main/res/drawable/circle_light_blue_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_white_button_background.xml b/app/src/main/res/drawable/circle_white_button_background.xml new file mode 100644 index 000000000..e2feca243 --- /dev/null +++ b/app/src/main/res/drawable/circle_white_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/menu_item_background.xml b/app/src/main/res/drawable/menu_item_background.xml index 56fc80698..72c6a78a2 100644 --- a/app/src/main/res/drawable/menu_item_background.xml +++ b/app/src/main/res/drawable/menu_item_background.xml @@ -1,9 +1,9 @@ + android:drawable="@drawable/shape_rectangle_gray_background" /> + android:drawable="@drawable/shape_rectangle_gray_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_green_pressed_background.xml b/app/src/main/res/drawable/shape_circle_green_pressed_background.xml new file mode 100644 index 000000000..4539ffb87 --- /dev/null +++ b/app/src/main/res/drawable/shape_circle_green_pressed_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_avatar_background.xml b/app/src/main/res/drawable/shape_circle_light_blue_background.xml similarity index 73% rename from app/src/main/res/drawable/shape_avatar_background.xml rename to app/src/main/res/drawable/shape_circle_light_blue_background.xml index 23e9ddfb0..9140653db 100644 --- a/app/src/main/res/drawable/shape_avatar_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_button_round_pressed.xml b/app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_button_round_pressed.xml rename to app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml diff --git a/app/src/main/res/drawable/shape_button_round.xml b/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml similarity index 73% rename from app/src/main/res/drawable/shape_button_round.xml rename to app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml index 23e9ddfb0..6f4cde864 100644 --- a/app/src/main/res/drawable/shape_button_round.xml +++ b/app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_white_pressed_background.xml b/app/src/main/res/drawable/shape_circle_white_pressed_background.xml new file mode 100644 index 000000000..f396103cd --- /dev/null +++ b/app/src/main/res/drawable/shape_circle_white_pressed_background.xml @@ -0,0 +1,5 @@ + + + + + \ 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 7946b3661..05e6dd4e5 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_selected_list_cell_background.xml b/app/src/main/res/drawable/shape_rectangle_gray_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_selected_list_cell_background.xml rename to app/src/main/res/drawable/shape_rectangle_gray_background.xml diff --git a/app/src/main/res/drawable/shape_list_cell_background.xml b/app/src/main/res/drawable/shape_rectangle_white_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_list_cell_background.xml rename to app/src/main/res/drawable/shape_rectangle_white_background.xml diff --git a/app/src/main/res/drawable/shape_chip_gray_background.xml b/app/src/main/res/drawable/shape_squircle_gray_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_chip_gray_background.xml rename to app/src/main/res/drawable/shape_squircle_gray_background.xml diff --git a/app/src/main/res/drawable/shape_answer_button_background.xml b/app/src/main/res/drawable/shape_squircle_green_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_answer_button_background.xml rename to app/src/main/res/drawable/shape_squircle_green_background.xml 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 new file mode 100644 index 000000000..e9370e89e --- /dev/null +++ b/app/src/main/res/drawable/shape_squircle_green_pressed_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_dialog_orange_shadow.xml b/app/src/main/res/drawable/shape_squircle_primary_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_dialog_orange_shadow.xml rename to app/src/main/res/drawable/shape_squircle_primary_background.xml diff --git a/app/src/main/res/drawable/shape_hang_up_button_background.xml b/app/src/main/res/drawable/shape_squircle_red_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_hang_up_button_background.xml rename to app/src/main/res/drawable/shape_squircle_red_background.xml diff --git a/app/src/main/res/drawable/shape_round_white_background.xml b/app/src/main/res/drawable/shape_squircle_red_disabled_background.xml similarity index 58% rename from app/src/main/res/drawable/shape_round_white_background.xml rename to app/src/main/res/drawable/shape_squircle_red_disabled_background.xml index 706ef93e2..1ee158c3f 100644 --- a/app/src/main/res/drawable/shape_round_white_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_white_background.xml b/app/src/main/res/drawable/shape_squircle_red_pressed_background.xml similarity index 58% rename from app/src/main/res/drawable/shape_white_background.xml rename to app/src/main/res/drawable/shape_squircle_red_pressed_background.xml index 95a658bb5..3ab6cb40b 100644 --- a/app/src/main/res/drawable/shape_white_background.xml +++ b/app/src/main/res/drawable/shape_squircle_red_pressed_background.xml @@ -1,4 +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_squircle_white_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_dialog_background.xml rename to app/src/main/res/drawable/shape_squircle_white_background.xml diff --git a/app/src/main/res/drawable/squircle_green_button_background.xml b/app/src/main/res/drawable/squircle_green_button_background.xml new file mode 100644 index 000000000..0f7435734 --- /dev/null +++ b/app/src/main/res/drawable/squircle_green_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/squircle_red_button_background.xml b/app/src/main/res/drawable/squircle_red_button_background.xml new file mode 100644 index 000000000..0669a1a3e --- /dev/null +++ b/app/src/main/res/drawable/squircle_red_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/calls_list_fragment.xml b/app/src/main/res/layout-land/calls_list_fragment.xml index 40fb2f14d..214e30b6f 100644 --- a/app/src/main/res/layout-land/calls_list_fragment.xml +++ b/app/src/main/res/layout-land/calls_list_fragment.xml @@ -61,7 +61,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_white_background" + android:src="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" 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 697e89678..afe5763c8 100644 --- a/app/src/main/res/layout-land/contacts_list_fragment.xml +++ b/app/src/main/res/layout-land/contacts_list_fragment.xml @@ -65,7 +65,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_white_background" + android:src="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index 7e13c2109..9027d4ef1 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -15,7 +15,7 @@ android:onClick="@{() -> model.setAsDefault()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_list_cell_background"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 4c73ef802..9a6486565 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -56,7 +56,7 @@ android:layout_width="@dimen/avatar_big_size" android:layout_height="@dimen/avatar_big_size" android:layout_marginTop="8dp" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" coil="@{viewModel.picturePath}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml index b35553d6a..ef9c35f45 100644 --- a/app/src/main/res/layout/assistant_country_picker_fragment.xml +++ b/app/src/main/res/layout/assistant_country_picker_fragment.xml @@ -71,7 +71,7 @@ android:layout_height="0dp" android:layout_weight="1" android:cacheColorHint="@color/transparent_color" - android:divider="@color/blue_outgoing_message" + android:divider="@color/blue_light" android:dividerHeight="1dp" /> diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml index 2738204c8..c673157fa 100644 --- a/app/src/main/res/layout/call_list_cell.xml +++ b/app/src/main/res/layout/call_list_cell.xml @@ -36,10 +36,10 @@ android:layout_marginBottom="5dp" android:layout_marginStart="5dp" android:adjustViewBounds="true" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{model.avatarModel}" app:avatarViewPlaceholder="@drawable/contact_avatar" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" @@ -116,7 +116,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/call_start_numpad.xml b/app/src/main/res/layout/call_start_numpad.xml index 4ba2c1413..e8394dac8 100644 --- a/app/src/main/res/layout/call_start_numpad.xml +++ b/app/src/main/res/layout/call_start_numpad.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/drawer_handle" + app:tint="@color/blue_light_disabled" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -178,7 +178,7 @@ android:src="@drawable/phone" android:padding="15dp" android:elevation="3dp" - android:background="@drawable/shape_circle_green_background" + android:background="@drawable/circle_green_button_background" app:tint="@color/white" app:layout_constraintTop_toBottomOf="@id/flow" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/call_suggestion_list_cell.xml b/app/src/main/res/layout/call_suggestion_list_cell.xml index 15b2b565c..56e298ffb 100644 --- a/app/src/main/res/layout/call_suggestion_list_cell.xml +++ b/app/src/main/res/layout/call_suggestion_list_cell.xml @@ -25,10 +25,10 @@ android:layout_marginTop="5dp" android:layout_marginBottom="5dp" android:adjustViewBounds="true" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" avatarInitials="@{model.initials, default=`JD`}" app:avatarViewPlaceholder="@drawable/contact_avatar" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" @@ -54,7 +54,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml index 3ebc5bf13..0ecc2ea30 100644 --- a/app/src/main/res/layout/calls_list_fragment.xml +++ b/app/src/main/res/layout/calls_list_fragment.xml @@ -61,7 +61,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_white_background" + android:src="@color/white" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/contact_favourite_list_cell.xml b/app/src/main/res/layout/contact_favourite_list_cell.xml index c87dbf69e..bf9b77344 100644 --- a/app/src/main/res/layout/contact_favourite_list_cell.xml +++ b/app/src/main/res/layout/contact_favourite_list_cell.xml @@ -30,10 +30,10 @@ android:layout_width="@dimen/avatar_favorite_list_cell_size" android:layout_height="@dimen/avatar_favorite_list_cell_size" android:adjustViewBounds="true" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{model}" app:avatarViewPlaceholder="@drawable/contact_avatar" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 30d946ab2..edec5bb33 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -104,9 +104,9 @@ android:layout_height="@dimen/avatar_big_size" android:layout_marginTop="8dp" android:adjustViewBounds="true" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.contact}" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="21sp" app:avatarViewInitialsTextStyle="bold" @@ -161,7 +161,7 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_marginTop="20dp" - android:background="@drawable/call_chat_button_background" + android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" android:src="@drawable/phone" app:tint="@color/gray_1" @@ -183,12 +183,11 @@ app:layout_constraintEnd_toEndOf="@id/call"/> @@ -522,7 +521,7 @@ android:layout_height="1dp" android:layout_marginStart="17dp" android:layout_marginEnd="17dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="@id/action_favorite" app:layout_constraintEnd_toEndOf="@id/action_favorite" app:layout_constraintTop_toBottomOf="@+id/action_favorite"/> @@ -547,7 +546,7 @@ android:layout_height="1dp" android:layout_marginStart="17dp" android:layout_marginEnd="17dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="@id/action_share" app:layout_constraintEnd_toEndOf="@id/action_share" app:layout_constraintTop_toBottomOf="@+id/action_share"/> diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml index 6fe1cd7aa..7c26182bf 100644 --- a/app/src/main/res/layout/contact_list_cell.xml +++ b/app/src/main/res/layout/contact_list_cell.xml @@ -60,10 +60,10 @@ android:layout_marginTop="5dp" android:layout_marginBottom="5dp" android:adjustViewBounds="true" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{model}" app:avatarViewPlaceholder="@drawable/contact_avatar" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" @@ -101,7 +101,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml index 8b96c8909..1576b6d51 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 @@ -84,7 +84,7 @@ android:layout_width="@dimen/avatar_big_size" android:layout_height="@dimen/avatar_big_size" android:layout_marginTop="8dp" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" coil="@{viewModel.picturePath}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" 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 1f34d43bc..5d7853dc6 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 @@ -63,7 +63,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/number_or_address" diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml index 2b84130c8..44d156fae 100644 --- a/app/src/main/res/layout/contacts_list_fragment.xml +++ b/app/src/main/res/layout/contacts_list_fragment.xml @@ -55,7 +55,7 @@ android:id="@+id/background" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_white_background" + android:src="@color/white" app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml b/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml index 3e002d22e..7b6743d54 100644 --- a/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml +++ b/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml @@ -19,7 +19,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -32,7 +32,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" android:clickable="true" android:focusable="true" app:layout_constraintWidth_max="@dimen/dialog_max_width" diff --git a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml index 1fbc3f70a..15ff3da1f 100644 --- a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml +++ b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml @@ -19,7 +19,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -32,7 +32,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_cancel_contact_changes.xml b/app/src/main/res/layout/dialog_cancel_contact_changes.xml index a5cd92f61..dcced95d4 100644 --- a/app/src/main/res/layout/dialog_cancel_contact_changes.xml +++ b/app/src/main/res/layout/dialog_cancel_contact_changes.xml @@ -20,7 +20,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -33,7 +33,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="parent" 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 618eac29a..9736a26bb 100644 --- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml @@ -20,7 +20,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -33,7 +33,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintEnd_toEndOf="parent" 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 6a325e79e..d47b1821a 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 @@ -19,7 +19,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -32,7 +32,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_contact_trust_process.xml b/app/src/main/res/layout/dialog_contact_trust_process.xml index 2a3198141..af2d330be 100644 --- a/app/src/main/res/layout/dialog_contact_trust_process.xml +++ b/app/src/main/res/layout/dialog_contact_trust_process.xml @@ -19,7 +19,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -32,7 +32,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="parent" 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 e84846a4d..81b522819 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 @@ -50,7 +50,7 @@ android:layout_height="1dp" android:layout_marginEnd="10dp" android:layout_marginTop="10dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/number_or_address" diff --git a/app/src/main/res/layout/dialog_pick_number_or_address.xml b/app/src/main/res/layout/dialog_pick_number_or_address.xml index 42ef53022..9d68f3684 100644 --- a/app/src/main/res/layout/dialog_pick_number_or_address.xml +++ b/app/src/main/res/layout/dialog_pick_number_or_address.xml @@ -20,7 +20,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -33,7 +33,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_remove_all_call_logs.xml b/app/src/main/res/layout/dialog_remove_all_call_logs.xml index 427acda6e..030663e37 100644 --- a/app/src/main/res/layout/dialog_remove_all_call_logs.xml +++ b/app/src/main/res/layout/dialog_remove_all_call_logs.xml @@ -20,7 +20,7 @@ android:id="@+id/dialog_background_shadow" android:layout_width="0dp" android:layout_height="0dp" - android:src="@drawable/shape_dialog_orange_shadow" + android:src="@drawable/shape_squircle_primary_background" app:layout_constraintBottom_toBottomOf="@id/anchor" app:layout_constraintEnd_toEndOf="@id/dialog_background" app:layout_constraintStart_toStartOf="@id/dialog_background" @@ -33,7 +33,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginBottom="2dp" - android:src="@drawable/shape_dialog_background" + android:src="@drawable/shape_squircle_white_background" app:layout_constraintWidth_max="@dimen/dialog_max_width" app:layout_constraintBottom_toBottomOf="@id/anchor" 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 0b4366571..129becab3 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -118,7 +118,7 @@ android:layout_marginBottom="30dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="@color/blue_outgoing_message" + android:background="@color/blue_light" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/settings" /> diff --git a/app/src/main/res/layout/top_search_bar.xml b/app/src/main/res/layout/top_search_bar.xml index 4800358db..80b38aa97 100644 --- a/app/src/main/res/layout/top_search_bar.xml +++ b/app/src/main/res/layout/top_search_bar.xml @@ -40,10 +40,10 @@ android:layout_width="@dimen/avatar_list_cell_size" android:layout_height="@dimen/avatar_list_cell_size" android:layout_marginStart="15dp" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" accountAvatar="@{viewModel.account}" app:avatarViewPlaceholder="@drawable/contact_avatar" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="16sp" app:avatarViewInitialsTextStyle="bold" diff --git a/app/src/main/res/layout/voip_active_call_fragment.xml b/app/src/main/res/layout/voip_active_call_fragment.xml index 6a2f455e6..ad49251b9 100644 --- a/app/src/main/res/layout/voip_active_call_fragment.xml +++ b/app/src/main/res/layout/voip_active_call_fragment.xml @@ -51,9 +51,9 @@ android:id="@+id/avatar" android:layout_width="@dimen/avatar_in_call_size" android:layout_height="@dimen/avatar_in_call_size" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.contact}" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="36sp" app:avatarViewInitialsTextStyle="bold" diff --git a/app/src/main/res/layout/voip_call_main_actions.xml b/app/src/main/res/layout/voip_call_main_actions.xml index 67a8425fe..35977dbec 100644 --- a/app/src/main/res/layout/voip_call_main_actions.xml +++ b/app/src/main/res/layout/voip_call_main_actions.xml @@ -41,7 +41,7 @@ android:paddingTop="15dp" android:paddingBottom="15dp" android:src="@drawable/phone_disconnect" - android:background="@drawable/shape_hang_up_button_background" + android:background="@drawable/squircle_red_button_background" app:tint="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml index 2bfa65b9d..b90dde725 100644 --- a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml +++ b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml @@ -20,7 +20,7 @@ android:id="@+id/hang_up" android:layout_width="wrap_content" android:layout_height="@dimen/voip_button_size" - android:background="@drawable/shape_hang_up_button_background" + android:background="@drawable/squircle_red_button_background" android:onClick="@{() -> viewModel.hangUp()}" android:paddingStart="30dp" android:paddingTop="15dp" @@ -36,7 +36,7 @@ android:id="@+id/answer_call" android:layout_width="wrap_content" android:layout_height="@dimen/voip_button_size" - android:background="@drawable/shape_answer_button_background" + android:background="@drawable/squircle_green_button_background" android:onClick="@{() -> viewModel.answer()}" android:paddingStart="30dp" android:paddingTop="15dp" diff --git a/app/src/main/res/layout/voip_incoming_call_fragment.xml b/app/src/main/res/layout/voip_incoming_call_fragment.xml index 1a64d3df0..e32ec3a52 100644 --- a/app/src/main/res/layout/voip_incoming_call_fragment.xml +++ b/app/src/main/res/layout/voip_incoming_call_fragment.xml @@ -57,9 +57,9 @@ android:id="@+id/avatar" android:layout_width="@dimen/avatar_in_call_size" android:layout_height="@dimen/avatar_in_call_size" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.contact}" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="36sp" app:avatarViewInitialsTextStyle="bold" diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/voip_outgoing_call_fragment.xml index facca2756..6dd0e0fa7 100644 --- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml +++ b/app/src/main/res/layout/voip_outgoing_call_fragment.xml @@ -71,9 +71,9 @@ android:id="@+id/avatar" android:layout_width="@dimen/avatar_in_call_size" android:layout_height="@dimen/avatar_in_call_size" - android:background="@drawable/shape_avatar_background" + android:background="@drawable/shape_circle_light_blue_background" contactAvatar="@{viewModel.contact}" - app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message" + app:avatarViewInitialsBackgroundColor="@color/blue_light" app:avatarViewInitialsTextColor="@color/gray_9" app:avatarViewInitialsTextSize="36sp" app:avatarViewInitialsTextStyle="bold" diff --git a/app/src/main/res/layout/welcome_activity.xml b/app/src/main/res/layout/welcome_activity.xml index 81eebe6c2..dd9d0d1f2 100644 --- a/app/src/main/res/layout/welcome_activity.xml +++ b/app/src/main/res/layout/welcome_activity.xml @@ -54,7 +54,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp" - app:dotsColor="@color/blue_outgoing_message" + app:dotsColor="@color/blue_light" app:dotsCornerRadius="8dp" app:dotsSize="13dp" app:dotsSpacing="5dp" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 07caca751..4f89502ba 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,19 +9,22 @@ #000000 #FFFFFF #DD5F5F + #9E3548 + #F5CCBE #4FAE80 - #DFECF2 + #377D71 + #DFECF2 + #C0D1D9 #4AA8FF #FFA645 #E1E1E1 #FFEACB #FFB266 #A622334D - #C0D1D9 #EEF7F8 - #6C7A87 + #6C7A870xFF #F9F9F9 #EEF6F8 #949494 @@ -31,6 +34,7 @@ #364860 #4E6074 #9AABB5 + #C9C9C9 #E5E5EA #070707 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0a7fb654..1fe7c4e63 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,9 +106,9 @@ International Prefix Online - Online on $1%s - Online today at $1%s - Online yesterday at $1%s + Online on %s + Online today at %s + Online yesterday at %s Away Do not disturb Call diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4ba503000..261180b60 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -56,7 +56,7 @@ 32sp center 3dp - @drawable/shape_circle_white_background + @drawable/circle_white_button_background