mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing hover effects

Browse source
This commit is contained in:
Sylvain Berfini 2026-01-12 15:12:14 +01:00
parent cec3639b73
commit a816a956b8
58 changed files with 433 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/color/danger_500.xml
View file

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_hovered="true" android:color="?attr/color_danger_700"/>
<item android:state_pressed="true" android:color="?attr/color_danger_700"/>
<item android:color="?attr/color_danger_500"/>
</selector>

6
app/src/main/res/color/file_viewer_main2_500.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/gray_main2_200" />
<item android:state_hovered="true" android:color="@color/gray_main2_200" />
<item android:color="@color/gray_main2_500"/>
</selector>

9
app/src/main/res/drawable/shape_circle_background.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/shape_circle_dark_pressed_background" />
<item android:state_hovered="true"
android:drawable="@drawable/shape_circle_dark_pressed_background" />
<item
android:drawable="@drawable/shape_circle_gray_100_background" />
</selector>

6
app/src/main/res/drawable/shape_dark_red_outlined_button_background.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="48dp" />
<stroke android:color="?attr/color_danger_700" android:width="1dp" />
<solid android:color="@color/bc_white"/>
</shape>

2
app/src/main/res/drawable/shape_red_outlined_button_background.xml
View file

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="48dp" />
<stroke android:color="?attr/color_danger_500" android:width="1dp" />
<solid android:color="?attr/color_main2_000"/>
<solid android:color="@color/bc_white"/>
</shape>

5
app/src/main/res/drawable/shape_squircle_light_blue_background.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="15dp" />
<solid android:color="?attr/color_button_background"/>
</shape>

5
app/src/main/res/drawable/shape_squircle_transparent_background.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="15dp" />
<solid android:color="@color/transparent_color"/>
</shape>

5
app/src/main/res/drawable/shape_squircle_white_border_background.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="15dp" />
<stroke android:color="@color/bc_white" android:width="2dp"/>
</shape>

11
app/src/main/res/drawable/squircle_emoji_reaction_button_background.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/shape_squircle_light_blue_background" />
<item android:state_hovered="true"
android:drawable="@drawable/shape_squircle_light_blue_background" />
<item android:state_selected="true"
android:drawable="@drawable/shape_squircle_gray_200_background" />
<item
android:drawable="@drawable/shape_squircle_transparent_background" />
</selector>

9
app/src/main/res/drawable/squircle_red_outlined_button_background.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/shape_dark_red_outlined_button_background" />
<item android:state_hovered="true"
android:drawable="@drawable/shape_dark_red_outlined_button_background" />
<item
android:drawable="@drawable/shape_red_outlined_button_background" />
</selector>

9
app/src/main/res/drawable/squircle_transparent_button_background.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/shape_squircle_light_blue_background" />
<item android:state_hovered="true"
android:drawable="@drawable/shape_squircle_light_blue_background" />
<item
android:drawable="@drawable/shape_squircle_transparent_background" />
</selector>

9
app/src/main/res/drawable/squircle_transparent_button_background_2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/shape_squircle_white_border_background" />
<item android:state_hovered="true"
android:drawable="@drawable/shape_squircle_white_border_background" />
<item
android:drawable="@drawable/shape_squircle_transparent_background" />
</selector>

9
app/src/main/res/drawable/transparent_background.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/color_main2_100" />
<item android:state_hovered="true"
android:drawable="@drawable/color_main2_100" />
<item
android:drawable="@color/transparent_color" />
</selector>

12
app/src/main/res/layout-land/bottom_nav_bar.xml
View file

@ -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}"

6
app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
View file

@ -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"

3
app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
View file

@ -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"

2
app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
View file

@ -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"

18
app/src/main/res/layout-land/main_activity_top_bar.xml
View file

@ -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" />
<include
@ -65,6 +64,7 @@
android:onClick="@{() -> viewModel.openDrawerMenu()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
layout="@layout/contact_avatar"
bind:model="@{viewModel.account}"
app:layout_constraintStart_toEndOf="@id/drawer_menu"
@ -96,10 +96,9 @@
android:layout_height="0dp"
android:src="@drawable/magnifying_glass"
android:contentDescription="@string/content_description_open_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toStartOf="@id/extra_action"
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_on_main" />
<ImageView
@ -111,10 +110,9 @@
android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
android:contentDescription="@{extraActionContentDescription}"
android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_on_main" />
<ImageView
@ -125,7 +123,6 @@
android:layout_height="0dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_cancel_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/search"
@ -171,7 +168,6 @@
android:layout_height="0dp"
android:src="@drawable/x"
android:contentDescription="@string/content_description_clear_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/search"

