diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml index 60b45bdfd..bbd59113e 100644 --- a/app/src/main/res/drawable/add.xml +++ b/app/src/main/res/drawable/add.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="25dp" + android:viewportWidth="24" + android:viewportHeight="25"> diff --git a/app/src/main/res/drawable/arrow.xml b/app/src/main/res/drawable/arrow.xml new file mode 100644 index 000000000..4d326b34f --- /dev/null +++ b/app/src/main/res/drawable/arrow.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/dot_menu.xml b/app/src/main/res/drawable/dot_menu.xml new file mode 100644 index 000000000..25bb25e6c --- /dev/null +++ b/app/src/main/res/drawable/dot_menu.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/help.xml b/app/src/main/res/drawable/help.xml new file mode 100644 index 000000000..0905b2eb0 --- /dev/null +++ b/app/src/main/res/drawable/help.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/recordings.xml b/app/src/main/res/drawable/recordings.xml new file mode 100644 index 000000000..e897e9bcf --- /dev/null +++ b/app/src/main/res/drawable/recordings.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml new file mode 100644 index 000000000..f3e68abf1 --- /dev/null +++ b/app/src/main/res/drawable/settings.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/shape_chip_gray_background.xml b/app/src/main/res/drawable/shape_chip_gray_background.xml new file mode 100644 index 000000000..163c0ed7a --- /dev/null +++ b/app/src/main/res/drawable/shape_chip_gray_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_orange_background.xml b/app/src/main/res/drawable/shape_chip_orange_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_round_orange_background.xml rename to app/src/main/res/drawable/shape_chip_orange_background.xml diff --git a/app/src/main/res/drawable/shape_orange_outlined_button_background.xml b/app/src/main/res/drawable/shape_orange_outlined_button_background.xml new file mode 100644 index 000000000..6814dee61 --- /dev/null +++ b/app/src/main/res/drawable/shape_orange_outlined_button_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_dialog_red_button_background.xml b/app/src/main/res/drawable/shape_red_outlined_button_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_dialog_red_button_background.xml rename to app/src/main/res/drawable/shape_red_outlined_button_background.xml diff --git a/app/src/main/res/layout-land/calls_list_fragment.xml b/app/src/main/res/layout-land/calls_list_fragment.xml index eaf904c59..26be7c7f8 100644 --- a/app/src/main/res/layout-land/calls_list_fragment.xml +++ b/app/src/main/res/layout-land/calls_list_fragment.xml @@ -29,7 +29,7 @@ bind:viewModel="@{viewModel}" bind:onAvatarClickListener="@{onAvatarClickListener}" layout="@layout/top_search_bar" - android:layout_height="wrap_content" + android:layout_height="@dimen/top_search_bar_height" android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml index 65f06cd4b..afa93f770 100644 --- a/app/src/main/res/layout-land/contacts_list_fragment.xml +++ b/app/src/main/res/layout-land/contacts_list_fragment.xml @@ -49,7 +49,7 @@ bind:viewModel="@{viewModel}" bind:onAvatarClickListener="@{onAvatarClickListener}" layout="@layout/top_search_bar" - android:layout_height="wrap_content" + android:layout_height="@dimen/top_search_bar_height" android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml new file mode 100644 index 000000000..d4986f2bd --- /dev/null +++ b/app/src/main/res/layout/account_list_cell.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/contact_device_trust_list_cell.xml b/app/src/main/res/layout/contact_device_trust_list_cell.xml index 84dc4a4fd..a8ac1a3c3 100644 --- a/app/src/main/res/layout/contact_device_trust_list_cell.xml +++ b/app/src/main/res/layout/contact_device_trust_list_cell.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" - android:background="@drawable/shape_round_orange_background" + android:background="@drawable/shape_chip_orange_background" android:paddingStart="12dp" android:paddingEnd="12dp" android:paddingTop="6dp" diff --git a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml index e7e6b0d1e..39afe6176 100644 --- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml @@ -171,7 +171,7 @@ android:paddingBottom="13dp" android:paddingTop="13dp" android:gravity="center" - android:background="@drawable/shape_dialog_red_button_background" + android:background="@drawable/shape_red_outlined_button_background" android:text="Letters don't match!" android:textSize="18sp" android:textColor="@color/red_danger" diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml new file mode 100644 index 000000000..2413493ea --- /dev/null +++ b/app/src/main/res/layout/drawer_menu.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index a74f57ad5..4def700f0 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -39,7 +39,8 @@ android:background="@color/white" android:layout_gravity="start"> - + diff --git a/app/src/main/res/layout/top_search_bar.xml b/app/src/main/res/layout/top_search_bar.xml index 7e1f405c4..cbce96226 100644 --- a/app/src/main/res/layout/top_search_bar.xml +++ b/app/src/main/res/layout/top_search_bar.xml @@ -15,20 +15,20 @@ + android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}" /> + android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}" /> - - - + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755bf..4fe59c4e6 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..af7722189 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ec..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..a0dc2e060 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1b..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-hdpi/linphone_launcher_icon_foreground.png new file mode 100644 index 000000000..9814db082 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/linphone_launcher_icon_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..4bf908cd7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..6822c177e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da0..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-mdpi/linphone_launcher_icon_foreground.png new file mode 100644 index 000000000..fc4df8f44 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/linphone_launcher_icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..7e717e4d6 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070f..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..af7199df7 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-xhdpi/linphone_launcher_icon_foreground.png new file mode 100644 index 000000000..e00b4c182 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/linphone_launcher_icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..78b30bafa Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..62992b974 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f5083..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-xxhdpi/linphone_launcher_icon_foreground.png new file mode 100644 index 000000000..4cf81b117 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/linphone_launcher_icon_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..05c036329 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..e5f1eef82 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37c..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/linphone_launcher_icon_foreground.png b/app/src/main/res/mipmap-xxxhdpi/linphone_launcher_icon_foreground.png new file mode 100644 index 000000000..bb4ed4310 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/linphone_launcher_icon_foreground.png differ diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index a76a5d803..f9bf994c0 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -11,6 +11,8 @@ 100dp 120dp + 55dp + 116dp 237dp 353dp