From 409e658f80e96d9e64b56d2717db424524d7f86f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 24 Aug 2023 15:19:33 +0200 Subject: [PATCH] New icons from phosphoricons library + moved blue toast from fragment to activty --- .../org/linphone/contacts/ContactsManager.kt | 2 +- .../notifications/NotificationsManager.kt | 25 ++------------- .../ui/main/calls/fragment/CallFragment.kt | 4 +-- .../main/calls/fragment/CallsListFragment.kt | 4 +-- .../main/contacts/fragment/ContactFragment.kt | 3 +- .../main/contacts/model/ContactAvatarModel.kt | 2 ++ .../java/org/linphone/ui/voip/VoipActivity.kt | 12 +++++++ .../ui/voip/fragment/ActiveCallFragment.kt | 21 ++++++++---- .../ui/voip/viewmodel/CurrentCallViewModel.kt | 1 + .../org/linphone/utils/DataBindingUtils.kt | 7 ++++ app/src/main/res/drawable-up/caret.xml | 9 ++++++ app/src/main/res/drawable/add.xml | 13 -------- app/src/main/res/drawable/add_file.xml | 26 --------------- app/src/main/res/drawable/address_book.xml | 9 ++++++ app/src/main/res/drawable/arrow.xml | 13 -------- app/src/main/res/drawable/back.xml | 15 --------- app/src/main/res/drawable/calls.xml | 13 -------- app/src/main/res/drawable/camera.xml | 9 ++++++ app/src/main/res/drawable/camera_disabled.xml | 13 -------- app/src/main/res/drawable/camera_enabled.xml | 13 -------- app/src/main/res/drawable/camera_rotate.xml | 9 ++++++ app/src/main/res/drawable/caret_down.xml | 9 ++++++ app/src/main/res/drawable/caret_left.xml | 9 ++++++ app/src/main/res/drawable/caret_right.xml | 9 ++++++ .../drawable/{collapse.xml => caret_up.xml} | 0 app/src/main/res/drawable/chat.xml | 13 -------- app/src/main/res/drawable/chat_dots.xml | 9 ++++++ app/src/main/res/drawable/chat_text.xml | 9 ++++++ app/src/main/res/drawable/check.xml | 13 -------- app/src/main/res/drawable/check_fat_fill.xml | 9 ++++++ app/src/main/res/drawable/close.xml | 13 -------- app/src/main/res/drawable/contact.xml | 20 ------------ app/src/main/res/drawable/contacts.xml | 13 -------- app/src/main/res/drawable/conversations.xml | 13 -------- app/src/main/res/drawable/copy.xml | 24 ++++---------- app/src/main/res/drawable/delete.xml | 13 -------- app/src/main/res/drawable/dot_menu.xml | 13 -------- .../main/res/drawable/dots_three_vertical.xml | 9 ++++++ app/src/main/res/drawable/edit.xml | 13 -------- app/src/main/res/drawable/expand.xml | 17 ---------- app/src/main/res/drawable/eye.xml | 9 ++++++ app/src/main/res/drawable/eye_slash.xml | 9 ++++++ app/src/main/res/drawable/favourite.xml | 13 -------- app/src/main/res/drawable/gear.xml | 9 ++++++ app/src/main/res/drawable/group_chat.xml | 20 ------------ app/src/main/res/drawable/hang_up.xml | 13 -------- app/src/main/res/drawable/heart.xml | 9 ++++++ app/src/main/res/drawable/heart_fill.xml | 9 ++++++ app/src/main/res/drawable/help.xml | 13 -------- app/src/main/res/drawable/hide_password.xml | 13 -------- .../res/drawable/in_call_camera_button.xml | 10 ------ app/src/main/res/drawable/info.xml | 20 +++++------- app/src/main/res/drawable/invite.xml | 13 -------- app/src/main/res/drawable/list.xml | 9 ++++++ .../main/res/drawable/magnifying_glass.xml | 9 ++++++ app/src/main/res/drawable/manage_profile.xml | 15 --------- app/src/main/res/drawable/meetings.xml | 20 ------------ app/src/main/res/drawable/menu.xml | 13 -------- app/src/main/res/drawable/microphone.xml | 20 +++++------- .../main/res/drawable/microphone_muted.xml | 13 -------- .../main/res/drawable/microphone_slash.xml | 9 ++++++ app/src/main/res/drawable/new_call.xml | 13 -------- app/src/main/res/drawable/new_contact.xml | 15 --------- app/src/main/res/drawable/next.xml | 16 ---------- app/src/main/res/drawable/not_favourite.xml | 13 -------- app/src/main/res/drawable/pencil_simple.xml | 9 ++++++ app/src/main/res/drawable/phone.xml | 9 ++++++ app/src/main/res/drawable/phone_call.xml | 20 ------------ .../main/res/drawable/phone_disconnect.xml | 9 ++++++ app/src/main/res/drawable/phone_plus.xml | 9 ++++++ app/src/main/res/drawable/pick_picture.xml | 13 -------- app/src/main/res/drawable/plus_circle.xml | 9 ++++++ app/src/main/res/drawable/qr_code.xml | 9 ++++++ app/src/main/res/drawable/question.xml | 9 ++++++ app/src/main/res/drawable/record.xml | 9 ++++++ app/src/main/res/drawable/record_call.xml | 20 ------------ app/src/main/res/drawable/search.xml | 13 -------- app/src/main/res/drawable/settings.xml | 13 -------- app/src/main/res/drawable/share.xml | 13 -------- app/src/main/res/drawable/share_network.xml | 9 ++++++ app/src/main/res/drawable/show_password.xml | 13 -------- app/src/main/res/drawable/speaker_high.xml | 9 ++++++ app/src/main/res/drawable/speaker_off.xml | 13 -------- app/src/main/res/drawable/speaker_on.xml | 13 -------- app/src/main/res/drawable/speaker_slash.xml | 9 ++++++ app/src/main/res/drawable/spinner.xml | 13 -------- app/src/main/res/drawable/switch_camera.xml | 20 ------------ app/src/main/res/drawable/trash_simple.xml | 9 ++++++ app/src/main/res/drawable/user_circle.xml | 9 ++++++ app/src/main/res/drawable/user_gear.xml | 9 ++++++ app/src/main/res/drawable/user_plus.xml | 9 ++++++ app/src/main/res/drawable/users_three.xml | 9 ++++++ app/src/main/res/drawable/video_call.xml | 13 -------- app/src/main/res/drawable/video_camera.xml | 9 ++++++ .../main/res/drawable/video_camera_slash.xml | 9 ++++++ app/src/main/res/drawable/warning.xml | 13 -------- app/src/main/res/drawable/warning_circle.xml | 9 ++++++ app/src/main/res/drawable/x.xml | 9 ++++++ .../main/res/layout-land/bottom_nav_bar.xml | 8 ++--- .../res/layout-land/calls_list_fragment.xml | 8 ++--- .../layout-land/contacts_list_fragment.xml | 4 +-- app/src/main/res/layout/account_list_cell.xml | 9 ++---- .../main/res/layout/account_popup_menu.xml | 2 +- .../res/layout/account_profile_fragment.xml | 4 +-- .../res/layout/assistant_login_fragment.xml | 8 ++--- .../layout/assistant_register_fragment.xml | 4 +-- app/src/main/res/layout/bottom_nav_bar.xml | 8 ++--- app/src/main/res/layout/call_fragment.xml | 10 +++--- app/src/main/res/layout/call_list_cell.xml | 2 +- app/src/main/res/layout/call_popup_menu.xml | 6 ++-- .../main/res/layout/call_start_fragment.xml | 10 +++--- .../main/res/layout/calls_list_fragment.xml | 8 ++--- .../res/layout/calls_list_long_press_menu.xml | 6 ++-- .../main/res/layout/calls_list_popup_menu.xml | 2 +- .../layout/contact_device_trust_list_cell.xml | 2 +- app/src/main/res/layout/contact_fragment.xml | 23 +++++++------ .../res/layout/contact_new_or_edit_cell.xml | 2 +- .../layout/contact_new_or_edit_fragment.xml | 6 ++-- .../contact_number_address_list_cell.xml | 2 +- ...tact_number_or_address_long_press_menu.xml | 2 +- .../res/layout/contacts_list_fragment.xml | 4 +-- .../layout/contacts_list_long_press_menu.xml | 6 ++-- .../main/res/layout/conversation_fragment.xml | 8 ++--- .../layout/conversation_start_fragment.xml | 6 ++-- .../res/layout/conversations_fragment.xml | 4 +-- app/src/main/res/layout/drawer_menu.xml | 14 ++++---- app/src/main/res/layout/toast_green.xml | 2 +- app/src/main/res/layout/top_search_bar.xml | 6 ++-- .../res/layout/voip_active_call_fragment.xml | 26 ++++++--------- app/src/main/res/layout/voip_activity.xml | 32 +++++++++++++++---- .../res/layout/voip_call_extra_actions.xml | 6 ++-- .../res/layout/voip_call_main_actions.xml | 10 +++--- .../layout/voip_incoming_call_bottom_bar.xml | 4 +-- .../layout/voip_outgoing_call_fragment.xml | 2 +- app/src/main/res/values/dimen.xml | 1 + 135 files changed, 551 insertions(+), 862 deletions(-) create mode 100644 app/src/main/res/drawable-up/caret.xml delete mode 100644 app/src/main/res/drawable/add.xml delete mode 100644 app/src/main/res/drawable/add_file.xml create mode 100644 app/src/main/res/drawable/address_book.xml delete mode 100644 app/src/main/res/drawable/arrow.xml delete mode 100644 app/src/main/res/drawable/back.xml delete mode 100644 app/src/main/res/drawable/calls.xml create mode 100644 app/src/main/res/drawable/camera.xml delete mode 100644 app/src/main/res/drawable/camera_disabled.xml delete mode 100644 app/src/main/res/drawable/camera_enabled.xml create mode 100644 app/src/main/res/drawable/camera_rotate.xml create mode 100644 app/src/main/res/drawable/caret_down.xml create mode 100644 app/src/main/res/drawable/caret_left.xml create mode 100644 app/src/main/res/drawable/caret_right.xml rename app/src/main/res/drawable/{collapse.xml => caret_up.xml} (100%) delete mode 100644 app/src/main/res/drawable/chat.xml create mode 100644 app/src/main/res/drawable/chat_dots.xml create mode 100644 app/src/main/res/drawable/chat_text.xml delete mode 100644 app/src/main/res/drawable/check.xml create mode 100644 app/src/main/res/drawable/check_fat_fill.xml delete mode 100644 app/src/main/res/drawable/close.xml delete mode 100644 app/src/main/res/drawable/contact.xml delete mode 100644 app/src/main/res/drawable/contacts.xml delete mode 100644 app/src/main/res/drawable/conversations.xml delete mode 100644 app/src/main/res/drawable/delete.xml delete mode 100644 app/src/main/res/drawable/dot_menu.xml create mode 100644 app/src/main/res/drawable/dots_three_vertical.xml delete mode 100644 app/src/main/res/drawable/edit.xml delete mode 100644 app/src/main/res/drawable/expand.xml create mode 100644 app/src/main/res/drawable/eye.xml create mode 100644 app/src/main/res/drawable/eye_slash.xml delete mode 100644 app/src/main/res/drawable/favourite.xml create mode 100644 app/src/main/res/drawable/gear.xml delete mode 100644 app/src/main/res/drawable/group_chat.xml delete mode 100644 app/src/main/res/drawable/hang_up.xml create mode 100644 app/src/main/res/drawable/heart.xml create mode 100644 app/src/main/res/drawable/heart_fill.xml delete mode 100644 app/src/main/res/drawable/help.xml delete mode 100644 app/src/main/res/drawable/hide_password.xml delete mode 100644 app/src/main/res/drawable/in_call_camera_button.xml delete mode 100644 app/src/main/res/drawable/invite.xml create mode 100644 app/src/main/res/drawable/list.xml create mode 100644 app/src/main/res/drawable/magnifying_glass.xml delete mode 100644 app/src/main/res/drawable/manage_profile.xml delete mode 100644 app/src/main/res/drawable/meetings.xml delete mode 100644 app/src/main/res/drawable/menu.xml delete mode 100644 app/src/main/res/drawable/microphone_muted.xml create mode 100644 app/src/main/res/drawable/microphone_slash.xml delete mode 100644 app/src/main/res/drawable/new_call.xml delete mode 100644 app/src/main/res/drawable/new_contact.xml delete mode 100644 app/src/main/res/drawable/next.xml delete mode 100644 app/src/main/res/drawable/not_favourite.xml create mode 100644 app/src/main/res/drawable/pencil_simple.xml create mode 100644 app/src/main/res/drawable/phone.xml delete mode 100644 app/src/main/res/drawable/phone_call.xml create mode 100644 app/src/main/res/drawable/phone_disconnect.xml create mode 100644 app/src/main/res/drawable/phone_plus.xml delete mode 100644 app/src/main/res/drawable/pick_picture.xml create mode 100644 app/src/main/res/drawable/plus_circle.xml create mode 100644 app/src/main/res/drawable/qr_code.xml create mode 100644 app/src/main/res/drawable/question.xml create mode 100644 app/src/main/res/drawable/record.xml delete mode 100644 app/src/main/res/drawable/record_call.xml delete mode 100644 app/src/main/res/drawable/search.xml delete mode 100644 app/src/main/res/drawable/settings.xml delete mode 100644 app/src/main/res/drawable/share.xml create mode 100644 app/src/main/res/drawable/share_network.xml delete mode 100644 app/src/main/res/drawable/show_password.xml create mode 100644 app/src/main/res/drawable/speaker_high.xml delete mode 100644 app/src/main/res/drawable/speaker_off.xml delete mode 100644 app/src/main/res/drawable/speaker_on.xml create mode 100644 app/src/main/res/drawable/speaker_slash.xml delete mode 100644 app/src/main/res/drawable/spinner.xml delete mode 100644 app/src/main/res/drawable/switch_camera.xml create mode 100644 app/src/main/res/drawable/trash_simple.xml create mode 100644 app/src/main/res/drawable/user_circle.xml create mode 100644 app/src/main/res/drawable/user_gear.xml create mode 100644 app/src/main/res/drawable/user_plus.xml create mode 100644 app/src/main/res/drawable/users_three.xml delete mode 100644 app/src/main/res/drawable/video_call.xml create mode 100644 app/src/main/res/drawable/video_camera.xml create mode 100644 app/src/main/res/drawable/video_camera_slash.xml delete mode 100644 app/src/main/res/drawable/warning.xml create mode 100644 app/src/main/res/drawable/warning_circle.xml create mode 100644 app/src/main/res/drawable/x.xml diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt index 3c1664afa..213ce1334 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt +++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt @@ -73,7 +73,7 @@ class ContactsManager @UiThread constructor(context: Context) { init { contactAvatar = IconCompat.createWithResource( context, - R.drawable.contact + R.drawable.user_circle ) } diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 4d6a0af16..338a15eb4 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -70,11 +70,6 @@ class NotificationsManager @MainThread constructor(private val context: Context) } private val coreListener = object : CoreListenerStub() { - @WorkerThread - override fun onFirstCallStarted(core: Core) { - startCoreForegroundService() - } - @WorkerThread override fun onCallStateChanged( core: Core, @@ -223,22 +218,6 @@ class NotificationsManager @MainThread constructor(private val context: Context) } } - @WorkerThread - private fun startCoreForegroundService() { - val service = coreService - if (service == null) { - Log.i("$TAG Starting Core Foreground Service") - val intent = Intent() - intent.setClass(coreContext.context, CoreForegroundService::class.java) - - try { - context.startForegroundService(intent) - } catch (e: Exception) { - Log.e("$TAG Failed to start Service: $e") - } - } - } - @RequiresPermission(Manifest.permission.POST_NOTIFICATIONS) @WorkerThread private fun notify(id: Int, notification: Notification, tag: String? = null) { @@ -320,9 +299,9 @@ class NotificationsManager @MainThread constructor(private val context: Context) } val smallIcon = if (isVideo) { - R.drawable.camera_enabled + R.drawable.video_camera } else { - R.drawable.calls + R.drawable.phone } val style = if (isIncoming) { diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt index 854ecb03f..bc120926f 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallFragment.kt @@ -102,7 +102,7 @@ class CallFragment : GenericFragment() { (requireActivity() as MainActivity).showGreenToast( "Historique supprimé", - R.drawable.check + R.drawable.check_fat_fill ) goBack() // TODO FIXME : issue with tablet when pane can't be closed } @@ -116,7 +116,7 @@ class CallFragment : GenericFragment() { (requireActivity() as MainActivity).showGreenToast( "Numéro copié dans le presse-papier", - R.drawable.check + R.drawable.check_fat_fill ) } diff --git a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt index 939e16bef..c910f31ec 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/fragment/CallsListFragment.kt @@ -168,7 +168,7 @@ class CallsListFragment : GenericFragment() { it.consume { (requireActivity() as MainActivity).showGreenToast( "Historique supprimé", - R.drawable.check + R.drawable.check_fat_fill ) } } @@ -208,7 +208,7 @@ class CallsListFragment : GenericFragment() { (requireActivity() as MainActivity).showGreenToast( "Numéro copié dans le presse-papier", - R.drawable.check + R.drawable.check_fat_fill ) } diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt index 1919aba5f..9a0e982ab 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt @@ -33,7 +33,6 @@ import androidx.annotation.UiThread import androidx.core.content.FileProvider import androidx.core.view.doOnPreDraw import androidx.lifecycle.ViewModelProvider -import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import java.io.File @@ -182,7 +181,7 @@ class ContactFragment : GenericFragment() { (requireActivity() as MainActivity).showGreenToast( "Numéro copié dans le presse-papier", - R.drawable.check + R.drawable.check_fat_fill ) } diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt index 323cb546a..b4c867465 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt @@ -51,6 +51,8 @@ class ContactAvatarModel @WorkerThread constructor(val friend: Friend) { val noAlphabet = MutableLiveData() + val showTrust = MutableLiveData() + private val friendListener = object : FriendListenerStub() { @WorkerThread override fun onPresenceReceived(fr: Friend) { diff --git a/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt b/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt index 3d1fd9661..73d0ce006 100644 --- a/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt +++ b/app/src/main/java/org/linphone/ui/voip/VoipActivity.kt @@ -20,12 +20,15 @@ package org.linphone.ui.voip import android.os.Bundle +import android.view.ViewGroup +import androidx.annotation.DrawableRes import androidx.annotation.UiThread import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.view.WindowCompat import androidx.databinding.DataBindingUtil import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController import org.linphone.LinphoneApplication @@ -35,6 +38,7 @@ import org.linphone.ui.voip.fragment.ActiveCallFragmentDirections import org.linphone.ui.voip.fragment.IncomingCallFragmentDirections import org.linphone.ui.voip.fragment.OutgoingCallFragmentDirections import org.linphone.ui.voip.viewmodel.CallsViewModel +import org.linphone.utils.slideInToastFromTopForDuration @UiThread class VoipActivity : AppCompatActivity() { @@ -97,4 +101,12 @@ class VoipActivity : AppCompatActivity() { } } } + + fun showBlueToast(message: String, @DrawableRes icon: Int) { + binding.blueToast.message = message + binding.blueToast.icon = icon + + val target = binding.blueToast.root + target.slideInToastFromTopForDuration(binding.root as ViewGroup, lifecycleScope) + } } diff --git a/app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt index 5fb583ca5..e72e5b64a 100644 --- a/app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/voip/fragment/ActiveCallFragment.kt @@ -31,10 +31,11 @@ import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.databinding.VoipActiveCallFragmentBinding import org.linphone.ui.main.fragment.GenericFragment +import org.linphone.ui.voip.VoipActivity import org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel import org.linphone.ui.voip.viewmodel.CurrentCallViewModel +import org.linphone.utils.AppUtils import org.linphone.utils.DialogUtils -import org.linphone.utils.slideInToastFromTop @UiThread class ActiveCallFragment : GenericFragment() { @@ -97,12 +98,18 @@ class ActiveCallFragment : GenericFragment() { callViewModel.isRemoteDeviceTrusted.observe(viewLifecycleOwner) { trusted -> if (trusted) { - binding.blueToast.message = "This call can be trusted" - binding.blueToast.icon = R.drawable.trusted - - binding.blueToast.root.slideInToastFromTop(binding.root as ViewGroup, true) - } else if (binding.blueToast.root.visibility == View.VISIBLE) { - binding.blueToast.root.slideInToastFromTop(binding.root as ViewGroup, false) + (requireActivity() as VoipActivity).showBlueToast( + "This call can be trusted", + R.drawable.trusted + ) + // TODO: improve + binding.avatar.avatarBorderColor = resources.getColor( + R.color.trusted_blue, + requireContext().theme + ) + binding.avatar.avatarBorderWidth = AppUtils.getDimension( + R.dimen.avatar_trust_border_width + ).toInt() } } diff --git a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt index b8d6e63a5..8cb6611d0 100644 --- a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt @@ -268,6 +268,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() { "$TAG Current call media encryption is ZRTP, auth token is ${if (deviceIsTrusted) "trusted" else "not trusted yet"}" ) isRemoteDeviceTrusted.postValue(deviceIsTrusted) + contact.value?.showTrust?.postValue(deviceIsTrusted) if (!deviceIsTrusted && authToken.orEmpty().isNotEmpty()) { Log.i("$TAG Showing ZRTP SAS confirmation dialog") diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 9b988a1fc..ae1a459c9 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -231,6 +231,13 @@ fun AvatarView.loadContactAvatar(contact: ContactAvatarModel?) { onStart = { // Use initials as placeholder avatarInitials = contact.initials + + if (contact.showTrust.value == true) { + avatarBorderColor = resources.getColor(R.color.trusted_blue, context.theme) + avatarBorderWidth = AppUtils.getDimension(R.dimen.avatar_trust_border_width).toInt() + } else { + avatarBorderWidth = AppUtils.getDimension(R.dimen.zero).toInt() + } }, onSuccess = { _, _ -> // If loading is successful, remove initials otherwise image won't be visible diff --git a/app/src/main/res/drawable-up/caret.xml b/app/src/main/res/drawable-up/caret.xml new file mode 100644 index 000000000..a8354428f --- /dev/null +++ b/app/src/main/res/drawable-up/caret.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml deleted file mode 100644 index bbd59113e..000000000 --- a/app/src/main/res/drawable/add.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/add_file.xml b/app/src/main/res/drawable/add_file.xml deleted file mode 100644 index 81697472b..000000000 --- a/app/src/main/res/drawable/add_file.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/address_book.xml b/app/src/main/res/drawable/address_book.xml new file mode 100644 index 000000000..28b80a4a4 --- /dev/null +++ b/app/src/main/res/drawable/address_book.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/arrow.xml b/app/src/main/res/drawable/arrow.xml deleted file mode 100644 index 4d326b34f..000000000 --- a/app/src/main/res/drawable/arrow.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml deleted file mode 100644 index f50faa58b..000000000 --- a/app/src/main/res/drawable/back.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/calls.xml b/app/src/main/res/drawable/calls.xml deleted file mode 100644 index b41091e2a..000000000 --- a/app/src/main/res/drawable/calls.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/camera.xml b/app/src/main/res/drawable/camera.xml new file mode 100644 index 000000000..ae633700a --- /dev/null +++ b/app/src/main/res/drawable/camera.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/camera_disabled.xml b/app/src/main/res/drawable/camera_disabled.xml deleted file mode 100644 index 103ae4fac..000000000 --- a/app/src/main/res/drawable/camera_disabled.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/camera_enabled.xml b/app/src/main/res/drawable/camera_enabled.xml deleted file mode 100644 index d88e947d4..000000000 --- a/app/src/main/res/drawable/camera_enabled.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/camera_rotate.xml b/app/src/main/res/drawable/camera_rotate.xml new file mode 100644 index 000000000..474db764a --- /dev/null +++ b/app/src/main/res/drawable/camera_rotate.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/caret_down.xml b/app/src/main/res/drawable/caret_down.xml new file mode 100644 index 000000000..3c352a3e4 --- /dev/null +++ b/app/src/main/res/drawable/caret_down.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/caret_left.xml b/app/src/main/res/drawable/caret_left.xml new file mode 100644 index 000000000..206ab9279 --- /dev/null +++ b/app/src/main/res/drawable/caret_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/caret_right.xml b/app/src/main/res/drawable/caret_right.xml new file mode 100644 index 000000000..2c29b47f5 --- /dev/null +++ b/app/src/main/res/drawable/caret_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/collapse.xml b/app/src/main/res/drawable/caret_up.xml similarity index 100% rename from app/src/main/res/drawable/collapse.xml rename to app/src/main/res/drawable/caret_up.xml diff --git a/app/src/main/res/drawable/chat.xml b/app/src/main/res/drawable/chat.xml deleted file mode 100644 index 5b7a4a997..000000000 --- a/app/src/main/res/drawable/chat.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/chat_dots.xml b/app/src/main/res/drawable/chat_dots.xml new file mode 100644 index 000000000..ce65ab792 --- /dev/null +++ b/app/src/main/res/drawable/chat_dots.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/chat_text.xml b/app/src/main/res/drawable/chat_text.xml new file mode 100644 index 000000000..a2adf78df --- /dev/null +++ b/app/src/main/res/drawable/chat_text.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/check.xml b/app/src/main/res/drawable/check.xml deleted file mode 100644 index fcf6bcba5..000000000 --- a/app/src/main/res/drawable/check.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/check_fat_fill.xml b/app/src/main/res/drawable/check_fat_fill.xml new file mode 100644 index 000000000..5b94174b9 --- /dev/null +++ b/app/src/main/res/drawable/check_fat_fill.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml deleted file mode 100644 index 485cf87c7..000000000 --- a/app/src/main/res/drawable/close.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/contact.xml b/app/src/main/res/drawable/contact.xml deleted file mode 100644 index 12982c3a3..000000000 --- a/app/src/main/res/drawable/contact.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/contacts.xml b/app/src/main/res/drawable/contacts.xml deleted file mode 100644 index 01783a668..000000000 --- a/app/src/main/res/drawable/contacts.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/conversations.xml b/app/src/main/res/drawable/conversations.xml deleted file mode 100644 index fe1c58548..000000000 --- a/app/src/main/res/drawable/conversations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/copy.xml b/app/src/main/res/drawable/copy.xml index 4ca7f95fa..026bf504a 100644 --- a/app/src/main/res/drawable/copy.xml +++ b/app/src/main/res/drawable/copy.xml @@ -1,21 +1,9 @@ - - - - - + android:viewportWidth="256" + android:viewportHeight="256"> + diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml deleted file mode 100644 index 31421c8f7..000000000 --- a/app/src/main/res/drawable/delete.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/dot_menu.xml b/app/src/main/res/drawable/dot_menu.xml deleted file mode 100644 index 25bb25e6c..000000000 --- a/app/src/main/res/drawable/dot_menu.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/dots_three_vertical.xml b/app/src/main/res/drawable/dots_three_vertical.xml new file mode 100644 index 000000000..6739413ab --- /dev/null +++ b/app/src/main/res/drawable/dots_three_vertical.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml deleted file mode 100644 index 7b739d9a5..000000000 --- a/app/src/main/res/drawable/edit.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/expand.xml b/app/src/main/res/drawable/expand.xml deleted file mode 100644 index b4ff0f75c..000000000 --- a/app/src/main/res/drawable/expand.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/eye.xml b/app/src/main/res/drawable/eye.xml new file mode 100644 index 000000000..a6250c4e8 --- /dev/null +++ b/app/src/main/res/drawable/eye.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/eye_slash.xml b/app/src/main/res/drawable/eye_slash.xml new file mode 100644 index 000000000..30387053d --- /dev/null +++ b/app/src/main/res/drawable/eye_slash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/favourite.xml b/app/src/main/res/drawable/favourite.xml deleted file mode 100644 index 0f2c1c2a6..000000000 --- a/app/src/main/res/drawable/favourite.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/gear.xml b/app/src/main/res/drawable/gear.xml new file mode 100644 index 000000000..04bcae99d --- /dev/null +++ b/app/src/main/res/drawable/gear.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/group_chat.xml b/app/src/main/res/drawable/group_chat.xml deleted file mode 100644 index fbfe18ea9..000000000 --- a/app/src/main/res/drawable/group_chat.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/hang_up.xml b/app/src/main/res/drawable/hang_up.xml deleted file mode 100644 index d3843b2c2..000000000 --- a/app/src/main/res/drawable/hang_up.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/heart.xml b/app/src/main/res/drawable/heart.xml new file mode 100644 index 000000000..78e6ee641 --- /dev/null +++ b/app/src/main/res/drawable/heart.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/heart_fill.xml b/app/src/main/res/drawable/heart_fill.xml new file mode 100644 index 000000000..5ac1ca395 --- /dev/null +++ b/app/src/main/res/drawable/heart_fill.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/help.xml b/app/src/main/res/drawable/help.xml deleted file mode 100644 index 0905b2eb0..000000000 --- a/app/src/main/res/drawable/help.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/hide_password.xml b/app/src/main/res/drawable/hide_password.xml deleted file mode 100644 index 1c86284e6..000000000 --- a/app/src/main/res/drawable/hide_password.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/in_call_camera_button.xml b/app/src/main/res/drawable/in_call_camera_button.xml deleted file mode 100644 index 664b13771..000000000 --- a/app/src/main/res/drawable/in_call_camera_button.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/info.xml b/app/src/main/res/drawable/info.xml index 4880f8a5a..779c5996c 100644 --- a/app/src/main/res/drawable/info.xml +++ b/app/src/main/res/drawable/info.xml @@ -1,13 +1,9 @@ - - + + diff --git a/app/src/main/res/drawable/invite.xml b/app/src/main/res/drawable/invite.xml deleted file mode 100644 index 41ae581d3..000000000 --- a/app/src/main/res/drawable/invite.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/list.xml b/app/src/main/res/drawable/list.xml new file mode 100644 index 000000000..4a35bedf5 --- /dev/null +++ b/app/src/main/res/drawable/list.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/magnifying_glass.xml b/app/src/main/res/drawable/magnifying_glass.xml new file mode 100644 index 000000000..f5e41b461 --- /dev/null +++ b/app/src/main/res/drawable/magnifying_glass.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/manage_profile.xml b/app/src/main/res/drawable/manage_profile.xml deleted file mode 100644 index 6697a6859..000000000 --- a/app/src/main/res/drawable/manage_profile.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/meetings.xml b/app/src/main/res/drawable/meetings.xml deleted file mode 100644 index fbfe18ea9..000000000 --- a/app/src/main/res/drawable/meetings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/menu.xml b/app/src/main/res/drawable/menu.xml deleted file mode 100644 index 11dd472dd..000000000 --- a/app/src/main/res/drawable/menu.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/microphone.xml b/app/src/main/res/drawable/microphone.xml index b7f6a5398..f14ea06dc 100644 --- a/app/src/main/res/drawable/microphone.xml +++ b/app/src/main/res/drawable/microphone.xml @@ -1,13 +1,9 @@ - - + + diff --git a/app/src/main/res/drawable/microphone_muted.xml b/app/src/main/res/drawable/microphone_muted.xml deleted file mode 100644 index 3327915a6..000000000 --- a/app/src/main/res/drawable/microphone_muted.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/microphone_slash.xml b/app/src/main/res/drawable/microphone_slash.xml new file mode 100644 index 000000000..a61e48ae3 --- /dev/null +++ b/app/src/main/res/drawable/microphone_slash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/new_call.xml b/app/src/main/res/drawable/new_call.xml deleted file mode 100644 index 531d2546c..000000000 --- a/app/src/main/res/drawable/new_call.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/new_contact.xml b/app/src/main/res/drawable/new_contact.xml deleted file mode 100644 index b35fbfda1..000000000 --- a/app/src/main/res/drawable/new_contact.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml deleted file mode 100644 index 6393d14b8..000000000 --- a/app/src/main/res/drawable/next.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/not_favourite.xml b/app/src/main/res/drawable/not_favourite.xml deleted file mode 100644 index 3094b68a6..000000000 --- a/app/src/main/res/drawable/not_favourite.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/pencil_simple.xml b/app/src/main/res/drawable/pencil_simple.xml new file mode 100644 index 000000000..0698f7491 --- /dev/null +++ b/app/src/main/res/drawable/pencil_simple.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/phone.xml b/app/src/main/res/drawable/phone.xml new file mode 100644 index 000000000..559c1fec7 --- /dev/null +++ b/app/src/main/res/drawable/phone.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/phone_call.xml b/app/src/main/res/drawable/phone_call.xml deleted file mode 100644 index efc96e7a5..000000000 --- a/app/src/main/res/drawable/phone_call.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/phone_disconnect.xml b/app/src/main/res/drawable/phone_disconnect.xml new file mode 100644 index 000000000..65e0715bc --- /dev/null +++ b/app/src/main/res/drawable/phone_disconnect.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/phone_plus.xml b/app/src/main/res/drawable/phone_plus.xml new file mode 100644 index 000000000..1eff27b50 --- /dev/null +++ b/app/src/main/res/drawable/phone_plus.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/pick_picture.xml b/app/src/main/res/drawable/pick_picture.xml deleted file mode 100644 index e4baca765..000000000 --- a/app/src/main/res/drawable/pick_picture.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/plus_circle.xml b/app/src/main/res/drawable/plus_circle.xml new file mode 100644 index 000000000..d5ec90b60 --- /dev/null +++ b/app/src/main/res/drawable/plus_circle.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/qr_code.xml b/app/src/main/res/drawable/qr_code.xml new file mode 100644 index 000000000..c5a7ba3b4 --- /dev/null +++ b/app/src/main/res/drawable/qr_code.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/question.xml b/app/src/main/res/drawable/question.xml new file mode 100644 index 000000000..7a85a0a10 --- /dev/null +++ b/app/src/main/res/drawable/question.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/record.xml b/app/src/main/res/drawable/record.xml new file mode 100644 index 000000000..a7912ae10 --- /dev/null +++ b/app/src/main/res/drawable/record.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/record_call.xml b/app/src/main/res/drawable/record_call.xml deleted file mode 100644 index dc79c1cc1..000000000 --- a/app/src/main/res/drawable/record_call.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml deleted file mode 100644 index ad6ae3ab6..000000000 --- a/app/src/main/res/drawable/search.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml deleted file mode 100644 index f3e68abf1..000000000 --- a/app/src/main/res/drawable/settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/share.xml b/app/src/main/res/drawable/share.xml deleted file mode 100644 index 06fb2604d..000000000 --- a/app/src/main/res/drawable/share.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/share_network.xml b/app/src/main/res/drawable/share_network.xml new file mode 100644 index 000000000..097718326 --- /dev/null +++ b/app/src/main/res/drawable/share_network.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/show_password.xml b/app/src/main/res/drawable/show_password.xml deleted file mode 100644 index 612f28667..000000000 --- a/app/src/main/res/drawable/show_password.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/speaker_high.xml b/app/src/main/res/drawable/speaker_high.xml new file mode 100644 index 000000000..70001ffd0 --- /dev/null +++ b/app/src/main/res/drawable/speaker_high.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/speaker_off.xml b/app/src/main/res/drawable/speaker_off.xml deleted file mode 100644 index a38f6a2c5..000000000 --- a/app/src/main/res/drawable/speaker_off.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/speaker_on.xml b/app/src/main/res/drawable/speaker_on.xml deleted file mode 100644 index 87ff088d3..000000000 --- a/app/src/main/res/drawable/speaker_on.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/speaker_slash.xml b/app/src/main/res/drawable/speaker_slash.xml new file mode 100644 index 000000000..093f566c7 --- /dev/null +++ b/app/src/main/res/drawable/speaker_slash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/spinner.xml b/app/src/main/res/drawable/spinner.xml deleted file mode 100644 index 567562a7b..000000000 --- a/app/src/main/res/drawable/spinner.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/switch_camera.xml b/app/src/main/res/drawable/switch_camera.xml deleted file mode 100644 index b58ba194f..000000000 --- a/app/src/main/res/drawable/switch_camera.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/trash_simple.xml b/app/src/main/res/drawable/trash_simple.xml new file mode 100644 index 000000000..06419622b --- /dev/null +++ b/app/src/main/res/drawable/trash_simple.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_circle.xml b/app/src/main/res/drawable/user_circle.xml new file mode 100644 index 000000000..1fe63783f --- /dev/null +++ b/app/src/main/res/drawable/user_circle.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_gear.xml b/app/src/main/res/drawable/user_gear.xml new file mode 100644 index 000000000..b9a2cf204 --- /dev/null +++ b/app/src/main/res/drawable/user_gear.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/user_plus.xml b/app/src/main/res/drawable/user_plus.xml new file mode 100644 index 000000000..1dd764b6e --- /dev/null +++ b/app/src/main/res/drawable/user_plus.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/users_three.xml b/app/src/main/res/drawable/users_three.xml new file mode 100644 index 000000000..d3b0f5d96 --- /dev/null +++ b/app/src/main/res/drawable/users_three.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/video_call.xml b/app/src/main/res/drawable/video_call.xml deleted file mode 100644 index 58ab45aec..000000000 --- a/app/src/main/res/drawable/video_call.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/video_camera.xml b/app/src/main/res/drawable/video_camera.xml new file mode 100644 index 000000000..49860de4a --- /dev/null +++ b/app/src/main/res/drawable/video_camera.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/video_camera_slash.xml b/app/src/main/res/drawable/video_camera_slash.xml new file mode 100644 index 000000000..1fa017649 --- /dev/null +++ b/app/src/main/res/drawable/video_camera_slash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml deleted file mode 100644 index 49302ddf2..000000000 --- a/app/src/main/res/drawable/warning.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/warning_circle.xml b/app/src/main/res/drawable/warning_circle.xml new file mode 100644 index 000000000..2c3806e34 --- /dev/null +++ b/app/src/main/res/drawable/warning_circle.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/x.xml b/app/src/main/res/drawable/x.xml new file mode 100644 index 000000000..29291cec4 --- /dev/null +++ b/app/src/main/res/drawable/x.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml index 4ce3d4989..6f674583a 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -34,7 +34,7 @@ android:id="@+id/contacts" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/contacts" + android:drawableTop="@drawable/address_book" android:drawablePadding="10dp" android:drawableTint="@{viewModel.contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:onClick="@{onContactsClicked}" @@ -51,7 +51,7 @@ android:id="@+id/calls" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/calls" + android:drawableTop="@drawable/phone" android:drawableTint="@{viewModel.callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:drawablePadding="10dp" android:text="Calls" @@ -82,7 +82,7 @@ android:enabled="false" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/conversations" + android:drawableTop="@drawable/chat_text" android:drawablePadding="10dp" android:drawableTint="@{viewModel.conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:onClick="@{onConversationsClicked}" @@ -100,7 +100,7 @@ android:visibility="@{viewModel.hideMeetings ? View.GONE : View.VISIBLE, default=gone}" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/meetings" + android:drawableTop="@drawable/users_three" android:drawablePadding="10dp" android:drawableTint="@{viewModel.meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:text="Meetings" 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 e2e78ee32..f531e64f7 100644 --- a/app/src/main/res/layout-land/calls_list_fragment.xml +++ b/app/src/main/res/layout-land/calls_list_fragment.xml @@ -50,11 +50,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="9dp" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingStart="10dp" - android:paddingEnd="10dp" - android:src="@drawable/dot_menu" + android:src="@drawable/dots_three_vertical" app:tint="@color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/top_bar" @@ -123,7 +119,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="16dp" - android:src="@drawable/add" + android:src="@drawable/plus_circle" app:tint="@color/gray_8" app:backgroundTint="@color/white" app:layout_constraintEnd_toEndOf="parent" 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 ea9bb4ed7..f5dc9341a 100644 --- a/app/src/main/res/layout-land/contacts_list_fragment.xml +++ b/app/src/main/res/layout-land/contacts_list_fragment.xml @@ -96,7 +96,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="20dp" android:text="Favourites" - android:drawableEnd="@drawable/collapse" + android:drawableEnd="@drawable/caret_up" android:drawableTint="@color/gray_9" android:textSize="16sp" app:layout_constraintStart_toEndOf="@id/bottom_nav_bar" @@ -147,7 +147,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="16dp" - android:src="@drawable/new_contact" + android:src="@drawable/user_plus" app:tint="@color/gray_8" app:backgroundTint="@color/white" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index 64c430295..c36455e9d 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -97,7 +97,7 @@ android:text="Default" android:textSize="12sp" android:gravity="center" - android:drawableStart="@drawable/check" + android:drawableStart="@drawable/check_fat_fill" android:drawablePadding="3dp" app:drawableTint="@color/primary_color" app:layout_constraintStart_toEndOf="@id/left_barrier" @@ -111,12 +111,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="16dp" - android:src="@drawable/dot_menu" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingStart="10dp" - android:paddingEnd="10dp" - app:tint="@color/gray_1" + android:src="@drawable/dots_three_vertical" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name" app:layout_constraintBottom_toBottomOf="@id/register_status" /> diff --git a/app/src/main/res/layout/account_popup_menu.xml b/app/src/main/res/layout/account_popup_menu.xml index 21fd84a95..478e7686d 100644 --- a/app/src/main/res/layout/account_popup_menu.xml +++ b/app/src/main/res/layout/account_popup_menu.xml @@ -25,7 +25,7 @@ android:text="Manage the profile" android:textSize="14sp" android:textColor="@color/gray_1" - android:drawableStart="@drawable/manage_profile" + android:drawableStart="@drawable/user_gear" android:drawablePadding="5dp" app:drawableTint="@color/gray_8" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index c4864c5a0..08c4c77ed 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -29,7 +29,7 @@ android:layout_marginStart="10dp" android:adjustViewBounds="true" android:padding="5dp" - android:src="@drawable/back" + android:src="@drawable/caret_left" android:drawableTint="@color/primary_color" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" @@ -67,7 +67,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:padding="20dp" - android:src="@drawable/pick_picture" + android:src="@drawable/camera" app:layout_constraintEnd_toEndOf="@id/avatar" app:layout_constraintStart_toStartOf="@id/avatar" app:layout_constraintTop_toTopOf="@id/avatar" diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml index 1d4adc1ac..10de92365 100644 --- a/app/src/main/res/layout/assistant_login_fragment.xml +++ b/app/src/main/res/layout/assistant_login_fragment.xml @@ -33,7 +33,7 @@ android:layout_height="24dp" android:layout_marginTop="7dp" android:layout_marginStart="15dp" - android:src="@drawable/back" + android:src="@drawable/caret_left" app:tint="@color/gray_1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -116,12 +116,12 @@ @@ -137,7 +137,7 @@ android:textColor="@color/gray_9" android:background="@drawable/shape_edit_text_background" android:inputType="textPassword" - android:drawableEnd="@drawable/show_password" + android:drawableEnd="@drawable/eye" android:drawableTint="@color/gray_1" app:layout_constraintTop_toBottomOf="@id/password_label" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index 53dc245b7..c0b4fcbb7 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:paddingTop="16dp" android:paddingBottom="16dp" - android:drawableTop="@drawable/contacts" + android:drawableTop="@drawable/address_book" android:drawablePadding="10dp" android:drawableTint="@{viewModel.contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:text="Contacts" @@ -56,7 +56,7 @@ android:layout_marginStart="18dp" android:paddingTop="16dp" android:paddingBottom="16dp" - android:drawableTop="@drawable/calls" + android:drawableTop="@drawable/phone" android:drawablePadding="10dp" android:drawableTint="@{viewModel.callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:text="Calls" @@ -94,7 +94,7 @@ android:layout_marginStart="18dp" android:paddingTop="16dp" android:paddingBottom="16dp" - android:drawableTop="@drawable/conversations" + android:drawableTop="@drawable/chat_text" android:drawablePadding="10dp" android:drawableTint="@{viewModel.conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:text="Conversations" @@ -114,7 +114,7 @@ android:layout_marginStart="18dp" android:paddingTop="16dp" android:paddingBottom="16dp" - android:drawableTop="@drawable/meetings" + android:drawableTop="@drawable/users_three" android:drawablePadding="10dp" android:drawableTint="@{viewModel.meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}" android:text="Meetings" diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml index dcfd43a36..6d78f7faf 100644 --- a/app/src/main/res/layout/call_fragment.xml +++ b/app/src/main/res/layout/call_fragment.xml @@ -32,7 +32,7 @@ android:padding="5dp" android:onClick="@{backClickListener}" android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}" - android:src="@drawable/back" + android:src="@drawable/caret_left" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title"/> @@ -63,7 +63,7 @@ android:paddingBottom="4dp" android:paddingStart="10dp" android:paddingEnd="10dp" - android:src="@drawable/dot_menu" + android:src="@drawable/dots_three_vertical" app:tint="@color/primary_color" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintEnd_toEndOf="parent" @@ -160,7 +160,7 @@ android:layout_marginTop="20dp" android:background="@drawable/shape_button_round" android:padding="16dp" - android:src="@drawable/calls" + android:src="@drawable/phone" app:tint="@color/gray_1" app:layout_constraintEnd_toStartOf="@id/chat" app:layout_constraintStart_toStartOf="parent" @@ -187,7 +187,7 @@ android:layout_marginTop="20dp" android:background="@drawable/shape_button_round" android:padding="16dp" - android:src="@drawable/chat" + android:src="@drawable/chat_dots" app:tint="@color/gray_1" app:layout_constraintEnd_toStartOf="@id/video_call" app:layout_constraintStart_toEndOf="@id/call" @@ -214,7 +214,7 @@ android:layout_marginTop="20dp" android:background="@drawable/shape_button_round" android:padding="16dp" - android:src="@drawable/video_call" + android:src="@drawable/video_camera" app:tint="@color/gray_1" app:layout_constraintStart_toEndOf="@id/chat" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml index 4a9812ad1..7812b5614 100644 --- a/app/src/main/res/layout/call_list_cell.xml +++ b/app/src/main/res/layout/call_list_cell.xml @@ -105,7 +105,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="6dp" - android:src="@drawable/calls" + android:src="@drawable/phone" app:tint="@color/gray_1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name" diff --git a/app/src/main/res/layout/call_popup_menu.xml b/app/src/main/res/layout/call_popup_menu.xml index 19e40480d..e65b4dcda 100644 --- a/app/src/main/res/layout/call_popup_menu.xml +++ b/app/src/main/res/layout/call_popup_menu.xml @@ -42,7 +42,7 @@ android:text="Ajouter aux contacts" android:textSize="14sp" android:textColor="@color/gray_1" - android:drawableStart="@drawable/add" + android:drawableStart="@drawable/plus_circle" android:drawablePadding="5dp" app:drawableTint="@color/gray_8" app:layout_constraintVertical_chainStyle="packed" @@ -65,7 +65,7 @@ android:text="Voir le contact" android:textSize="14sp" android:textColor="@color/gray_1" - android:drawableStart="@drawable/contact" + android:drawableStart="@drawable/user_circle" android:drawablePadding="5dp" app:drawableTint="@color/gray_8" app:layout_constraintStart_toStartOf="parent" @@ -108,7 +108,7 @@ android:text="Delete all history" android:textSize="14sp" android:textColor="@color/red_danger" - android:drawableStart="@drawable/delete" + android:drawableStart="@drawable/trash_simple" android:drawablePadding="5dp" app:drawableTint="@color/red_danger" app:layout_constraintWidth_min="170dp" diff --git a/app/src/main/res/layout/call_start_fragment.xml b/app/src/main/res/layout/call_start_fragment.xml index 2b30f3bbc..627ccb117 100644 --- a/app/src/main/res/layout/call_start_fragment.xml +++ b/app/src/main/res/layout/call_start_fragment.xml @@ -26,7 +26,7 @@ android:layout_marginStart="10dp" android:adjustViewBounds="true" android:padding="5dp" - android:src="@drawable/back" + android:src="@drawable/caret_left" android:drawableTint="@color/primary_color" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" @@ -59,7 +59,7 @@ android:paddingBottom="10dp" android:paddingStart="15dp" android:paddingEnd="15dp" - android:drawableStart="@drawable/search" + android:drawableStart="@drawable/magnifying_glass" android:drawableEnd="@drawable/dialer" android:drawablePadding="10dp" android:drawableTint="@color/gray_9" @@ -80,7 +80,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="40dp" android:padding="10dp" - android:src="@drawable/meetings" + android:src="@drawable/users_three" android:background="@drawable/shape_orange_round" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/search_bar" /> @@ -97,7 +97,7 @@ android:text="Create a group call" android:textSize="16sp" android:textColor="@color/black" - android:drawableEnd="@drawable/arrow" + android:drawableEnd="@drawable/caret_right" app:layout_constraintStart_toEndOf="@id/group_call_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/group_call_icon" @@ -183,7 +183,7 @@ @@ -51,7 +51,7 @@ style="@style/context_menu_action_label_style" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@drawable/contact" + android:drawableStart="@drawable/user_circle" app:layout_constraintBottom_toTopOf="@id/share" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -79,7 +79,7 @@ style="@style/context_menu_danger_action_label_style" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@drawable/delete" + android:drawableStart="@drawable/trash_simple" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/calls_list_popup_menu.xml b/app/src/main/res/layout/calls_list_popup_menu.xml index 2652fed4a..dd7b4fdc4 100644 --- a/app/src/main/res/layout/calls_list_popup_menu.xml +++ b/app/src/main/res/layout/calls_list_popup_menu.xml @@ -25,7 +25,7 @@ android:text="Delete all history" android:textSize="14sp" android:textColor="@color/red_danger" - android:drawableStart="@drawable/delete" + android:drawableStart="@drawable/trash_simple" android:drawablePadding="5dp" app:drawableTint="@color/red_danger" app:layout_constraintStart_toStartOf="parent" 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 cb0911ca2..7e778f93e 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 @@ -66,7 +66,7 @@ android:paddingTop="6dp" android:paddingBottom="6dp" android:gravity="center" - android:drawableStart="@drawable/warning" + android:drawableStart="@drawable/warning_circle" android:drawablePadding="8dp" android:text="Vérifier l'appareil" android:textColor="@color/tertiary_button_label_color" diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 3b4cffd1d..b84f997a5 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -35,7 +35,7 @@ android:padding="5dp" android:onClick="@{backClickListener}" android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}" - android:src="@drawable/back" + android:src="@drawable/caret_left" app:layout_constraintBottom_toBottomOf="@id/invisible_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/invisible_title"/> @@ -60,10 +60,9 @@ android:id="@+id/edit" android:layout_width="wrap_content" android:layout_height="35dp" - android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:padding="5dp" - android:src="@drawable/edit" + android:src="@drawable/pencil_simple" app:layout_constraintBottom_toBottomOf="@id/invisible_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/invisible_title" /> @@ -166,7 +165,7 @@ android:layout_marginTop="20dp" android:background="@drawable/shape_button_round" android:padding="16dp" - android:src="@drawable/calls" + android:src="@drawable/phone" app:tint="@color/gray_1" app:layout_constraintEnd_toStartOf="@id/chat" app:layout_constraintStart_toStartOf="parent" @@ -193,7 +192,7 @@ android:layout_marginTop="20dp" android:background="@drawable/shape_button_round" android:padding="16dp" - android:src="@drawable/chat" + android:src="@drawable/chat_dots" app:tint="@color/gray_1" app:layout_constraintEnd_toStartOf="@id/video_call" app:layout_constraintStart_toEndOf="@id/call" @@ -220,7 +219,7 @@ android:layout_marginTop="20dp" android:background="@drawable/shape_button_round" android:padding="16dp" - android:src="@drawable/video_call" + android:src="@drawable/video_camera" app:tint="@color/gray_1" app:layout_constraintStart_toEndOf="@id/chat" app:layout_constraintEnd_toEndOf="parent" @@ -250,7 +249,7 @@ android:layout_marginEnd="26dp" android:layout_marginTop="32dp" android:text="Numbers & addresses" - android:drawableEnd="@{viewModel.expandNumbersAndAddresses ? @drawable/collapse : @drawable/expand, default=@drawable/collapse}" + android:drawableEnd="@{viewModel.expandNumbersAndAddresses ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="@color/gray_9" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" @@ -357,7 +356,7 @@ android:layout_marginEnd="26dp" android:layout_marginTop="16dp" android:text="Trust" - android:drawableEnd="@{viewModel.expandDevicesTrust ? @drawable/collapse : @drawable/expand, default=@drawable/collapse}" + android:drawableEnd="@{viewModel.expandDevicesTrust ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="@color/gray_9" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" @@ -473,7 +472,7 @@ android:layout_marginStart="17dp" android:layout_marginEnd="17dp" android:text="Edit" - android:drawableStart="@drawable/edit" + android:drawableStart="@drawable/pencil_simple" android:background="@drawable/action_background" app:layout_constraintTop_toTopOf="@id/actions_background" app:layout_constraintStart_toStartOf="parent" @@ -499,7 +498,7 @@ android:layout_marginEnd="17dp" android:background="@drawable/action_background" android:text="@{viewModel.isFavourite ? `Remove from favourites` : `Add to favourites`, default=`Add to favourites`}" - android:drawableStart="@{viewModel.isFavourite ? @drawable/favourite : @drawable/not_favourite, default=@drawable/favourite}" + android:drawableStart="@{viewModel.isFavourite ? @drawable/heart_fill : @drawable/heart, default=@drawable/heart_fill}" android:drawableTint="@{viewModel.isFavourite ? @color/red_danger : @color/gray_1, default=@color/gray_1}" app:layout_constraintTop_toBottomOf="@id/action_edit" app:layout_constraintStart_toStartOf="parent" @@ -525,7 +524,7 @@ android:layout_marginEnd="17dp" android:background="@drawable/action_background" android:text="Share" - android:drawableStart="@drawable/share" + android:drawableStart="@drawable/share_network" app:layout_constraintTop_toBottomOf="@id/action_favorite" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -550,7 +549,7 @@ android:layout_marginEnd="17dp" android:background="@drawable/action_background" android:text="Delete" - android:drawableStart="@drawable/delete" + android:drawableStart="@drawable/trash_simple" app:layout_constraintTop_toBottomOf="@id/action_share" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/contact_new_or_edit_cell.xml b/app/src/main/res/layout/contact_new_or_edit_cell.xml index cb8650eb7..c59030747 100644 --- a/app/src/main/res/layout/contact_new_or_edit_cell.xml +++ b/app/src/main/res/layout/contact_new_or_edit_cell.xml @@ -58,7 +58,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="16dp" - android:src="@drawable/close" + android:src="@drawable/x" app:tint="@color/gray_8" app:layout_constraintStart_toEndOf="@id/field" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml index d419e4b62..6db3f5406 100644 --- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml @@ -29,7 +29,7 @@ android:layout_marginStart="10dp" android:adjustViewBounds="true" android:padding="5dp" - android:src="@drawable/back" + android:src="@drawable/caret_left" android:drawableTint="@color/primary_color" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" @@ -57,7 +57,7 @@ android:layout_height="35dp" android:layout_marginEnd="10dp" android:padding="5dp" - android:src="@drawable/check" + android:src="@drawable/check_fat_fill" android:enabled="@{viewModel.saveButtonEnabled}" app:tint="@color/primary_color_selector" app:layout_constraintEnd_toEndOf="parent" @@ -95,7 +95,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:padding="20dp" - android:src="@drawable/pick_picture" + android:src="@drawable/camera" app:layout_constraintEnd_toEndOf="@id/avatar" app:layout_constraintStart_toStartOf="@id/avatar" app:layout_constraintTop_toTopOf="@id/avatar" diff --git a/app/src/main/res/layout/contact_number_address_list_cell.xml b/app/src/main/res/layout/contact_number_address_list_cell.xml index 0485a018c..8725a9f5c 100644 --- a/app/src/main/res/layout/contact_number_address_list_cell.xml +++ b/app/src/main/res/layout/contact_number_address_list_cell.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" - android:src="@drawable/calls" + android:src="@drawable/phone" android:visibility="@{model.enabled ? View.VISIBLE : View.GONE}" app:tint="@color/gray_9" app:layout_constraintTop_toTopOf="@id/header" diff --git a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml index 25dfbc24e..fa6cd316f 100644 --- a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml +++ b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml @@ -44,7 +44,7 @@ android:text="Inviter" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@drawable/invite" + android:drawableStart="@drawable/qr_code" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml index ae9fcd23a..7ebcfa9c5 100644 --- a/app/src/main/res/layout/contacts_list_fragment.xml +++ b/app/src/main/res/layout/contacts_list_fragment.xml @@ -87,7 +87,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="15dp" android:text="Favourites" - android:drawableEnd="@{viewModel.showFavourites ? @drawable/collapse : @drawable/expand, default=@drawable/collapse}" + android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" android:drawableTint="@color/gray_9" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" @@ -149,7 +149,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="16dp" - android:src="@drawable/new_contact" + android:src="@drawable/user_plus" app:tint="@color/gray_8" app:backgroundTint="@color/white" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/contacts_list_long_press_menu.xml b/app/src/main/res/layout/contacts_list_long_press_menu.xml index 4b9a29fa5..5c9ecd925 100644 --- a/app/src/main/res/layout/contacts_list_long_press_menu.xml +++ b/app/src/main/res/layout/contacts_list_long_press_menu.xml @@ -35,7 +35,7 @@ android:layout_marginBottom="1dp" android:background="@drawable/menu_item_background" android:text="@{isFavourite ? `Remove from favourites` : `Add to favourites`, default=`Add to favourites`}" - android:drawableStart="@{isFavourite ? @drawable/favourite : @drawable/not_favourite, default=@drawable/favourite}" + android:drawableStart="@{isFavourite ? @drawable/heart_fill : @drawable/heart, default=@drawable/heart_fill}" android:drawableTint="@{isFavourite ? @color/red_danger : @color/gray_1, default=@color/gray_1}" app:layout_constraintBottom_toTopOf="@id/share" app:layout_constraintStart_toStartOf="parent" @@ -50,7 +50,7 @@ style="@style/context_menu_action_label_style" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@drawable/share" + android:drawableStart="@drawable/share_network" app:layout_constraintBottom_toTopOf="@id/delete" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -64,7 +64,7 @@ style="@style/context_menu_danger_action_label_style" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@drawable/delete" + android:drawableStart="@drawable/trash_simple" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/conversation_fragment.xml b/app/src/main/res/layout/conversation_fragment.xml index a1eb10169..65cc2a245 100644 --- a/app/src/main/res/layout/conversation_fragment.xml +++ b/app/src/main/res/layout/conversation_fragment.xml @@ -23,7 +23,7 @@ android:onClick="@{backClickListener}" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/back" + android:src="@drawable/caret_left" android:padding="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -86,7 +86,7 @@ android:id="@+id/video_call" android:layout_width="wrap_content" android:layout_height="0dp" - android:src="@drawable/video_call" + android:src="@drawable/video_camera" android:padding="10dp" app:layout_constraintTop_toTopOf="@id/back" app:layout_constraintBottom_toBottomOf="@id/back" @@ -96,7 +96,7 @@ android:id="@+id/phone_call" android:layout_width="wrap_content" android:layout_height="0dp" - android:src="@drawable/phone_call" + android:src="@drawable/phone" android:padding="10dp" app:layout_constraintTop_toTopOf="@id/back" app:layout_constraintBottom_toBottomOf="@id/back" @@ -161,7 +161,7 @@ android:id="@+id/attach_file" android:layout_width="wrap_content" android:layout_height="0dp" - android:src="@drawable/add_file" + android:src="@drawable/plus_circle" android:padding="5dp" android:layout_marginStart="10dp" app:layout_constraintStart_toEndOf="@id/emoji_picker" diff --git a/app/src/main/res/layout/conversation_start_fragment.xml b/app/src/main/res/layout/conversation_start_fragment.xml index d4a0a329c..a71494b79 100644 --- a/app/src/main/res/layout/conversation_start_fragment.xml +++ b/app/src/main/res/layout/conversation_start_fragment.xml @@ -88,7 +88,7 @@ android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:padding="10dp" - android:drawableStart="@drawable/search" + android:drawableStart="@drawable/magnifying_glass" android:drawablePadding="10dp" android:background="@drawable/shape_search_square_background" android:hint="Rechercher des contacts" @@ -104,7 +104,7 @@ android:id="@+id/new_group_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/group_chat" + android:src="@drawable/users_three" android:padding="10dp" android:background="@drawable/shape_orange_round" android:layout_marginTop="30dp" @@ -122,7 +122,7 @@ android:padding="5dp" android:layout_marginStart="7dp" android:layout_marginEnd="20dp" - android:drawableEnd="@drawable/next" + android:drawableEnd="@drawable/caret_right" android:drawablePadding="5dp" android:visibility="@{viewModel.filter.length() > 0 || viewModel.groupEnabled ? View.GONE : View.VISIBLE}" app:layout_constraintStart_toEndOf="@id/new_group_avatar" diff --git a/app/src/main/res/layout/conversations_fragment.xml b/app/src/main/res/layout/conversations_fragment.xml index 643f661a3..c076f7d83 100644 --- a/app/src/main/res/layout/conversations_fragment.xml +++ b/app/src/main/res/layout/conversations_fragment.xml @@ -65,7 +65,7 @@ android:drawablePadding="5dp" app:layout_constraintStart_toEndOf="@id/sort_by_label" app:layout_constraintTop_toBottomOf="@id/top_bar" - app:drawableEndCompat="@drawable/spinner" /> + app:drawableEndCompat="@drawable/caret_down" /> + + - - - + android:layout_height="match_parent"> + + + + + + diff --git a/app/src/main/res/layout/voip_call_extra_actions.xml b/app/src/main/res/layout/voip_call_extra_actions.xml index e7db90c7f..6512c6764 100644 --- a/app/src/main/res/layout/voip_call_extra_actions.xml +++ b/app/src/main/res/layout/voip_call_extra_actions.xml @@ -46,7 +46,7 @@ android:layout_marginTop="@dimen/voip_extra_button_top_margin" android:padding="@dimen/voip_button_icon_padding" android:background="@drawable/in_call_button_background" - android:src="@drawable/new_call" + android:src="@drawable/phone_plus" app:tint="@color/white" app:layout_constraintDimensionRatio="1:1" app:layout_constraintStart_toStartOf="@id/new_call_label" @@ -88,7 +88,7 @@ android:layout_marginTop="@dimen/voip_extra_button_top_margin" android:padding="@dimen/voip_button_icon_padding" android:background="@drawable/in_call_button_background" - android:src="@drawable/chat" + android:src="@drawable/chat_dots" app:tint="@color/white" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/transfer_label" @@ -116,7 +116,7 @@ android:layout_marginTop="@dimen/voip_extra_button_top_margin" android:padding="@dimen/voip_button_icon_padding" android:background="@drawable/in_call_button_background" - android:src="@drawable/record_call" + android:src="@drawable/record" app:tint="@color/white" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toBottomOf="@id/calls_list_label" diff --git a/app/src/main/res/layout/voip_call_main_actions.xml b/app/src/main/res/layout/voip_call_main_actions.xml index 82391abb1..585b9d7a6 100644 --- a/app/src/main/res/layout/voip_call_main_actions.xml +++ b/app/src/main/res/layout/voip_call_main_actions.xml @@ -26,7 +26,7 @@ android:layout_width="0dp" android:layout_height="24dp" android:layout_marginBottom="15dp" - android:src="@{viewModel.isActionsMenuExpanded ? @drawable/expand : @drawable/collapse, default=@drawable/collapse}" + android:src="@{viewModel.isActionsMenuExpanded ? @drawable/caret_down : @drawable/caret_up, default=@drawable/caret_up}" app:tint="@color/white" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -42,7 +42,7 @@ android:paddingEnd="30dp" android:paddingTop="15dp" android:paddingBottom="15dp" - android:src="@drawable/hang_up" + android:src="@drawable/phone_disconnect" android:background="@drawable/shape_hang_up_button_background" app:tint="@color/white" app:layout_constraintBottom_toBottomOf="parent" @@ -55,7 +55,7 @@ android:layout_height="@dimen/voip_button_size" android:layout_marginEnd="16dp" android:padding="@dimen/voip_button_icon_padding" - android:src="@{viewModel.isVideoEnabled() ? @drawable/camera_enabled : @drawable/camera_disabled, default=@drawable/camera_enabled}" + android:src="@{viewModel.isVideoEnabled() ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}" android:background="@drawable/in_call_button_background" app:tint="@color/white" app:layout_constraintBottom_toBottomOf="parent" @@ -68,7 +68,7 @@ android:layout_height="@dimen/voip_button_size" android:layout_marginEnd="16dp" android:padding="@dimen/voip_button_icon_padding" - android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_muted : @drawable/microphone, default=@drawable/microphone}" + android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}" android:background="@drawable/in_call_button_background" app:tint="@color/white" app:layout_constraintBottom_toBottomOf="parent" @@ -81,7 +81,7 @@ android:layout_height="@dimen/voip_button_size" android:layout_marginEnd="30dp" android:padding="@dimen/voip_button_icon_padding" - android:src="@{viewModel.isSpeakerEnabled ? @drawable/speaker_off : @drawable/speaker_on, default=@drawable/speaker_off}" + android:src="@{viewModel.isSpeakerEnabled ? @drawable/speaker_slash : @drawable/speaker_high, default=@drawable/speaker_slash}" android:background="@drawable/in_call_button_background" app:tint="@color/white" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml index f7e9b0cb2..37dc9e611 100644 --- a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml +++ b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml @@ -27,7 +27,7 @@ android:paddingTop="15dp" android:paddingEnd="30dp" android:paddingBottom="15dp" - android:src="@drawable/hang_up" + android:src="@drawable/phone_disconnect" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/answer_call" app:layout_constraintStart_toStartOf="parent" @@ -43,7 +43,7 @@ android:paddingTop="15dp" android:paddingEnd="30dp" android:paddingBottom="15dp" - android:src="@drawable/calls" + android:src="@drawable/phone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/hang_up" diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/voip_outgoing_call_fragment.xml index fcb0edd93..19c8722e8 100644 --- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml +++ b/app/src/main/res/layout/voip_outgoing_call_fragment.xml @@ -46,7 +46,7 @@ android:layout_height="24dp" android:layout_marginEnd="10dp" android:adjustViewBounds="true" - android:src="@drawable/switch_camera" + android:src="@drawable/camera_rotate" android:visibility="@{viewModel.isVideoEnabled() ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toTopOf="@id/call_direction_label" app:layout_constraintBottom_toBottomOf="@id/call_direction_label" diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 917f27ff6..4fb8e3e23 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -13,6 +13,7 @@ 100dp 120dp 12dp + 26dp 2dp 3dp 22dp