5
app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
View file

@ -116,12 +116,13 @@
<ImageView
android:id="@+id/switch_camera"
android:onClick="@{() -> viewModel.switchCamera()}"
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:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:visibility="@{viewModel.isVideoAvailable &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
android:src="@drawable/camera_rotate"
android:background="@drawable/circle_transparent_button_background"
android:contentDescription="@string/content_description_change_camera"
app:tint="@color/bc_white"
app:layout_constraintTop_toTopOf="@id/video_preview"

12
app/src/main/res/layout-sw600dp-land/bottom_nav_bar.xml
View file

@ -45,11 +45,14 @@
android:onClick="@{() -> viewModel.navigateToContacts()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginTop="32dp"
android:textColor="?attr/color_on_main"
android:drawableTop="@{viewModel.contactsSelected ? @drawable/address_book_fill : @drawable/address_book, default=@drawable/address_book}"
android:drawablePadding="10dp"
android:drawableTint="?attr/color_on_main"
android:background="@drawable/squircle_transparent_button_background_2"
android:text="@string/bottom_navigation_contacts_label"
textFont="@{viewModel.contactsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toTopOf="@id/calls"
@ -63,11 +66,14 @@
android:onClick="@{() -> viewModel.navigateToHistory()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginTop="32dp"
android:textColor="?attr/color_on_main"
android:drawableTop="@{viewModel.callsSelected ? @drawable/phone_fill : @drawable/phone, default=@drawable/phone}"
android:drawableTint="?attr/color_on_main"
android:drawablePadding="10dp"
android:background="@drawable/squircle_transparent_button_background_2"
android:text="@string/bottom_navigation_calls_label"
textFont="@{viewModel.callsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toTopOf="@id/conversations"
@ -93,11 +99,14 @@
android:onClick="@{() -> viewModel.navigateToConversations()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginTop="32dp"
android:textColor="?attr/color_on_main"
android:drawableTop="@{viewModel.conversationsSelected ? @drawable/chat_teardrop_text_fill : @drawable/chat_teardrop_text, default=@drawable/chat_teardrop_text}"
android:drawablePadding="10dp"
android:drawableTint="?attr/color_on_main"
android:background="@drawable/squircle_transparent_button_background_2"
android:text="@string/bottom_navigation_conversations_label"
android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}"
textFont="@{viewModel.conversationsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
@ -124,11 +133,14 @@
android:onClick="@{() -> viewModel.navigateToMeetings()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginTop="32dp"
android:textColor="?attr/color_on_main"
android:drawableTop="@{viewModel.meetingsSelected ? @drawable/video_conference_fill : @drawable/video_conference, default=@drawable/video_conference}"
android:drawablePadding="10dp"
android:drawableTint="?attr/color_on_main"
android:background="@drawable/squircle_transparent_button_background_2"
android:text="@string/bottom_navigation_meetings_label"
android:visibility="@{viewModel.hideMeetings ? View.GONE : View.VISIBLE}"
textFont="@{viewModel.meetingsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"

18
app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
View file

@ -53,10 +53,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/title"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main2_600" />
<androidx.appcompat.widget.AppCompatTextView
@ -64,6 +63,7 @@
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@{viewModel.title, default=`Title`}"
@ -84,10 +84,9 @@
android:layout_marginEnd="5dp"
android:src="@drawable/magnifying_glass"
android:contentDescription="@string/content_description_open_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toStartOf="@id/extra_action"
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main2_600" />
<ImageView
@ -100,10 +99,9 @@
android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
android:contentDescription="@{extraActionContentDescription}"
android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main2_600" />
<ImageView
@ -115,7 +113,6 @@
android:layout_marginStart="5dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_cancel_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/search"
@ -162,7 +159,6 @@
android:layout_marginEnd="5dp"
android:src="@drawable/x"
android:contentDescription="@string/content_description_clear_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/search"

