diff --git a/app/src/main/res/color/danger_500.xml b/app/src/main/res/color/danger_500.xml index bb7792121..ea14a7761 100644 --- a/app/src/main/res/color/danger_500.xml +++ b/app/src/main/res/color/danger_500.xml @@ -1,4 +1,6 @@ + + diff --git a/app/src/main/res/color/file_viewer_main2_500.xml b/app/src/main/res/color/file_viewer_main2_500.xml new file mode 100644 index 000000000..83e5a2959 --- /dev/null +++ b/app/src/main/res/color/file_viewer_main2_500.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/drawable/shape_circle_background.xml b/app/src/main/res/drawable/shape_circle_background.xml new file mode 100644 index 000000000..2dddedb2e --- /dev/null +++ b/app/src/main/res/drawable/shape_circle_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_dark_red_outlined_button_background.xml b/app/src/main/res/drawable/shape_dark_red_outlined_button_background.xml new file mode 100644 index 000000000..1082d564d --- /dev/null +++ b/app/src/main/res/drawable/shape_dark_red_outlined_button_background.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 a7cb8b978..a3b7d55c9 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 @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_light_blue_background.xml b/app/src/main/res/drawable/shape_squircle_light_blue_background.xml new file mode 100644 index 000000000..74239dad3 --- /dev/null +++ b/app/src/main/res/drawable/shape_squircle_light_blue_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_transparent_background.xml b/app/src/main/res/drawable/shape_squircle_transparent_background.xml new file mode 100644 index 000000000..2f69733cb --- /dev/null +++ b/app/src/main/res/drawable/shape_squircle_transparent_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_border_background.xml b/app/src/main/res/drawable/shape_squircle_white_border_background.xml new file mode 100644 index 000000000..8584f6827 --- /dev/null +++ b/app/src/main/res/drawable/shape_squircle_white_border_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/squircle_emoji_reaction_button_background.xml b/app/src/main/res/drawable/squircle_emoji_reaction_button_background.xml new file mode 100644 index 000000000..33400bcc1 --- /dev/null +++ b/app/src/main/res/drawable/squircle_emoji_reaction_button_background.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/squircle_red_outlined_button_background.xml b/app/src/main/res/drawable/squircle_red_outlined_button_background.xml new file mode 100644 index 000000000..622ab215f --- /dev/null +++ b/app/src/main/res/drawable/squircle_red_outlined_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/squircle_transparent_button_background.xml b/app/src/main/res/drawable/squircle_transparent_button_background.xml new file mode 100644 index 000000000..d089794b3 --- /dev/null +++ b/app/src/main/res/drawable/squircle_transparent_button_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/squircle_transparent_button_background_2.xml b/app/src/main/res/drawable/squircle_transparent_button_background_2.xml new file mode 100644 index 000000000..d21a76e33 --- /dev/null +++ b/app/src/main/res/drawable/squircle_transparent_button_background_2.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/transparent_background.xml b/app/src/main/res/drawable/transparent_background.xml new file mode 100644 index 000000000..c6c6f2da1 --- /dev/null +++ b/app/src/main/res/drawable/transparent_background.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml index dad7c51d4..4c0a56101 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -24,9 +24,12 @@ android:onClick="@{() -> viewModel.navigateToContacts()}" android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingTop="5dp" + android:paddingBottom="5dp" android:drawableTop="@drawable/address_book" android:drawablePadding="10dp" android:drawableTint="@{viewModel.contactsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" + android:background="@drawable/squircle_transparent_button_background" android:text="@string/bottom_navigation_contacts_label" textFont="@{viewModel.contactsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" app:layout_constraintBottom_toTopOf="@id/calls" @@ -40,9 +43,12 @@ android:onClick="@{() -> viewModel.navigateToHistory()}" android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingTop="5dp" + android:paddingBottom="5dp" android:drawableTop="@drawable/phone" android:drawableTint="@{viewModel.callsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" android:drawablePadding="10dp" + android:background="@drawable/squircle_transparent_button_background" android:text="@string/bottom_navigation_calls_label" textFont="@{viewModel.callsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" app:layout_constraintBottom_toTopOf="@id/conversations" @@ -68,9 +74,12 @@ android:onClick="@{() -> viewModel.navigateToConversations()}" android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingTop="5dp" + android:paddingBottom="5dp" android:drawableTop="@drawable/chat_teardrop_text" android:drawablePadding="10dp" android:drawableTint="@{viewModel.conversationsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" + android:background="@drawable/squircle_transparent_button_background" android:text="@string/bottom_navigation_conversations_label" android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}" textFont="@{viewModel.conversationsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" @@ -97,9 +106,12 @@ android:onClick="@{() -> viewModel.navigateToMeetings()}" android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingTop="5dp" + android:paddingBottom="5dp" android:drawableTop="@drawable/video_conference" android:drawablePadding="10dp" android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" + android:background="@drawable/squircle_transparent_button_background" android:text="@string/bottom_navigation_meetings_label" android:visibility="@{viewModel.hideMeetings ? View.GONE : View.VISIBLE}" textFont="@{viewModel.meetingsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" diff --git a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml index d86f80682..b22080b55 100644 --- a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml @@ -99,10 +99,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:padding="5dp" android:text="@string/manage_account_add_picture" android:textSize="14sp" android:drawableStart="@drawable/camera" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.picturePath.empty ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -115,10 +117,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:padding="5dp" android:text="@string/manage_account_edit_picture" android:textSize="14sp" android:drawableStart="@drawable/pencil_simple" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.picturePath.empty ? View.GONE : View.VISIBLE}" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintTop_toBottomOf="@id/avatar" @@ -133,10 +137,12 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginStart="16dp" + android:padding="5dp" android:text="@string/manage_account_remove_picture" android:textSize="14sp" android:drawableStart="@drawable/trash_simple" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.picturePath.empty ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toEndOf="@id/edit_picture_label" diff --git a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml index 2d4c11e8e..6cfb3a27f 100644 --- a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml +++ b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml @@ -66,6 +66,7 @@ android:text="@string/call_zrtp_sas_validation_skip" android:textSize="13sp" android:textColor="@color/bc_white" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -246,7 +247,7 @@ android:paddingBottom="@dimen/primary_secondary_buttons_label_padding" android:paddingTop="@dimen/primary_secondary_buttons_label_padding" android:gravity="center" - android:background="@drawable/shape_red_outlined_button_background" + android:background="@drawable/squircle_red_outlined_button_background" android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match" android:textSize="13sp" android:textColor="?attr/color_danger_500" diff --git a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml index 76a072f1d..9caca0a26 100644 --- a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml +++ b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml @@ -122,7 +122,7 @@ android:paddingBottom="@dimen/primary_secondary_buttons_label_padding" android:paddingTop="@dimen/primary_secondary_buttons_label_padding" android:gravity="center" - android:background="@drawable/shape_red_button_background" + android:background="@drawable/squircle_red_button_background" android:text="@string/call_action_hang_up" android:textSize="13sp" android:textColor="@color/bc_white" diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml index 87418db2d..cc52335a7 100644 --- a/app/src/main/res/layout-land/main_activity_top_bar.xml +++ b/app/src/main/res/layout-land/main_activity_top_bar.xml @@ -54,10 +54,9 @@ android:layout_height="0dp" android:src="@drawable/list" android:contentDescription="@string/content_description_open_filter" - app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@id/avatar" - app:layout_constraintBottom_toBottomOf="@id/avatar" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" app:tint="?attr/color_on_main" /> @@ -252,6 +254,7 @@ android:text="@string/assistant_forgotten_password" android:textSize="13sp" android:textColor="?attr/color_main2_500" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toEndOf="@id/login" app:layout_constraintTop_toTopOf="@id/login" app:layout_constraintBottom_toBottomOf="@id/login"/> diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml index f8b472c21..96d1bdda1 100644 --- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml +++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml @@ -299,13 +299,14 @@ android:id="@+id/advanced_settings" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:layout_marginTop="35dp" - android:padding="5dp" + android:layout_marginStart="20dp" + android:layout_marginTop="25dp" + android:padding="10dp" android:text="@string/settings_advanced_title" android:drawableEnd="@{viewModel.expandAdvancedSettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" android:drawablePadding="10dp" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintWidth_max="@dimen/button_max_width" app:layout_constraintStart_toEndOf="@id/title" app:layout_constraintEnd_toStartOf="@id/logo" diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 96b0944ec..e6f38891a 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -118,10 +118,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:padding="5dp" android:text="@string/manage_account_add_picture" android:textSize="14sp" android:drawableStart="@drawable/camera" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.accountModel.picturePath.length() == 0 ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -134,11 +136,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:padding="5dp" android:text="@string/manage_account_edit_picture" android:textSize="14sp" android:drawableStart="@drawable/pencil_simple" android:drawablePadding="3dp" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.accountModel.picturePath.length() == 0 ? View.GONE : View.VISIBLE}" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintTop_toBottomOf="@id/avatar" @@ -153,11 +157,13 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginStart="16dp" + android:padding="5dp" android:text="@string/manage_account_remove_picture" android:textSize="14sp" android:drawableStart="@drawable/trash_simple" android:drawablePadding="3dp" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.accountModel.picturePath.length() == 0 ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toEndOf="@id/edit_picture_label" @@ -176,13 +182,14 @@ android:id="@+id/details" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="32dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="20dp" android:text="@string/manage_account_details_title" android:drawableEnd="@{viewModel.expandDetails ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/avatar_barrier"/> @@ -422,14 +429,15 @@ android:id="@+id/devices" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="32dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="20dp" android:text="@string/manage_account_devices_title" android:visibility="@{viewModel.isOnDefaultDomain ? View.VISIBLE : View.GONE, default=gone}" android:drawableEnd="@{viewModel.expandDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/connection_background"/> @@ -490,8 +498,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" android:layout_marginTop="16dp" android:text="@string/contact_details_actions_title" 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 f664432ae..84b55e7a6 100644 --- a/app/src/main/res/layout/account_settings_fragment.xml +++ b/app/src/main/res/layout/account_settings_fragment.xml @@ -268,14 +268,15 @@ android:onClick="@{() -> viewModel.toggleNatPolicySettingsExpand()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="10dp" android:text="@string/account_settings_nat_policy_title" android:drawableEnd="@{viewModel.expandNatPolicySettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="?attr/color_main2_600"/> + android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" /> + android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" /> diff --git a/app/src/main/res/layout/assistant_recover_account_fragment.xml b/app/src/main/res/layout/assistant_recover_account_fragment.xml index 33531c8cb..f11d3fac2 100644 --- a/app/src/main/res/layout/assistant_recover_account_fragment.xml +++ b/app/src/main/res/layout/assistant_recover_account_fragment.xml @@ -35,6 +35,7 @@ android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index d8f82ffee..4074ef916 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -24,9 +24,10 @@ android:onClick="@{() -> viewModel.navigateToContacts()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:drawableTop="@drawable/address_book" + android:background="@drawable/squircle_transparent_button_background" android:drawablePadding="4dp" android:drawableTint="@{viewModel.contactsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" android:text="@string/bottom_navigation_contacts_label" @@ -42,9 +43,10 @@ android:onClick="@{() -> viewModel.navigateToHistory()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:drawableTop="@drawable/phone" + android:background="@drawable/squircle_transparent_button_background" android:drawablePadding="4dp" android:drawableTint="@{viewModel.callsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" android:text="@string/bottom_navigation_calls_label" @@ -73,9 +75,10 @@ android:onClick="@{() -> viewModel.navigateToConversations()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:drawableTop="@drawable/chat_teardrop_text" + android:background="@drawable/squircle_transparent_button_background" android:drawablePadding="4dp" android:drawableTint="@{viewModel.conversationsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" android:text="@string/bottom_navigation_conversations_label" @@ -105,9 +108,10 @@ android:onClick="@{() -> viewModel.navigateToMeetings()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:drawableTop="@drawable/video_conference" + android:background="@drawable/squircle_transparent_button_background" android:drawablePadding="4dp" android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}" android:text="@string/bottom_navigation_meetings_label" diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml index 8a58a9c2d..75e8a1f5d 100644 --- a/app/src/main/res/layout/chat_conversation_fragment.xml +++ b/app/src/main/res/layout/chat_conversation_fragment.xml @@ -73,14 +73,15 @@ style="@style/icon_top_bar_button_style" android:id="@+id/back" android:layout_width="wrap_content" - android:layout_height="@dimen/top_bar_height" + android:layout_height="0dp" android:onClick="@{backClickListener}" android:visibility="@{viewModel.isCallConversation || viewModel.showBackButton && !viewModel.searchBarVisible ? View.VISIBLE : View.GONE}" android:src="@drawable/caret_left" android:contentDescription="@string/content_description_go_back_icon" app:tint="?attr/color_main1_500" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/events_list"/> + app:layout_constraintTop_toTopOf="@id/events_list" /> diff --git a/app/src/main/res/layout/chat_emoji_reaction_picker.xml b/app/src/main/res/layout/chat_emoji_reaction_picker.xml index e972b5810..d82e3cb58 100644 --- a/app/src/main/res/layout/chat_emoji_reaction_picker.xml +++ b/app/src/main/res/layout/chat_emoji_reaction_picker.xml @@ -40,7 +40,8 @@ android:paddingBottom="3dp" android:text="@string/emoji_thumbs_up" android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size" - android:background="@{model.ourReactionIndex == 0 ? @drawable/shape_squircle_gray_200_background : @drawable/shape_empty, default=@drawable/shape_squircle_gray_200_background}" + android:selected="@{model.ourReactionIndex == 0}" + android:background="@drawable/squircle_emoji_reaction_button_background" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintTop_toTopOf="@id/emojis_background" app:layout_constraintBottom_toBottomOf="@id/emojis_background" @@ -59,7 +60,8 @@ android:paddingBottom="3dp" android:text="@string/emoji_love" android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size" - android:background="@{model.ourReactionIndex == 1 ? @drawable/shape_squircle_gray_200_background : @drawable/shape_empty}" + android:selected="@{model.ourReactionIndex == 1}" + android:background="@drawable/squircle_emoji_reaction_button_background" app:layout_constraintTop_toTopOf="@id/thumbs_up" app:layout_constraintBottom_toBottomOf="@id/thumbs_up" app:layout_constraintStart_toEndOf="@id/thumbs_up" @@ -77,7 +79,8 @@ android:paddingBottom="3dp" android:text="@string/emoji_laughing" android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size" - android:background="@{model.ourReactionIndex == 2 ? @drawable/shape_squircle_gray_200_background : @drawable/shape_empty}" + android:selected="@{model.ourReactionIndex == 2}" + android:background="@drawable/squircle_emoji_reaction_button_background" app:layout_constraintTop_toTopOf="@id/thumbs_up" app:layout_constraintBottom_toBottomOf="@id/thumbs_up" app:layout_constraintStart_toEndOf="@id/love" @@ -95,7 +98,8 @@ android:paddingBottom="3dp" android:text="@string/emoji_surprised" android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size" - android:background="@{model.ourReactionIndex == 3 ? @drawable/shape_squircle_gray_200_background : @drawable/shape_empty}" + android:selected="@{model.ourReactionIndex == 3}" + android:background="@drawable/squircle_emoji_reaction_button_background" app:layout_constraintTop_toTopOf="@id/thumbs_up" app:layout_constraintBottom_toBottomOf="@id/thumbs_up" app:layout_constraintStart_toEndOf="@id/laughing" @@ -113,7 +117,8 @@ android:paddingBottom="3dp" android:text="@string/emoji_tear" android:textSize="@dimen/chat_bubble_long_press_emoji_reaction_size" - android:background="@{model.ourReactionIndex == 4 ? @drawable/shape_squircle_gray_200_background : @drawable/shape_empty}" + android:selected="@{model.ourReactionIndex == 4}" + android:background="@drawable/squircle_emoji_reaction_button_background" app:layout_constraintTop_toTopOf="@id/thumbs_up" app:layout_constraintBottom_toBottomOf="@id/thumbs_up" app:layout_constraintStart_toEndOf="@id/surprised" @@ -131,6 +136,7 @@ android:paddingTop="10dp" android:adjustViewBounds="true" android:src="@drawable/plus_circle" + android:background="@drawable/squircle_emoji_reaction_button_background" android:contentDescription="@string/content_description_chat_open_emoji_picker" app:layout_constraintStart_toEndOf="@id/tear" app:layout_constraintEnd_toEndOf="@id/emojis_background" diff --git a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml index cf352c09e..21297c9b9 100644 --- a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml +++ b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml @@ -89,6 +89,8 @@ android:layout_marginTop="25dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:background="@drawable/shape_squircle_white_background" app:layout_constraintTop_toBottomOf="@id/subtitle"> @@ -97,8 +99,6 @@ android:onClick="@{() -> viewModel.onValueSelected(60)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:checked="@{viewModel.currentlySelectedValue == 60}" @@ -106,14 +106,13 @@ android:textSize="17sp" android:textColor="?attr/color_main2_500" android:textAlignment="textStart" + android:background="@drawable/action_background_middle" app:useMaterialThemeColors="false" app:buttonTint="?attr/color_main1_500" /> @@ -122,8 +121,6 @@ android:onClick="@{() -> viewModel.onValueSelected(3600)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:checked="@{viewModel.currentlySelectedValue == 3600}" @@ -131,14 +128,13 @@ android:textSize="17sp" android:textColor="?attr/color_main2_500" android:textAlignment="textStart" + android:background="@drawable/action_background_middle" app:useMaterialThemeColors="false" app:buttonTint="?attr/color_main1_500" /> @@ -147,8 +143,6 @@ android:onClick="@{() -> viewModel.onValueSelected(86400)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:checked="@{viewModel.currentlySelectedValue == 86400}" @@ -156,14 +150,13 @@ android:textSize="17sp" android:textColor="?attr/color_main2_500" android:textAlignment="textStart" + android:background="@drawable/action_background_middle" app:useMaterialThemeColors="false" app:buttonTint="?attr/color_main1_500" /> @@ -172,8 +165,6 @@ android:onClick="@{() -> viewModel.onValueSelected(259200)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:checked="@{viewModel.currentlySelectedValue == 259200}" @@ -181,14 +172,13 @@ android:textSize="17sp" android:textColor="?attr/color_main2_500" android:textAlignment="textStart" + android:background="@drawable/action_background_middle" app:useMaterialThemeColors="false" app:buttonTint="?attr/color_main1_500" /> @@ -197,8 +187,6 @@ android:onClick="@{() -> viewModel.onValueSelected(604800)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:checked="@{viewModel.currentlySelectedValue == 604800}" @@ -206,14 +194,13 @@ android:textSize="17sp" android:textColor="?attr/color_main2_500" android:textAlignment="textStart" + android:background="@drawable/action_background_middle" app:useMaterialThemeColors="false" app:buttonTint="?attr/color_main1_500" /> @@ -222,8 +209,6 @@ android:onClick="@{() -> viewModel.onValueSelected(0)}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:paddingTop="10dp" android:paddingBottom="10dp" android:checked="@{viewModel.currentlySelectedValue == 0}" @@ -231,6 +216,7 @@ android:textSize="17sp" android:textColor="?attr/color_main2_500" android:textAlignment="textStart" + android:background="@drawable/action_background_middle" app:useMaterialThemeColors="false" 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 40c35a519..32d9e452b 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -127,11 +127,13 @@ @@ -374,9 +377,9 @@ style="@style/section_header_style" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="26dp" + android:layout_marginStart="20dp" android:layout_marginTop="16dp" - android:layout_marginEnd="26dp" + android:layout_marginEnd="20dp" android:padding="5dp" android:text="@string/conversation_details_media_documents_title" app:layout_constraintBottom_toTopOf="@id/action_media" @@ -432,9 +435,9 @@ style="@style/section_header_style" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="26dp" + android:layout_marginStart="20dp" android:layout_marginTop="16dp" - android:layout_marginEnd="26dp" + android:layout_marginEnd="20dp" android:padding="5dp" android:text="@string/contact_details_actions_title" 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 3915c4d14..19a263c98 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -244,13 +244,14 @@ android:onClick="@{() -> viewModel.toggleNumbersAndAddressesExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="32dp" + android:padding="10dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:layout_marginTop="20dp" 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="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.atLeastOneSipAddressOrPhoneNumber ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -350,13 +351,14 @@ android:onClick="@{() -> viewModel.displayTrustDialog()}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="26dp" - android:layout_marginTop="16dp" - android:padding="5dp" + android:layout_marginStart="20dp" + android:layout_marginTop="10dp" + android:padding="10dp" android:text="@string/contact_details_trust_title" android:drawableEnd="@drawable/question" android:drawableTint="?attr/color_main2_600" android:drawablePadding="8dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showContactTrustAndDevices ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/info_background"/> @@ -367,11 +369,12 @@ android:onClick="@{() -> viewModel.toggleDevicesTrustExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" - android:padding="5dp" + android:layout_marginEnd="20dp" + android:layout_marginTop="10dp" + android:padding="10dp" android:drawableEnd="@{viewModel.expandDevicesTrust ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showContactTrustAndDevices ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toEndOf="@id/trust_label" 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 d7dab0d48..e63d7874c 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 @@ -40,10 +40,12 @@ android:onClick="@{() -> model.remove()}" android:id="@+id/remove" android:visibility="@{model.showRemoveButton ? View.VISIBLE : View.INVISIBLE, default=invisible}" - android:layout_width="@dimen/icon_size" - android:layout_height="@dimen/icon_size" + android:layout_width="@dimen/large_icon_size" + android:layout_height="@dimen/large_icon_size" + android:padding="5dp" android:layout_marginStart="10dp" android:src="@drawable/x" + android:background="@drawable/squircle_transparent_button_background" android:contentDescription="@string/content_description_contact_remove_field" app:tint="?attr/color_main2_700" app:layout_constraintStart_toEndOf="@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 d0580d955..a00ead9d5 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 @@ -98,10 +98,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:padding="5dp" android:text="@string/manage_account_add_picture" android:textSize="14sp" android:drawableStart="@drawable/camera" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.picturePath.empty ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -114,10 +116,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:padding="5dp" android:text="@string/manage_account_edit_picture" android:textSize="14sp" android:drawableStart="@drawable/pencil_simple" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.picturePath.empty ? View.GONE : View.VISIBLE}" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintTop_toBottomOf="@id/avatar" @@ -132,10 +136,12 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginStart="16dp" + android:padding="5dp" android:text="@string/manage_account_remove_picture" android:textSize="14sp" android:drawableStart="@drawable/trash_simple" android:drawablePadding="3dp" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.picturePath.empty ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toEndOf="@id/edit_picture_label" diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml index 707f91f95..3c31fa010 100644 --- a/app/src/main/res/layout/contacts_list_fragment.xml +++ b/app/src/main/res/layout/contacts_list_fragment.xml @@ -77,12 +77,13 @@ onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:layout_marginTop="10dp" + android:padding="10dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_marginTop="5dp" android:layout_marginBottom="4dp" android:text="@string/contacts_list_favourites_title" + android:background="@drawable/squircle_transparent_button_background" android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" /> diff --git a/app/src/main/res/layout/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout/dialog_zrtp_sas_validation.xml index b2c4fb8a3..ea0ecf693 100644 --- a/app/src/main/res/layout/dialog_zrtp_sas_validation.xml +++ b/app/src/main/res/layout/dialog_zrtp_sas_validation.xml @@ -63,6 +63,7 @@ android:text="@string/call_zrtp_sas_validation_skip" android:textSize="13sp" android:textColor="@color/bc_white" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -238,10 +239,10 @@ android:paddingBottom="@dimen/primary_secondary_buttons_label_padding" android:paddingTop="@dimen/primary_secondary_buttons_label_padding" android:gravity="center" - android:background="@drawable/shape_red_outlined_button_background" + android:background="@drawable/squircle_red_outlined_button_background" android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match" android:textSize="13sp" - android:textColor="?attr/color_danger_500" + android:textColor="@color/danger_500" android:maxLines="1" android:ellipsize="end" app:layout_constraintWidth_max="@dimen/button_max_width" diff --git a/app/src/main/res/layout/dialog_zrtp_security_alert.xml b/app/src/main/res/layout/dialog_zrtp_security_alert.xml index 6115b7026..f2044b535 100644 --- a/app/src/main/res/layout/dialog_zrtp_security_alert.xml +++ b/app/src/main/res/layout/dialog_zrtp_security_alert.xml @@ -116,7 +116,7 @@ android:paddingBottom="@dimen/primary_secondary_buttons_label_padding" android:paddingTop="@dimen/primary_secondary_buttons_label_padding" android:gravity="center" - android:background="@drawable/shape_red_button_background" + android:background="@drawable/squircle_red_button_background" android:text="@string/call_action_hang_up" android:textSize="13sp" android:textColor="@color/bc_white" diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index ac7566c8d..efa4817d9 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -31,8 +31,8 @@ + android:layout_marginBottom="10dp" + android:background="@drawable/squircle_transparent_button_background"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> @@ -244,13 +245,14 @@ android:onClick="@{() -> viewModel.toggleAutoAnswerExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="20dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_advanced_auto_answer_title" android:drawableEnd="@{viewModel.expandAutoAnswer ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/early_media_settings"/> @@ -273,13 +275,14 @@ android:onClick="@{() -> viewModel.toggleAudioCodecsExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="20dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_advanced_audio_codecs_title" android:drawableEnd="@{viewModel.expandAudioCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/auto_answer_settings"/> @@ -307,13 +310,14 @@ android:onClick="@{() -> viewModel.toggleVideoCodecsExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="20dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_advanced_video_codecs_title" android:drawableEnd="@{viewModel.expandVideoCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_codecs"/> diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml index 4d61d7f07..fba5ec348 100644 --- a/app/src/main/res/layout/settings_advanced_fragment.xml +++ b/app/src/main/res/layout/settings_advanced_fragment.xml @@ -237,13 +237,14 @@ android:onClick="@{() -> viewModel.toggleAudioDevicesExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="20dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_advanced_audio_devices_title" android:drawableEnd="@{viewModel.expandAudioDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/download_and_apply"/> @@ -377,6 +378,7 @@ android:text="@string/settings_advanced_go_to_android_app_settings_title" android:drawableEnd="@drawable/arrow_square_out" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintHorizontal_bias="1" app:layout_constraintVertical_bias="0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/settings_calls.xml b/app/src/main/res/layout/settings_calls.xml index 3a0159b4b..81dfde71d 100644 --- a/app/src/main/res/layout/settings_calls.xml +++ b/app/src/main/res/layout/settings_calls.xml @@ -227,6 +227,7 @@ android:text="@string/settings_calls_change_ringtone_title" android:drawableEnd="@drawable/arrow_square_out" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -246,6 +247,7 @@ android:text="@string/settings_advanced_calls" android:drawableEnd="@drawable/caret_right" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintHorizontal_bias="1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/settings_contacts.xml b/app/src/main/res/layout/settings_contacts.xml index ee8d39bab..83c367768 100644 --- a/app/src/main/res/layout/settings_contacts.xml +++ b/app/src/main/res/layout/settings_contacts.xml @@ -134,6 +134,7 @@ android:ellipsize="end" android:drawableEnd="@drawable/caret_right" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.ldapAvailable ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toBottomOf="@id/hide_empty_contacts_switch" app:layout_constraintBottom_toTopOf="@id/existing_ldap_servers" @@ -170,6 +171,7 @@ android:ellipsize="end" android:drawableEnd="@drawable/caret_right" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintTop_toBottomOf="@id/existing_ldap_servers" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml b/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml index 9ca7274f2..ebc698f5f 100644 --- a/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml +++ b/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml @@ -24,6 +24,7 @@ android:ellipsize="end" android:drawableEnd="@drawable/pencil_simple" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml index aeaa10d6b..c2895286a 100644 --- a/app/src/main/res/layout/settings_fragment.xml +++ b/app/src/main/res/layout/settings_fragment.xml @@ -75,13 +75,14 @@ android:onClick="@{() -> viewModel.toggleSecurityExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_security_title" android:drawableEnd="@{viewModel.expandSecurity ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -105,13 +106,14 @@ android:onClick="@{() -> viewModel.toggleCallsExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_calls_title" android:drawableEnd="@{viewModel.expandCalls ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/security_settings"/> @@ -135,13 +137,14 @@ android:onClick="@{() -> viewModel.toggleConversationsExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_conversations_title" android:drawableEnd="@{viewModel.expandConversations ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showConversationsSettings ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -165,13 +168,14 @@ android:onClick="@{() -> viewModel.toggleContactsExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_contacts_title" android:drawableEnd="@{viewModel.expandContacts ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showContactsSettings ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -195,13 +199,14 @@ android:onClick="@{() -> viewModel.toggleMeetingsExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_meetings_title" android:drawableEnd="@{viewModel.expandMeetings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showMeetingsSettings ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -225,13 +230,14 @@ android:onClick="@{() -> viewModel.toggleNetworkExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_network_title" android:drawableEnd="@{viewModel.expandNetwork ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/meetings_settings"/> @@ -254,13 +260,14 @@ android:onClick="@{() -> viewModel.toggleUserInterfaceExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_user_interface_title" android:drawableEnd="@{viewModel.expandUserInterface ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/network_settings"/> @@ -283,14 +290,15 @@ android:onClick="@{() -> viewModel.toggleTunnelExpand()}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:text="@string/settings_tunnel_title" android:visibility="@{viewModel.isTunnelAvailable ? View.VISIBLE : View.GONE}" android:drawableEnd="@{viewModel.expandTunnel ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/user_interface_settings"/> @@ -313,14 +321,15 @@ android:onClick="@{advancedSettingsClickListener}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:layout_marginBottom="@dimen/screen_bottom_margin" android:text="@string/settings_advanced_title" android:drawableEnd="@drawable/caret_right" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showAdvancedSettings ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -332,14 +341,15 @@ android:onClick="@{developerSettingsClickListener}" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="5dp" - android:layout_marginStart="26dp" - android:layout_marginEnd="26dp" - android:layout_marginTop="16dp" + android:padding="10dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:layout_marginTop="10dp" android:layout_marginBottom="@dimen/screen_bottom_margin" android:text="@string/settings_developer_title" android:drawableEnd="@drawable/caret_right" android:drawableTint="?attr/color_main2_600" + android:background="@drawable/squircle_transparent_button_background" android:visibility="@{viewModel.showDeveloperSettings ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintVertical_bias="0" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml index 8bbb4d0c5..484aca5a3 100644 --- a/app/src/main/res/layout/start_call_fragment.xml +++ b/app/src/main/res/layout/start_call_fragment.xml @@ -186,7 +186,7 @@ android:id="@+id/gradient_background" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginStart="22dp" + android:layout_marginStart="@dimen/icon_size" android:background="@drawable/shape_gradient" app:layout_constraintBottom_toBottomOf="@id/group_call_icon" app:layout_constraintEnd_toEndOf="@id/group_call_label" @@ -196,8 +196,8 @@ + app:tint="@color/bc_white" /> diff --git a/app/src/main/res/layout/start_chat_fragment.xml b/app/src/main/res/layout/start_chat_fragment.xml index 86b77a41e..b5b26e9f1 100644 --- a/app/src/main/res/layout/start_chat_fragment.xml +++ b/app/src/main/res/layout/start_chat_fragment.xml @@ -168,7 +168,7 @@ android:id="@+id/gradient_background" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginStart="22dp" + android:layout_marginStart="@dimen/icon_size" android:background="@drawable/shape_gradient" app:layout_constraintBottom_toBottomOf="@id/group_chat_icon" app:layout_constraintEnd_toEndOf="@id/group_chat_label" @@ -178,8 +178,8 @@ @color/gray_main2_600 @color/gray_600 - @color/background_color_alt_dark_mode + @color/gray_main2_800 @color/background_color_alt_dark_mode @color/gray_main2_600 diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 45a854827..506d7b2f8 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -11,6 +11,7 @@ 14dp 24dp + 32dp 48dp 100dp 30dp