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

Renamed some drawables, removed some others

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-12 13:51:05 +02:00
parent d51f25ea88
commit 34424dfbc3
66 changed files with 170 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt
View file

@ -125,6 +125,9 @@ class CallFragment : GenericFragment() {
goBack() // TODO FIXME : issue with tablet when pane can't be closed
}
}
// TODO: remove later
binding.chat.isEnabled = false
}
private fun copyNumberOrAddressToClipboard(value: String) {

3
app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
View file

@ -198,6 +198,9 @@ class ContactFragment : GenericFragment() {
showConfirmTrustCallDialog(pair.first, pair.second)
}
}
// TODO: remove later
binding.chat.isEnabled = false
}
override fun onPause() {

4
app/src/main/res/drawable/action_background.xml
View file

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

7
app/src/main/res/drawable/call_chat_button_background.xml
View file

@ -1,7 +0,0 @@
<?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_button_round_pressed" />
<item
android:drawable="@drawable/shape_button_round" />
</selector>

6
app/src/main/res/drawable/cell_background.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/shape_selected_list_cell_background" />
android:drawable="@drawable/shape_rectangle_gray_background" />
<item android:state_pressed="true"
android:drawable="@drawable/shape_selected_list_cell_background" />
android:drawable="@drawable/shape_rectangle_gray_background" />
<item
android:drawable="@drawable/shape_list_cell_background" />
android:drawable="@drawable/shape_rectangle_white_background" />
</selector>

9
app/src/main/res/drawable/circle_green_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_enabled="false"
android:drawable="@drawable/shape_primary_button_disabled_background" />
<item android:state_pressed="true"
android:drawable="@drawable/shape_circle_green_pressed_background" />
<item
android:drawable="@drawable/shape_circle_green_background" />
</selector>

9
app/src/main/res/drawable/circle_light_blue_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_enabled="false"
android:drawable="@drawable/shape_circle_light_blue_disabled_background" />
<item android:state_pressed="true"
android:drawable="@drawable/shape_circle_light_blue_pressed_background" />
<item
android:drawable="@drawable/shape_circle_light_blue_background" />
</selector>

9
app/src/main/res/drawable/circle_white_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_enabled="false"
android:drawable="@drawable/shape_primary_button_disabled_background" />
<item android:state_pressed="true"
android:drawable="@drawable/shape_circle_white_pressed_background" />
<item
android:drawable="@drawable/shape_circle_white_background" />
</selector>

4
app/src/main/res/drawable/menu_item_background.xml
View file

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

5
app/src/main/res/drawable/shape_circle_green_pressed_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="oval">
<size android:width="70dp" android:height="70dp" />
<solid android:color="@color/green_pressed"/>
</shape>

2
app/src/main/res/drawable/shape_avatar_background.xml → app/src/main/res/drawable/shape_circle_light_blue_background.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<size android:width="44dp" android:height="44dp" />
<solid android:color="@color/blue_outgoing_message"/>
<solid android:color="@color/blue_light"/>
</shape>

0
app/src/main/res/drawable/shape_button_round_pressed.xml → app/src/main/res/drawable/shape_circle_light_blue_disabled_background.xml
View file

2
app/src/main/res/drawable/shape_button_round.xml → app/src/main/res/drawable/shape_circle_light_blue_pressed_background.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<size android:width="44dp" android:height="44dp" />
<solid android:color="@color/blue_outgoing_message"/>
<solid android:color="@color/blue_light_disabled"/>
</shape>

5
app/src/main/res/drawable/shape_circle_white_pressed_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="oval">
<size android:width="70dp" android:height="70dp" />
<solid android:color="@color/gray_11"/>
</shape>

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

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<size android:width="75dp" android:height="5dp" />
<corners android:radius="5dp"/>
<solid android:color="@color/drawer_handle"/>
<solid android:color="@color/blue_light_disabled"/>
</shape>

0
app/src/main/res/drawable/shape_selected_list_cell_background.xml → app/src/main/res/drawable/shape_rectangle_gray_background.xml
View file

0
app/src/main/res/drawable/shape_list_cell_background.xml → app/src/main/res/drawable/shape_rectangle_white_background.xml
View file

0
app/src/main/res/drawable/shape_chip_gray_background.xml → app/src/main/res/drawable/shape_squircle_gray_background.xml
View file

0
app/src/main/res/drawable/shape_answer_button_background.xml → app/src/main/res/drawable/shape_squircle_green_background.xml
View file

5
app/src/main/res/drawable/shape_squircle_green_pressed_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="71dp" />
<solid android:color="@color/green_pressed"/>
</shape>

0
app/src/main/res/drawable/shape_dialog_orange_shadow.xml → app/src/main/res/drawable/shape_squircle_primary_background.xml
View file

0
app/src/main/res/drawable/shape_hang_up_button_background.xml → app/src/main/res/drawable/shape_squircle_red_background.xml
View file

4
app/src/main/res/drawable/shape_round_white_background.xml → app/src/main/res/drawable/shape_squircle_red_disabled_background.xml
View file

@ -1,5 +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/white"/>
<corners android:radius="71dp" />
<solid android:color="@color/red_disabled"/>
</shape>

3
app/src/main/res/drawable/shape_white_background.xml → app/src/main/res/drawable/shape_squircle_red_pressed_background.xml
View file

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

0
app/src/main/res/drawable/shape_dialog_background.xml → app/src/main/res/drawable/shape_squircle_white_background.xml
View file

9
app/src/main/res/drawable/squircle_green_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_enabled="false"
android:drawable="@drawable/shape_squircle_red_disabled_background" />
<item android:state_pressed="true"
android:drawable="@drawable/shape_squircle_green_pressed_background" />
<item
android:drawable="@drawable/shape_squircle_green_background" />
</selector>

9
app/src/main/res/drawable/squircle_red_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_enabled="false"
android:drawable="@drawable/shape_squircle_red_disabled_background" />
<item android:state_pressed="true"
android:drawable="@drawable/shape_squircle_red_pressed_background" />
<item
android:drawable="@drawable/shape_squircle_red_background" />
</selector>

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

@ -61,7 +61,7 @@
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_white_background"
android:src="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"

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

@ -65,7 +65,7 @@
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_white_background"
android:src="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"

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

@ -15,7 +15,7 @@
android:onClick="@{() -> model.setAsDefault()}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_list_cell_background">
android:background="@color/white">
<androidx.constraintlayout.widget.Barrier
android:id="@+id/left_barrier"
@ -32,10 +32,10 @@
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
accountAvatar="@{model}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
app:avatarViewInitialsTextStyle="bold"
@ -80,7 +80,7 @@
android:paddingEnd="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:background="@drawable/shape_chip_gray_background"
android:background="@drawable/shape_squircle_gray_background"
android:gravity="center"
android:text="@{model.registrationState, default=@string/drawer_menu_account_connection_status_connected}"
android:textColor="@{model.isConnected ? @color/green_online : model.inError ? @color/red_danger : @color/gray_1, default=@color/green_online}"
@ -121,7 +121,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

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

@ -56,7 +56,7 @@
android:layout_width="@dimen/avatar_big_size"
android:layout_height="@dimen/avatar_big_size"
android:layout_marginTop="8dp"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
coil="@{viewModel.picturePath}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -71,7 +71,7 @@
android:layout_height="0dp"
android:layout_weight="1"
android:cacheColorHint="@color/transparent_color"
android:divider="@color/blue_outgoing_message"
android:divider="@color/blue_light"
android:dividerHeight="1dp" />
<androidx.appcompat.widget.AppCompatTextView

4
app/src/main/res/layout/assistant_login_fragment.xml
View file

@ -213,7 +213,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/or"
app:layout_constraintTop_toTopOf="@id/or"
@ -223,7 +223,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginEnd="16dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toEndOf="@id/or"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/or"

4
app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
View file

@ -60,7 +60,7 @@
android:layout_height="56dp"
android:layout_marginTop="68dp"
android:layout_marginEnd="30dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/chat_text"
app:tint="@color/gray_1"
@ -74,7 +74,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="68dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/video_camera_slash"
app:tint="@color/gray_1"

12
app/src/main/res/layout/call_fragment.xml
View file

@ -77,9 +77,9 @@
android:layout_width="@dimen/avatar_big_size"
android:layout_height="@dimen/avatar_big_size"
android:layout_marginTop="8dp"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{viewModel.callLogModel.avatarModel}"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="21sp"
app:avatarViewInitialsTextStyle="bold"
@ -146,7 +146,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="20dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/phone"
app:tint="@color/gray_1"
@ -173,7 +173,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="20dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/chat_dots"
app:tint="@color/gray_1"
@ -200,7 +200,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="20dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/video_camera"
app:tint="@color/gray_1"
@ -231,7 +231,7 @@
android:layout_marginBottom="24dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:background="@drawable/shape_round_white_background"
android:background="@drawable/shape_squircle_white_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/call_label"

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

@ -74,7 +74,7 @@
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="11dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

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

@ -36,10 +36,10 @@
android:layout_marginBottom="5dp"
android:layout_marginStart="5dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{model.avatarModel}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
app:avatarViewInitialsTextStyle="bold"
@ -116,7 +116,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

4
app/src/main/res/layout/call_start_numpad.xml
View file

@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:padding="11dp"
android:src="@drawable/shape_drawer_handle"
app:tint="@color/drawer_handle"
app:tint="@color/blue_light_disabled"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@ -178,7 +178,7 @@
android:src="@drawable/phone"
android:padding="15dp"
android:elevation="3dp"
android:background="@drawable/shape_circle_green_background"
android:background="@drawable/circle_green_button_background"
app:tint="@color/white"
app:layout_constraintTop_toBottomOf="@id/flow"
app:layout_constraintStart_toStartOf="parent"

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

@ -25,10 +25,10 @@
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
avatarInitials="@{model.initials, default=`JD`}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
app:avatarViewInitialsTextStyle="bold"
@ -54,7 +54,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

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

@ -61,7 +61,7 @@
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_white_background"
android:src="@color/white"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/contact_favourite_list_cell.xml
View file

@ -30,10 +30,10 @@
android:layout_width="@dimen/avatar_favorite_list_cell_size"
android:layout_height="@dimen/avatar_favorite_list_cell_size"
android:adjustViewBounds="true"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{model}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
app:avatarViewInitialsTextStyle="bold"

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

@ -104,9 +104,9 @@
android:layout_height="@dimen/avatar_big_size"
android:layout_marginTop="8dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{viewModel.contact}"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="21sp"
app:avatarViewInitialsTextStyle="bold"
@ -161,7 +161,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="20dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/phone"
app:tint="@color/gray_1"
@ -183,12 +183,11 @@
app:layout_constraintEnd_toEndOf="@id/call"/>
<ImageView
android:onClick="@{() -> viewModel.sendMessage()}"
android:id="@+id/chat"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="20dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/chat_dots"
app:tint="@color/gray_1"
@ -215,7 +214,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="20dp"
android:background="@drawable/call_chat_button_background"
android:background="@drawable/circle_light_blue_button_background"
android:padding="16dp"
android:src="@drawable/video_camera"
app:tint="@color/gray_1"
@ -264,7 +263,7 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="10dp"
android:padding="10dp"
android:background="@drawable/shape_round_white_background"
android:background="@drawable/shape_squircle_white_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/numbers_and_addresses_label"
@ -278,7 +277,7 @@
android:layout_marginTop="16dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:src="@drawable/shape_round_white_background"
android:src="@drawable/shape_squircle_white_background"
android:visibility="@{viewModel.title.length() > 0 || viewModel.company.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -383,7 +382,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:src="@drawable/shape_round_white_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/trust_label"
@ -470,7 +469,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:src="@drawable/shape_round_white_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/actions"
@ -496,7 +495,7 @@
android:layout_height="1dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/action_edit"
app:layout_constraintEnd_toEndOf="@id/action_edit"
app:layout_constraintTop_toBottomOf="@+id/action_edit"/>
@ -522,7 +521,7 @@
android:layout_height="1dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/action_favorite"
app:layout_constraintEnd_toEndOf="@id/action_favorite"
app:layout_constraintTop_toBottomOf="@+id/action_favorite"/>
@ -547,7 +546,7 @@
android:layout_height="1dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/action_share"
app:layout_constraintEnd_toEndOf="@id/action_share"
app:layout_constraintTop_toBottomOf="@+id/action_share"/>

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

@ -60,10 +60,10 @@
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{model}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
app:avatarViewInitialsTextStyle="bold"
@ -101,7 +101,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

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

@ -84,7 +84,7 @@
android:layout_width="@dimen/avatar_big_size"
android:layout_height="@dimen/avatar_big_size"
android:layout_marginTop="8dp"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
coil="@{viewModel.picturePath}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -63,7 +63,7 @@
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/number_or_address"

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

@ -55,7 +55,7 @@
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_white_background"
android:src="@color/white"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
View file

@ -19,7 +19,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -32,7 +32,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
android:clickable="true"
android:focusable="true"
app:layout_constraintWidth_max="@dimen/dialog_max_width"

4
app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
View file

@ -19,7 +19,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -32,7 +32,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/dialog_cancel_contact_changes.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -33,7 +33,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -33,7 +33,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
View file

@ -19,7 +19,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -32,7 +32,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/dialog_contact_trust_process.xml
View file

@ -19,7 +19,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -32,7 +32,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="parent"

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

@ -50,7 +50,7 @@
android:layout_height="1dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/number_or_address"

4
app/src/main/res/layout/dialog_pick_number_or_address.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -33,7 +33,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/dialog_remove_all_call_logs.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/dialog_background_shadow"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/shape_dialog_orange_shadow"
android:src="@drawable/shape_squircle_primary_background"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -33,7 +33,7 @@
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:src="@drawable/shape_squircle_white_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintEnd_toEndOf="parent"

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

@ -118,7 +118,7 @@
android:layout_marginBottom="30dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/blue_outgoing_message"
android:background="@color/blue_light"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/settings" />

4
app/src/main/res/layout/top_search_bar.xml
View file

@ -40,10 +40,10 @@
android:layout_width="@dimen/avatar_list_cell_size"
android:layout_height="@dimen/avatar_list_cell_size"
android:layout_marginStart="15dp"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
accountAvatar="@{viewModel.account}"
app:avatarViewPlaceholder="@drawable/contact_avatar"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="16sp"
app:avatarViewInitialsTextStyle="bold"

4
app/src/main/res/layout/voip_active_call_fragment.xml
View file

@ -51,9 +51,9 @@
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_in_call_size"
android:layout_height="@dimen/avatar_in_call_size"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{viewModel.contact}"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="36sp"
app:avatarViewInitialsTextStyle="bold"

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

@ -41,7 +41,7 @@
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:src="@drawable/phone_disconnect"
android:background="@drawable/shape_hang_up_button_background"
android:background="@drawable/squircle_red_button_background"
app:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />

4
app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/hang_up"
android:layout_width="wrap_content"
android:layout_height="@dimen/voip_button_size"
android:background="@drawable/shape_hang_up_button_background"
android:background="@drawable/squircle_red_button_background"
android:onClick="@{() -> viewModel.hangUp()}"
android:paddingStart="30dp"
android:paddingTop="15dp"
@ -36,7 +36,7 @@
android:id="@+id/answer_call"
android:layout_width="wrap_content"
android:layout_height="@dimen/voip_button_size"
android:background="@drawable/shape_answer_button_background"
android:background="@drawable/squircle_green_button_background"
android:onClick="@{() -> viewModel.answer()}"
android:paddingStart="30dp"
android:paddingTop="15dp"

4
app/src/main/res/layout/voip_incoming_call_fragment.xml
View file

@ -57,9 +57,9 @@
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_in_call_size"
android:layout_height="@dimen/avatar_in_call_size"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{viewModel.contact}"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="36sp"
app:avatarViewInitialsTextStyle="bold"

4
app/src/main/res/layout/voip_outgoing_call_fragment.xml
View file

@ -71,9 +71,9 @@
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_in_call_size"
android:layout_height="@dimen/avatar_in_call_size"
android:background="@drawable/shape_avatar_background"
android:background="@drawable/shape_circle_light_blue_background"
contactAvatar="@{viewModel.contact}"
app:avatarViewInitialsBackgroundColor="@color/blue_outgoing_message"
app:avatarViewInitialsBackgroundColor="@color/blue_light"
app:avatarViewInitialsTextColor="@color/gray_9"
app:avatarViewInitialsTextSize="36sp"
app:avatarViewInitialsTextStyle="bold"

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

@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
app:dotsColor="@color/blue_outgoing_message"
app:dotsColor="@color/blue_light"
app:dotsCornerRadius="8dp"
app:dotsSize="13dp"
app:dotsSpacing="5dp"

10
app/src/main/res/values/colors.xml
View file

@ -9,19 +9,22 @@
<color name="black">#000000</color>
<color name="white">#FFFFFF</color>
<color name="red_danger">#DD5F5F</color>
<color name="red_pressed">#9E3548</color>
<color name="red_disabled">#F5CCBE</color>
<color name="green_online">#4FAE80</color>
<color name="blue_outgoing_message">#DFECF2</color>
<color name="green_pressed">#377D71</color>
<color name="blue_light">#DFECF2</color>
<color name="blue_light_disabled">#C0D1D9</color>
<color name="blue_trusted">#4AA8FF</color>
<color name="orange_away">#FFA645</color>
<color name="gray_offline">#E1E1E1</color>
<color name="warning_orange_background">#FFEACB</color>
<color name="warning_orange_pressed_background">#FFB266</color>
<color name="dialog_background">#A622334D</color>
<color name="drawer_handle">#C0D1D9</color>
<color name="gradient_start">#EEF7F8</color>
<color name="gray_1">#6C7A87</color>
<color name="gray_1">#6C7A87</color>0xFF
<color name="gray_2">#F9F9F9</color>
<color name="gray_3">#EEF6F8</color>
<color name="gray_4">#949494</color>
@ -31,6 +34,7 @@
<color name="gray_8">#364860</color>
<color name="gray_9">#4E6074</color>
<color name="gray_10">#9AABB5</color>
<color name="gray_11">#C9C9C9</color>
<color name="separator">#E5E5EA</color>
<color name="in_call_black">#070707</color>

6
app/src/main/res/values/strings.xml
View file

@ -106,9 +106,9 @@
<string name="manage_account_international_prefix">International Prefix</string>
<string name="friend_presence_status_online">Online</string>
<string name="friend_presence_status_was_online_on">Online on $1%s</string>
<string name="friend_presence_status_was_online_today_at">Online today at $1%s</string>
<string name="friend_presence_status_was_online_yesterday_at">Online yesterday at $1%s</string>
<string name="friend_presence_status_was_online_on">Online on %s</string>
<string name="friend_presence_status_was_online_today_at">Online today at %s</string>
<string name="friend_presence_status_was_online_yesterday_at">Online yesterday at %s</string>
<string name="friend_presence_status_away">Away</string>
<string name="friend_presence_status_do_not_disturb">Do not disturb</string>
<string name="friend_call_action">Call</string>

2
app/src/main/res/values/styles.xml
View file

@ -56,7 +56,7 @@
<item name="android:textSize">32sp</item>
<item name="android:gravity">center</item>
<item name="android:elevation">3dp</item>
<item name="android:background">@drawable/shape_circle_white_background</item>
<item name="android:background">@drawable/circle_white_button_background</item>
</style>
<style name="in_call_extra_action_label_style">
<item name="android:fontFamily">@font/noto_sans</item>