7
app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
View file

@ -94,13 +94,15 @@
android:onClick="@{helpClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:padding="10dp"
android:text="@string/help_title"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
android:drawableStart="@drawable/question"
android:drawablePadding="5dp"
android:background="@drawable/squircle_transparent_button_background"
app:drawableTint="?attr/color_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -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"/>

7
app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
View file

@ -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"

28
app/src/main/res/layout/account_profile_fragment.xml
View file

@ -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"

18
app/src/main/res/layout/account_settings_fragment.xml
View file

@ -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" />
<include
android:id="@+id/nat_policy_settings"
@ -294,14 +295,15 @@
android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
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="16dp"
android:layout_marginBottom="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:drawableTint="?attr/color_main2_600"
android:background="@drawable/squircle_transparent_button_background" />
<include
android:id="@+id/account_advanced_settings"

2
app/src/main/res/layout/address_selected_list_cell.xml
View file

@ -34,7 +34,7 @@
android:layout_height="@dimen/icon_size"
android:src="@drawable/x"
android:padding="5dp"
android:background="@drawable/shape_circle_gray_100_background"
android:background="@drawable/shape_circle_background"
android:contentDescription="@string/content_description_click_to_remove_participant"
app:tint="?attr/color_main2_500"
app:layout_constraintTop_toTopOf="@id/avatar"

5
app/src/main/res/layout/assistant_landing_fragment.xml
View file

@ -74,12 +74,14 @@
android:onClick="@{helpClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:layout_marginEnd="10dp"
android:padding="10dp"
android:text="@string/help_title"
android:textSize="14sp"
android:textColor="?attr/color_main2_500"
android:drawableStart="@drawable/question"
android:drawablePadding="5dp"
android:background="@drawable/squircle_transparent_button_background"
app:drawableTint="?attr/color_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title"
@ -196,6 +198,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_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/login"/>

1
app/src/main/res/layout/assistant_recover_account_fragment.xml
View file

@ -35,6 +35,7 @@
android:layout_height="wrap_content">
<ImageView
style="@style/icon_top_bar_button_style"
android:onClick="@{backClickListener}"
android:id="@+id/back"
android:layout_width="@dimen/top_bar_height"

9
app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
View file

@ -249,13 +249,14 @@
android:id="@+id/advanced_settings"
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="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="20dp"
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:background="@drawable/squircle_transparent_button_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transport"/>

20
app/src/main/res/layout/bottom_nav_bar.xml
View file

@ -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"

16
app/src/main/res/layout/chat_conversation_fragment.xml
View file

@ -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 &amp;&amp; !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"/>
<include
android:id="@+id/avatar"
@ -203,12 +204,13 @@
android:id="@+id/show_menu"
android:onClick="@{showMenuClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/dots_three_vertical"
android:contentDescription="@string/content_description_show_popup_menu"
android:visibility="@{viewModel.isCallConversation ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/events_list"
app:tint="?attr/color_main2_500"/>
<ImageView
@ -216,12 +218,13 @@
android:id="@+id/start_call"
android:onClick="@{() -> viewModel.startCall()}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/phone"
android:contentDescription="@string/content_description_call_start"
android:visibility="@{viewModel.isCallConversation || viewModel.isReadOnly || viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/show_menu"
app:layout_constraintBottom_toTopOf="@id/events_list"
app:tint="?attr/color_main2_500" />
<ImageView
@ -299,18 +302,17 @@
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/top_bar_height"
android:background="?attr/color_main2_000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@id/events_list" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/events_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="55dp"
android:layout_marginTop="@dimen/top_bar_height"
android:paddingBottom="5dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/composing"/>

16
app/src/main/res/layout/chat_emoji_reaction_picker.xml
View file

@ -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"

30
app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
View file

@ -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" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="?attr/color_separator"
android:importantForAccessibility="no"/>
@ -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" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="?attr/color_separator"
android:importantForAccessibility="no"/>
@ -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" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="?attr/color_separator"
android:importantForAccessibility="no"/>
@ -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" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="?attr/color_separator"
android:importantForAccessibility="no"/>
@ -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" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="?attr/color_separator"
android:importantForAccessibility="no"/>
@ -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" />

25
app/src/main/res/layout/chat_info_fragment.xml
View file

@ -127,11 +127,13 @@
<ImageView
android:id="@+id/edit_subject"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginStart="8dp"
android:layout_width="@dimen/large_icon_size"
android:layout_height="@dimen/large_icon_size"
android:layout_marginStart="3dp"
android:onClick="@{editSubjectClickListener}"
android:src="@drawable/pencil_simple"
android:padding="5dp"
android:background="@drawable/circle_transparent_button_background"
android:contentDescription="@string/content_description_chat_edit_conversation_subject"
android:visibility="@{!viewModel.isGroup || viewModel.isReadOnly || !viewModel.isMyselfAdmin ? View.GONE : View.VISIBLE}"
app:tint="?attr/color_main2_600"
@ -303,15 +305,16 @@
style="@style/section_header_style"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="26dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="26dp"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:drawableEnd="@{viewModel.expandParticipants ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="?attr/color_main2_600"
android:onClick="@{() -> viewModel.toggleParticipantsExpand()}"
android:padding="5dp"
android:padding="10dp"
android:text="@{viewModel.participantsLabel, default=@string/conversation_info_participants_list_title}"
android:visibility="@{viewModel.isGroup ? View.VISIBLE : View.GONE}"
android:background="@drawable/squircle_transparent_button_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/mute_label" />
@ -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"

23
app/src/main/res/layout/contact_fragment.xml
View file

@ -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"

6
app/src/main/res/layout/contact_new_or_edit_cell.xml
View file

@ -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"

6
app/src/main/res/layout/contact_new_or_edit_fragment.xml
View file

@ -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"

9
app/src/main/res/layout/contacts_list_fragment.xml
View file

@ -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" />

5
app/src/main/res/layout/dialog_zrtp_sas_validation.xml
View file

@ -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"

2
app/src/main/res/layout/dialog_zrtp_security_alert.xml
View file

@ -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"

13
app/src/main/res/layout/drawer_menu.xml
View file

@ -31,8 +31,8 @@
<ImageView
android:id="@+id/brand_icon"
android:onClick="@{() -> viewModel.closeDrawerMenu()}"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_width="@dimen/large_icon_size"
android:layout_height="@dimen/large_icon_size"
android:layout_marginStart="26dp"
android:layout_marginTop="15dp"
android:src="@drawable/linphone_notification"
@ -59,9 +59,10 @@
<ImageView
android:id="@+id/close_drawer"
android:onClick="@{() -> viewModel.closeDrawerMenu()}"
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:layout_marginEnd="16dp"
android:padding="5dp"
android:src="@drawable/x"
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_close_drawer_menu"
@ -172,6 +173,7 @@
android:drawableStart="@drawable/gear"
android:drawableEnd="@drawable/caret_right"
android:drawablePadding="8dp"
android:background="@drawable/squircle_transparent_button_background"
android:visibility="@{viewModel.hideSettings ? View.GONE : View.VISIBLE}"
app:drawableTint="?attr/color_main2_500"
app:layout_constraintStart_toStartOf="parent"
@ -191,6 +193,7 @@
android:drawableStart="@drawable/record_fill"
android:drawableEnd="@drawable/caret_right"
android:drawablePadding="8dp"
android:background="@drawable/squircle_transparent_button_background"
android:visibility="@{viewModel.hideRecordings ? View.GONE : View.VISIBLE}"
app:drawableTint="?attr/color_main2_500"
app:layout_constraintStart_toStartOf="parent"
@ -210,6 +213,7 @@
android:drawableStart="@drawable/question"
android:drawableEnd="@drawable/caret_right"
android:drawablePadding="8dp"
android:background="@drawable/squircle_transparent_button_background"
app:drawableTint="?attr/color_main2_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -242,6 +246,7 @@
android:visibility="@{viewModel.hideQuitButton ? View.GONE : View.VISIBLE, default=gone}"
android:drawableStart="@drawable/power"
android:drawablePadding="8dp"
android:background="@drawable/squircle_transparent_button_background"
app:drawableTint="?attr/color_main2_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

3
app/src/main/res/layout/drawer_shortcuts_list_cell.xml
View file

@ -13,7 +13,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp">
android:layout_marginBottom="10dp"
android:background="@drawable/squircle_transparent_button_background">
<ImageView
android:onClick="@{() -> model.clicked()}"

21
app/src/main/res/layout/file_media_viewer_activity.xml
View file

@ -48,7 +48,7 @@
<View
android:id="@+id/top_bar_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_height="@dimen/top_bar_height"
android:background="@color/bc_white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier"
@ -60,12 +60,13 @@
android:id="@+id/back"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
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_toBottomOf="@id/top_bar_background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
@ -107,26 +108,28 @@
android:id="@+id/share"
android:onClick="@{shareClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/share_network"
android:contentDescription="@string/content_description_share_file"
android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_main2_500"
app:tint="@color/file_viewer_main2_500"
app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
<ImageView
style="@style/icon_top_bar_button_style"
android:id="@+id/save"
android:onClick="@{exportClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/download_simple"
android:contentDescription="@string/content_description_save_file"
android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_main2_500"
app:tint="@color/file_viewer_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
<LinearLayout
android:id="@+id/toasts_area"

21
app/src/main/res/layout/file_viewer_activity.xml
View file

@ -86,7 +86,7 @@
<View
android:id="@+id/top_bar_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_height="@dimen/top_bar_height"
android:background="@color/bc_white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier"
@ -98,12 +98,13 @@
android:id="@+id/back"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
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_toBottomOf="@id/top_bar_barrier" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
@ -145,26 +146,28 @@
android:id="@+id/share"
android:onClick="@{shareClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/share_network"
android:contentDescription="@string/content_description_share_file"
android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_main2_500"
app:tint="@color/file_viewer_main2_500"
app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" />
<ImageView
style="@style/icon_top_bar_button_style"
android:id="@+id/save"
android:onClick="@{() -> viewModel.exportToMediaStore()}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/download_simple"
android:contentDescription="@string/content_description_save_file"
android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_main2_500"
app:tint="@color/file_viewer_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" />
<LinearLayout
android:id="@+id/toasts_area"

18
app/src/main/res/layout/main_activity_top_bar.xml
View file

@ -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" />
<include
@ -65,6 +64,7 @@
android:onClick="@{() -> viewModel.openDrawerMenu()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
layout="@layout/contact_avatar"
bind:model="@{viewModel.account}"
app:layout_constraintStart_toEndOf="@id/drawer_menu"
@ -96,10 +96,9 @@
android:layout_height="0dp"
android:src="@drawable/magnifying_glass"
android:contentDescription="@string/content_description_open_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toStartOf="@id/extra_action"
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_on_main" />
<ImageView
@ -111,10 +110,9 @@
android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
android:contentDescription="@{extraActionContentDescription}"
android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_on_main" />
<ImageView
@ -125,7 +123,6 @@
android:layout_height="0dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_cancel_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/search"
@ -171,7 +168,6 @@
android:layout_height="0dp"
android:src="@drawable/x"
android:contentDescription="@string/content_description_clear_filter"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/search"

6
app/src/main/res/layout/meeting_waiting_room_fragment.xml
View file

@ -109,12 +109,14 @@
<ImageView
android:id="@+id/switch_camera"
android:onClick="@{() -> viewModel.switchCamera()}"
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:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:padding="5dp"
android:visibility="@{viewModel.isVideoAvailable &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
android:src="@drawable/camera_rotate"
android:background="@drawable/circle_transparent_button_background"
android:contentDescription="@string/content_description_change_camera"
app:tint="@color/bc_white"
app:layout_constraintTop_toTopOf="@id/video_preview"

21
app/src/main/res/layout/recording_player_fragment.xml
View file

@ -104,7 +104,7 @@
<View
android:id="@+id/top_bar_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_height="@dimen/top_bar_height"
android:background="@color/bc_white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier"
@ -116,12 +116,13 @@
android:id="@+id/back"
android:onClick="@{backClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
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_toBottomOf="@id/top_bar_background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
@ -163,26 +164,28 @@
android:id="@+id/share"
android:onClick="@{shareClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/share_network"
android:contentDescription="@string/content_description_share_file"
android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_main2_500"
app:tint="@color/file_viewer_main2_500"
app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
<ImageView
style="@style/icon_top_bar_button_style"
android:id="@+id/save"
android:onClick="@{exportClickListener}"
android:layout_width="wrap_content"
android:layout_height="@dimen/top_bar_height"
android:layout_height="0dp"
android:src="@drawable/download_simple"
android:contentDescription="@string/content_description_save_file"
android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_main2_500"
app:tint="@color/file_viewer_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
<LinearLayout
android:id="@+id/toasts_area"

36
app/src/main/res/layout/settings_advanced_calls_fragment.xml
View file

@ -215,13 +215,14 @@
android:onClick="@{() -> viewModel.toggleEarlyMediaExpand()}"
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_early_media_title"
android:drawableEnd="@{viewModel.expandEarlyMedia ? @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/media_encryption_mandatory_switch"/>
@ -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"/>

10
app/src/main/res/layout/settings_advanced_fragment.xml
View file

@ -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"

2
app/src/main/res/layout/settings_calls.xml
View file

@ -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"

2
app/src/main/res/layout/settings_contacts.xml
View file

@ -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"/>

1
app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml
View file

@ -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"/>

90
app/src/main/res/layout/settings_fragment.xml
View file

@ -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"

15
app/src/main/res/layout/start_call_fragment.xml
View file

@ -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 @@
<ImageView
android:id="@+id/group_call_icon"
android:onClick="@{() -> viewModel.switchToMultipleSelectionMode()}"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_width="@dimen/big_icon_size"
android:layout_height="@dimen/big_icon_size"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:background="@drawable/shape_orange_round"
@ -217,10 +217,15 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:drawableEnd="@drawable/caret_right"
android:padding="5dp"
android:drawableTint="?attr/color_main2_900"
android:background="@drawable/transparent_background"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/history_call_start_create_group_call"
android:textColor="?attr/color_main2_900"
android:textSize="16sp"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
android:labelFor="@id/group_call_icon"

3
app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
View file

@ -239,10 +239,11 @@
android:src="@drawable/backspace_fill"
android:contentDescription="@string/content_description_erase_last_input"
android:padding="15dp"
android:background="@drawable/in_call_numpad_button_background"
app:layout_constraintStart_toStartOf="@id/digit_sharp"
app:layout_constraintEnd_toEndOf="@id/digit_sharp"
app:layout_constraintTop_toTopOf="@id/call_barrier"
app:tint="?attr/color_main2_600" />
app:tint="@color/bc_white" />
</androidx.constraintlayout.widget.ConstraintLayout>

15
app/src/main/res/layout/start_chat_fragment.xml
View file

@ -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 @@
<ImageView
android:id="@+id/group_chat_icon"
android:onClick="@{() -> viewModel.switchToMultipleSelectionMode()}"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_width="@dimen/big_icon_size"
android:layout_height="@dimen/big_icon_size"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:background="@drawable/shape_orange_round"
@ -199,10 +199,15 @@
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:drawableEnd="@drawable/caret_right"
android:padding="5dp"
android:drawableTint="?attr/color_main2_900"
android:background="@drawable/transparent_background"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/new_conversation_create_group"
android:textColor="?attr/color_main2_900"
android:textSize="16sp"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
android:labelFor="@id/group_chat_icon"

2
app/src/main/res/values-night/themes.xml
View file

@ -74,7 +74,7 @@
<item name="color_button_pressed_background">@color/gray_main2_600</item>
<item name="color_button_disabled_background">@color/gray_600</item>
<item name="color_gradient_start">@color/background_color_alt_dark_mode</item>
<item name="color_gradient_start">@color/gray_main2_800</item>
<item name="color_gradient_end">@color/background_color_alt_dark_mode</item>
<item name="color_trust_background">@color/gray_main2_600</item>

1
app/src/main/res/values/dimen.xml
View file

@ -11,6 +11,7 @@
<dimen name="small_icon_size">14dp</dimen>
<dimen name="icon_size">24dp</dimen>
<dimen name="large_icon_size">32dp</dimen>
<dimen name="big_icon_size">48dp</dimen>
<dimen name="welcome_icon_size">100dp</dimen>
<dimen name="assistant_title_top_margin">30dp</dimen>