From 78052cae1266e3c33e9ac5322f6c5586e51a893a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 3 May 2024 11:08:32 +0200
Subject: [PATCH] Code cleanup, removed unused resources, fixed some colors

---
 .../org/linphone/contacts/ContactsManager.kt  |   5 -
 .../java/org/linphone/core/CorePreferences.kt |  11 +-
 .../java/org/linphone/ui/GenericActivity.kt   |   8 +-
 .../AcceptConditionsAndPolicyDialogModel.kt   |   2 +-
 .../viewmodel/ConferenceViewModel.kt          |   8 +-
 .../ui/call/viewmodel/CurrentCallViewModel.kt |   4 +-
 .../main/chat/ConversationScrollListener.kt   |   6 +-
 .../contacts/viewmodel/ContactViewModel.kt    |   6 +-
 .../viewmodel/FileViewModel.kt                |   2 +-
 .../ui/main/help/fragment/DebugFragment.kt    |   4 +-
 .../viewmodel/ScheduleMeetingViewModel.kt     |   2 +-
 .../fragment/AccountProfileFragment.kt        |   4 +-
 .../sso/viewmodel/SingleSignOnViewModel.kt    |  31 +----
 .../main/java/org/linphone/utils/FileUtils.kt |  13 ---
 .../res/drawable/arrow_bend_up_left_bold.xml  |   9 --
 .../res/drawable/arrow_bend_up_right_bold.xml |   9 --
 .../main/res/drawable/arrow_right_fill.xml    |   9 --
 app/src/main/res/drawable/chart_bar.xml       |   9 --
 app/src/main/res/drawable/handle.xml          |   9 --
 app/src/main/res/drawable/in_progress.xml     |  15 ---
 .../main/res/drawable/lock_simple_open.xml    |   9 --
 .../res/drawable/media_encryption_srtp.xml    |  12 --
 .../res/drawable/media_encryption_zrtp_pq.xml |  13 ---
 app/src/main/res/drawable/screencast.xml      |   9 --
 .../res/drawable/shape_line_main2_200.xml     |   5 -
 .../shape_round_in_call_gray_background.xml   |   5 -
 app/src/main/res/drawable/wifi_high.xml       |   9 --
 app/src/main/res/drawable/wifi_low.xml        |   9 --
 .../assistant_single_sign_on_activity.xml     | 106 ------------------
 .../res/layout/file_media_viewer_fragment.xml |   3 +-
 .../main/res/layout/file_viewer_fragment.xml  |   2 +-
 .../main/res/layout/help_debug_fragment.xml   |   4 +-
 .../layout/meeting_list_today_indicator.xml   |   5 +-
 ...ttings_contacts_carddav_ldap_list_cell.xml |   3 +-
 app/src/main/res/layout/toast.xml             |   5 +-
 app/src/main/res/values-fr/strings.xml        |  13 ---
 app/src/main/res/values/colors.xml            |  11 --
 app/src/main/res/values/dimen.xml             |   2 -
 app/src/main/res/values/strings.xml           |  13 ---
 39 files changed, 39 insertions(+), 365 deletions(-)
 delete mode 100644 app/src/main/res/drawable/arrow_bend_up_left_bold.xml
 delete mode 100644 app/src/main/res/drawable/arrow_bend_up_right_bold.xml
 delete mode 100644 app/src/main/res/drawable/arrow_right_fill.xml
 delete mode 100644 app/src/main/res/drawable/chart_bar.xml
 delete mode 100644 app/src/main/res/drawable/handle.xml
 delete mode 100644 app/src/main/res/drawable/in_progress.xml
 delete mode 100644 app/src/main/res/drawable/lock_simple_open.xml
 delete mode 100644 app/src/main/res/drawable/media_encryption_srtp.xml
 delete mode 100644 app/src/main/res/drawable/media_encryption_zrtp_pq.xml
 delete mode 100644 app/src/main/res/drawable/screencast.xml
 delete mode 100644 app/src/main/res/drawable/shape_line_main2_200.xml
 delete mode 100644 app/src/main/res/drawable/shape_round_in_call_gray_background.xml
 delete mode 100644 app/src/main/res/drawable/wifi_high.xml
 delete mode 100644 app/src/main/res/drawable/wifi_low.xml
 delete mode 100644 app/src/main/res/layout/assistant_single_sign_on_activity.xml

diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index c914be7c9..b1c79e61a 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -220,11 +220,6 @@ class ContactsManager @UiThread constructor() {
         coreContext.contactsManager.notifyContactsListChanged()
     }
 
-    @WorkerThread
-    fun areContactsAvailable(): Boolean {
-        return nativeContactsLoaded || knownContactsAvatarsMap.isNotEmpty()
-    }
-
     @WorkerThread
     fun onNativeContactsLoaded() {
         nativeContactsLoaded = true
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 32703c3fe..06b2e363a 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -31,6 +31,7 @@ class CorePreferences @UiThread constructor(private val context: Context) {
     companion object {
         private const val TAG = "[Preferences]"
 
+        const val CONFIG_FILE_NAME = ".linphonerc"
         const val CURRENT_VERSION = 60000
     }
 
@@ -207,13 +208,9 @@ class CorePreferences @UiThread constructor(private val context: Context) {
     val defaultDomain: String
         get() = config.getString("app", "default_domain", "sip.linphone.org")!!
 
-    @get:AnyThread
-    val configFile: String
-        get() = ".linphonerc"
-
     @get:AnyThread
     val configPath: String
-        get() = context.filesDir.absolutePath + "/" + configFile
+        get() = context.filesDir.absolutePath + "/" + CONFIG_FILE_NAME
 
     @get:AnyThread
     val factoryConfigPath: String
@@ -227,10 +224,6 @@ class CorePreferences @UiThread constructor(private val context: Context) {
     val thirdPartyDefaultValuesPath: String
         get() = context.filesDir.absolutePath + "/assistant_third_party_default_values"
 
-    @get:AnyThread
-    val ringtonesPath: String
-        get() = context.filesDir.absolutePath + "/share/sounds/linphone/rings/"
-
     @get:AnyThread
     val vfsCachePath: String
         get() = context.cacheDir.absolutePath + "/evfs/"
diff --git a/app/src/main/java/org/linphone/ui/GenericActivity.kt b/app/src/main/java/org/linphone/ui/GenericActivity.kt
index d4d03976a..bd3c5a983 100644
--- a/app/src/main/java/org/linphone/ui/GenericActivity.kt
+++ b/app/src/main/java/org/linphone/ui/GenericActivity.kt
@@ -111,7 +111,7 @@ open class GenericActivity : AppCompatActivity() {
                 toastsArea.addView(greenToast.root)
 
                 greenToast.root.slideInToastFromTopForDuration(
-                    toastsArea as ViewGroup,
+                    toastsArea,
                     lifecycleScope,
                     duration
                 )
@@ -137,7 +137,7 @@ open class GenericActivity : AppCompatActivity() {
                 toastsArea.addView(blueToast.root)
 
                 blueToast.root.slideInToastFromTopForDuration(
-                    toastsArea as ViewGroup,
+                    toastsArea,
                     lifecycleScope,
                     duration
                 )
@@ -163,7 +163,7 @@ open class GenericActivity : AppCompatActivity() {
                 toastsArea.addView(redToast.root)
 
                 redToast.root.slideInToastFromTopForDuration(
-                    toastsArea as ViewGroup,
+                    toastsArea,
                     lifecycleScope,
                     duration
                 )
@@ -191,7 +191,7 @@ open class GenericActivity : AppCompatActivity() {
                 toastsArea.addView(redToast.root)
 
                 redToast.root.slideInToastFromTop(
-                    toastsArea as ViewGroup,
+                    toastsArea,
                     true
                 )
             }
diff --git a/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt b/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt
index fb6160d0a..cb893b1dc 100644
--- a/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt
@@ -48,7 +48,7 @@ class AcceptConditionsAndPolicyDialogModel @UiThread constructor() {
         val privacy = "politique de confidentialité"
         val terms = "conditions d'utilisation"
 
-        val label = "En continuant, vous notre $privacy et nos $terms."
+        val label = "En continuant, vous acceptez notre $privacy et nos $terms."
         val spannable = SpannableString(label)
 
         val termsMatcher = Pattern.compile(terms).matcher(label)
diff --git a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
index 23d3b4aa5..ad9c62fa6 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
@@ -125,7 +125,7 @@ class ConferenceViewModel {
             if (found != null) {
                 Log.i("$TAG Newly active speaker participant is [${found.name}]")
                 found.isActiveSpeaker.postValue(true)
-                activeSpeaker.postValue(found)
+                activeSpeaker.postValue(found!!)
             } else {
                 Log.i("$TAG Failed to find actively speaking participant...")
                 val model = ConferenceParticipantDeviceModel(participantDevice)
@@ -227,7 +227,7 @@ class ConferenceViewModel {
                 isPaused.postValue(!isIn)
                 Log.i("$TAG We ${if (isIn) "are" else "aren't"} in the conference")
 
-                computeParticipants()
+                computeParticipants(false)
             }
         }
     }
@@ -267,7 +267,7 @@ class ConferenceViewModel {
         subject.postValue(confSubject)
 
         if (conference.state == Conference.State.Created) {
-            computeParticipants()
+            computeParticipants(false)
         }
 
         val currentLayout = getCurrentLayout(call)
@@ -398,7 +398,7 @@ class ConferenceViewModel {
     }
 
     @WorkerThread
-    private fun computeParticipants(skipDevices: Boolean = false) {
+    private fun computeParticipants(skipDevices: Boolean) {
         participantDevices.value.orEmpty().forEach(ConferenceParticipantDeviceModel::destroy)
 
         val participantsList = arrayListOf<ConferenceParticipantModel>()
diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index cc7c70309..5ca8773a1 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -118,7 +118,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
 
     val callStatsModel = CallStatsModel()
 
-    val callMediaEncryptionModel = CallMediaEncryptionModel() {
+    val callMediaEncryptionModel = CallMediaEncryptionModel {
         showZrtpSasDialogIfPossible()
     }
 
@@ -920,7 +920,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
                 val avatarModel = contact.value
                 if (avatarModel != null && currentCall.conference == null) { // Don't do it for conferences
                     avatarModel.trust.postValue(securityLevel)
-                    contact.postValue(avatarModel)
+                    contact.postValue(avatarModel!!)
 
                     // Also update avatar contact model if any for the rest of the app
                     val address = currentCall.remoteAddress
diff --git a/app/src/main/java/org/linphone/ui/main/chat/ConversationScrollListener.kt b/app/src/main/java/org/linphone/ui/main/chat/ConversationScrollListener.kt
index 3e8ecc0d3..edf0b6097 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/ConversationScrollListener.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/ConversationScrollListener.kt
@@ -27,7 +27,7 @@ internal abstract class ConversationScrollListener(private val mLayoutManager: L
     companion object {
         // The minimum amount of items to have below your current scroll position
         // before loading more.
-        private const val mVisibleThreshold = 5
+        private const val VISIBLE_THRESHOLD = 5
     }
 
     // The total number of items in the data set after the last load
@@ -73,9 +73,9 @@ internal abstract class ConversationScrollListener(private val mLayoutManager: L
         // If we do need to reload some more data, we execute onLoadMore to fetch the data.
         // threshold should reflect how many total columns there are too
         if (!loading &&
-            firstVisibleItemPosition < mVisibleThreshold &&
+            firstVisibleItemPosition < VISIBLE_THRESHOLD &&
             firstVisibleItemPosition >= 0 &&
-            lastVisibleItemPosition < totalItemCount - mVisibleThreshold
+            lastVisibleItemPosition < totalItemCount - VISIBLE_THRESHOLD
         ) {
             onLoadMore(totalItemCount)
             loading = true
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
index 50f7fc64f..3f486b6e9 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
@@ -310,11 +310,11 @@ class ContactViewModel @UiThread constructor() : ViewModel() {
 
         val organization = friend.organization
         if (!organization.isNullOrEmpty()) {
-            company.postValue(organization)
+            company.postValue(organization!!)
         }
         val jobTitle = friend.jobTitle
         if (!jobTitle.isNullOrEmpty()) {
-            title.postValue(jobTitle)
+            title.postValue(jobTitle!!)
         }
 
         val addressesAndNumbers = friend.getListOfSipAddressesAndPhoneNumbers(listener)
@@ -664,7 +664,7 @@ class ContactViewModel @UiThread constructor() : ViewModel() {
             }
 
             if (devicesList.isNotEmpty()) {
-                trustedDevicesPercentage.postValue(trustedDevicesCount * 100 / devicesCount.toInt())
+                trustedDevicesPercentage.postValue(trustedDevicesCount * 100 / devicesCount)
                 trustedDevicesPercentageFloat.postValue(
                     trustedDevicesCount / devicesCount.toFloat() / 2
                 )
diff --git a/app/src/main/java/org/linphone/ui/main/file_media_viewer/viewmodel/FileViewModel.kt b/app/src/main/java/org/linphone/ui/main/file_media_viewer/viewmodel/FileViewModel.kt
index 00e553c77..bd528e93e 100644
--- a/app/src/main/java/org/linphone/ui/main/file_media_viewer/viewmodel/FileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/file_media_viewer/viewmodel/FileViewModel.kt
@@ -115,7 +115,7 @@ class FileViewModel @UiThread constructor() : ViewModel() {
 
         if (!content.isNullOrEmpty()) {
             isText.value = true
-            text.postValue(content)
+            text.postValue(content!!)
             mimeType.postValue("text/plain")
             Log.i("$TAG Using pre-loaded content as PlainText")
             fileReadyEvent.postValue(Event(true))
diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
index 7df7e6dc7..29666f80c 100644
--- a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
@@ -27,8 +27,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.navGraphViewModels
-import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
+import org.linphone.core.CorePreferences
 import org.linphone.core.tools.Log
 import org.linphone.databinding.HelpDebugFragmentBinding
 import org.linphone.ui.GenericActivity
@@ -117,7 +117,7 @@ class DebugFragment : GenericFragment() {
             it.consume { content ->
                 if (findNavController().currentDestination?.id == R.id.debugFragment) {
                     val action = DebugFragmentDirections.actionDebugFragmentToFileViewerFragment(
-                        corePreferences.configFile,
+                        CorePreferences.CONFIG_FILE_NAME,
                         content
                     )
                     findNavController().navigate(action)
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
index 7251e8288..13eaec9c2 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
@@ -229,7 +229,7 @@ class ScheduleMeetingViewModel @UiThread constructor() : ViewModel() {
             }
 
             if (address == null) {
-                Log.e("$TAG Failed to parse conference URI [$address], abort")
+                Log.e("$TAG Failed to parse conference URI [$uri], abort")
                 return@postOnCoreThread
             }
 
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
index f823204a6..936748dd5 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
@@ -185,8 +185,8 @@ class AccountProfileFragment : GenericFragment() {
                         startPostponedEnterTransition()
                         setupDialPlanPicker()
 
-                        sharedViewModel.goToAccountProfileModeEvent.observe(viewLifecycleOwner) {
-                            it.consume {
+                        sharedViewModel.goToAccountProfileModeEvent.observe(viewLifecycleOwner) { event ->
+                            event.consume {
                                 Log.i(
                                     "$TAG Account was found, going directly to AccountProfileMode fragment"
                                 )
diff --git a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
index a9cae43e2..22f9ac04d 100644
--- a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
@@ -108,10 +108,10 @@ class SingleSignOnViewModel : ViewModel() {
                     )
                     if (!singleSignOnUrl.endsWith(".well-known/openid-configuration")) {
                         Log.w("$TAG Trying again appending .well-known/openid-configuration to URL")
-                        if (singleSignOnUrl.endsWith("/")) {
-                            singleSignOnUrl = "$singleSignOnUrl.well-known/openid-configuration"
+                        singleSignOnUrl = if (singleSignOnUrl.endsWith("/")) {
+                            "$singleSignOnUrl.well-known/openid-configuration"
                         } else {
-                            singleSignOnUrl = "$singleSignOnUrl/.well-known/openid-configuration"
+                            "$singleSignOnUrl/.well-known/openid-configuration"
                         }
                         singleSignOn()
                     } else {
@@ -215,31 +215,6 @@ class SingleSignOnViewModel : ViewModel() {
         }
     }
 
-    @UiThread
-    private fun useToken() {
-        if (::authState.isInitialized && ::authService.isInitialized) {
-            if (authState.needsTokenRefresh && authState.refreshToken.isNullOrEmpty()) {
-                Log.e("$TAG Attempted to take an unauthorized action without a refresh token!")
-                return
-            }
-
-            singleSignOnProcessCompletedEvent.postValue(Event(true))
-            /*Log.i("$TAG Performing action with fresh token")
-            authState.performActionWithFreshTokens(
-                authService,
-                AuthState.AuthStateAction { accessToken, idToken, ex ->
-                    if (ex != null) {
-                        Log.e("$TAG Failed to use token [$ex]")
-                        return@AuthStateAction
-                    }
-
-                    Log.i("$TAG Access & id tokens are now available")
-                    storeAuthStateAsJsonFile()
-                }
-            )*/
-        }
-    }
-
     @UiThread
     private suspend fun getAuthState(): AuthState {
         val file = File(coreContext.context.filesDir.absolutePath, "auth_state.json")
diff --git a/app/src/main/java/org/linphone/utils/FileUtils.kt b/app/src/main/java/org/linphone/utils/FileUtils.kt
index 482ee0bbb..4fd215c94 100644
--- a/app/src/main/java/org/linphone/utils/FileUtils.kt
+++ b/app/src/main/java/org/linphone/utils/FileUtils.kt
@@ -440,19 +440,6 @@ class FileUtils {
             }
         }
 
-        @AnyThread
-        suspend fun clearCacheDirectory() {
-            val dir = coreContext.context.cacheDir
-            var count = 0
-            if (dir.exists()) {
-                for (file in dir.listFiles().orEmpty()) {
-                    deleteFile(file.path)
-                    count += 1
-                }
-            }
-            Log.w("$TAG Deleted [$count] cache files")
-        }
-
         @AnyThread
         fun countFilesInDirectory(path: String): Int {
             val dir = File(path)
diff --git a/app/src/main/res/drawable/arrow_bend_up_left_bold.xml b/app/src/main/res/drawable/arrow_bend_up_left_bold.xml
deleted file mode 100644
index 4ae3f6839..000000000
--- a/app/src/main/res/drawable/arrow_bend_up_left_bold.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M236,200a12,12 0,0 1,-24 0,84.09 84.09,0 0,0 -84,-84H61l27.52,27.51a12,12 0,0 1,-17 17l-48,-48a12,12 0,0 1,0 -17l48,-48a12,12 0,0 1,17 17L61,92h67A108.12,108.12 0,0 1,236 200Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/arrow_bend_up_right_bold.xml b/app/src/main/res/drawable/arrow_bend_up_right_bold.xml
deleted file mode 100644
index 26252d3b5..000000000
--- a/app/src/main/res/drawable/arrow_bend_up_right_bold.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M232.49,112.49l-48,48a12,12 0,0 1,-17 -17L195,116H128a84.09,84.09 0,0 0,-84 84,12 12,0 0,1 -24,0A108.12,108.12 0,0 1,128 92h67L167.51,64.48a12,12 0,0 1,17 -17l48,48A12,12 0,0 1,232.49 112.49Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/arrow_right_fill.xml b/app/src/main/res/drawable/arrow_right_fill.xml
deleted file mode 100644
index 68e8c6dd8..000000000
--- a/app/src/main/res/drawable/arrow_right_fill.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M221.66,133.66l-72,72A8,8 0,0 1,136 200V136H40a8,8 0,0 1,0 -16h96V56a8,8 0,0 1,13.66 -5.66l72,72A8,8 0,0 1,221.66 133.66Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/chart_bar.xml b/app/src/main/res/drawable/chart_bar.xml
deleted file mode 100644
index 6916f393e..000000000
--- a/app/src/main/res/drawable/chart_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M224,200h-8V40a8,8 0,0 0,-8 -8H152a8,8 0,0 0,-8 8V80H96a8,8 0,0 0,-8 8v40H48a8,8 0,0 0,-8 8v64H32a8,8 0,0 0,0 16H224a8,8 0,0 0,0 -16ZM160,48h40V200H160ZM104,96h40V200H104ZM56,144H88v56H56Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/handle.xml b/app/src/main/res/drawable/handle.xml
deleted file mode 100644
index 167d1369e..000000000
--- a/app/src/main/res/drawable/handle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="38dp"
-    android:height="9dp"
-    android:viewportWidth="38"
-    android:viewportHeight="9">
-  <path
-      android:pathData="M0,6.907C0,6.231 0.442,5.635 1.088,5.439L19,0L36.912,5.439C37.558,5.635 38,6.231 38,6.907C38,7.944 36.993,8.682 36.004,8.37L19,3L1.996,8.37C1.007,8.682 0,7.944 0,6.907Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/in_progress.xml b/app/src/main/res/drawable/in_progress.xml
deleted file mode 100644
index a1f27bee6..000000000
--- a/app/src/main/res/drawable/in_progress.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:name="rotationGroup"
-        android:pivotX="12.0"
-        android:pivotY="12.0"
-        android:rotation="0" >
-        <path
-            android:pathData="M12.692,3.692V6.462C12.692,6.645 12.619,6.821 12.49,6.951C12.36,7.081 12.184,7.154 12,7.154C11.816,7.154 11.64,7.081 11.51,6.951C11.381,6.821 11.308,6.645 11.308,6.462V3.692C11.308,3.509 11.381,3.333 11.51,3.203C11.64,3.073 11.816,3 12,3C12.184,3 12.36,3.073 12.49,3.203C12.619,3.333 12.692,3.509 12.692,3.692ZM15.916,8.776C16.007,8.776 16.097,8.758 16.181,8.724C16.265,8.689 16.341,8.637 16.406,8.573L18.364,6.616C18.494,6.486 18.567,6.309 18.567,6.126C18.567,5.942 18.494,5.766 18.364,5.636C18.234,5.506 18.058,5.433 17.874,5.433C17.691,5.433 17.514,5.506 17.384,5.636L15.427,7.594C15.33,7.691 15.264,7.814 15.237,7.949C15.21,8.083 15.224,8.222 15.276,8.349C15.329,8.475 15.417,8.583 15.531,8.66C15.645,8.736 15.779,8.776 15.916,8.776ZM20.308,11.308H17.538C17.355,11.308 17.179,11.381 17.049,11.51C16.919,11.64 16.846,11.816 16.846,12C16.846,12.184 16.919,12.36 17.049,12.49C17.179,12.619 17.355,12.692 17.538,12.692H20.308C20.491,12.692 20.667,12.619 20.797,12.49C20.927,12.36 21,12.184 21,12C21,11.816 20.927,11.64 20.797,11.51C20.667,11.381 20.491,11.308 20.308,11.308ZM16.406,15.427C16.275,15.303 16.101,15.234 15.92,15.237C15.739,15.239 15.567,15.312 15.439,15.439C15.312,15.567 15.239,15.739 15.237,15.92C15.234,16.101 15.303,16.275 15.427,16.406L17.384,18.364C17.514,18.494 17.691,18.567 17.874,18.567C18.058,18.567 18.234,18.494 18.364,18.364C18.494,18.234 18.567,18.058 18.567,17.874C18.567,17.691 18.494,17.514 18.364,17.384L16.406,15.427ZM12,16.846C11.816,16.846 11.64,16.919 11.51,17.049C11.381,17.179 11.308,17.355 11.308,17.538V20.308C11.308,20.491 11.381,20.667 11.51,20.797C11.64,20.927 11.816,21 12,21C12.184,21 12.36,20.927 12.49,20.797C12.619,20.667 12.692,20.491 12.692,20.308V17.538C12.692,17.355 12.619,17.179 12.49,17.049C12.36,16.919 12.184,16.846 12,16.846ZM7.594,15.427L5.636,17.384C5.506,17.514 5.433,17.691 5.433,17.874C5.433,18.058 5.506,18.234 5.636,18.364C5.766,18.494 5.942,18.567 6.126,18.567C6.309,18.567 6.486,18.494 6.616,18.364L8.573,16.406C8.697,16.275 8.766,16.101 8.763,15.92C8.761,15.739 8.688,15.567 8.561,15.439C8.433,15.312 8.261,15.239 8.08,15.237C7.899,15.234 7.725,15.303 7.594,15.427ZM7.154,12C7.154,11.816 7.081,11.64 6.951,11.51C6.821,11.381 6.645,11.308 6.462,11.308H3.692C3.509,11.308 3.333,11.381 3.203,11.51C3.073,11.64 3,11.816 3,12C3,12.184 3.073,12.36 3.203,12.49C3.333,12.619 3.509,12.692 3.692,12.692H6.462C6.645,12.692 6.821,12.619 6.951,12.49C7.081,12.36 7.154,12.184 7.154,12ZM6.616,5.636C6.486,5.506 6.309,5.433 6.126,5.433C5.942,5.433 5.766,5.506 5.636,5.636C5.506,5.766 5.433,5.942 5.433,6.126C5.433,6.309 5.506,6.486 5.636,6.616L7.594,8.573C7.725,8.697 7.899,8.766 8.08,8.763C8.261,8.761 8.433,8.688 8.561,8.561C8.688,8.433 8.761,8.261 8.763,8.08C8.766,7.899 8.697,7.725 8.573,7.594L6.616,5.636Z"
-            android:fillColor="#FE5E00"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/lock_simple_open.xml b/app/src/main/res/drawable/lock_simple_open.xml
deleted file mode 100644
index 34d68ddeb..000000000
--- a/app/src/main/res/drawable/lock_simple_open.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M208,80L96,80L96,56a32,32 0,0 1,32 -32c15.37,0 29.2,11 32.16,25.59a8,8 0,0 0,15.68 -3.18C171.32,24.15 151.2,8 128,8A48.05,48.05 0,0 0,80 56L80,80L48,80A16,16 0,0 0,32 96L32,208a16,16 0,0 0,16 16L208,224a16,16 0,0 0,16 -16L224,96A16,16 0,0 0,208 80ZM208,208L48,208L48,96L208,96L208,208Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/media_encryption_srtp.xml b/app/src/main/res/drawable/media_encryption_srtp.xml
deleted file mode 100644
index c8eaf1824..000000000
--- a/app/src/main/res/drawable/media_encryption_srtp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M23,2.526V9.236C23,19.465 14.312,22.859 12.573,23.436C12.201,23.561 11.799,23.561 11.427,23.436C9.685,22.859 1,19.465 1,9.236V2.526C1,2.042 1.193,1.577 1.537,1.235C1.881,0.892 2.347,0.7 2.833,0.7H21.167C21.653,0.7 22.119,0.892 22.463,1.235C22.807,1.577 23,2.042 23,2.526Z"
-      android:fillColor="#364860"/>
-  <path
-      android:pathData="M22,3.267V9.389C22,18.723 14.102,21.82 12.521,22.346C12.183,22.461 11.817,22.461 11.479,22.346C9.896,21.82 2,18.723 2,9.389V3.267C2,2.825 2.176,2.401 2.488,2.088C2.801,1.776 3.225,1.6 3.667,1.6H20.333C20.775,1.6 21.199,1.776 21.512,2.088C21.824,2.401 22,2.825 22,3.267Z"
-      android:fillColor="#4AA8FF"/>
-</vector>
diff --git a/app/src/main/res/drawable/media_encryption_zrtp_pq.xml b/app/src/main/res/drawable/media_encryption_zrtp_pq.xml
deleted file mode 100644
index 23cacba22..000000000
--- a/app/src/main/res/drawable/media_encryption_zrtp_pq.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M23,2.526V9.236C23,19.465 14.312,22.859 12.573,23.436C12.201,23.561 11.799,23.561 11.427,23.436C9.685,22.859 1,19.465 1,9.236V2.526C1,2.042 1.193,1.577 1.537,1.235C1.881,0.892 2.347,0.7 2.833,0.7H21.167C21.653,0.7 22.119,0.892 22.463,1.235C22.807,1.577 23,2.042 23,2.526Z"
-      android:fillColor="#364860"/>
-  <path
-      android:pathData="M22,9.389V3.267C22,2.825 21.824,2.401 21.512,2.088C21.199,1.776 20.775,1.6 20.333,1.6H3.667C3.225,1.6 2.801,1.776 2.488,2.088C2.176,2.401 2,2.825 2,3.267V9.389C2,18.723 9.896,21.82 11.479,22.346C11.817,22.461 12.183,22.461 12.521,22.346C14.102,21.82 22,18.723 22,9.389ZM15.885,10.661C16.264,11.197 16.592,11.766 16.867,12.362C17.512,13.795 17.504,14.949 16.841,15.61C16.507,15.944 16.046,16.111 15.487,16.111C14.941,16.111 14.301,15.952 13.593,15.633C12.997,15.359 12.428,15.031 11.892,14.652C11.357,15.031 10.788,15.359 10.192,15.633C9.484,15.952 8.842,16.111 8.297,16.111C7.741,16.111 7.28,15.944 6.946,15.61C6.285,14.949 6.277,13.795 6.922,12.362C7.197,11.766 7.525,11.197 7.903,10.661C7.525,10.126 7.197,9.556 6.922,8.961C6.277,7.527 6.285,6.373 6.946,5.713C7.606,5.052 8.76,5.044 10.194,5.689C10.79,5.964 11.359,6.292 11.894,6.67C12.43,6.292 12.999,5.964 13.595,5.689C15.029,5.044 16.183,5.052 16.843,5.713C17.504,6.373 17.512,7.527 16.867,8.961C16.592,9.556 16.264,10.126 15.885,10.661ZM15.046,9.57C16.015,8.056 16.204,6.926 15.918,6.639V6.638C15.631,6.352 14.501,6.541 12.984,7.512C13.35,7.818 13.711,8.148 14.061,8.498C14.411,8.848 14.74,9.207 15.046,9.57ZM13.133,11.9C13.528,11.507 13.901,11.094 14.251,10.661C13.901,10.229 13.528,9.815 13.133,9.422C12.741,9.028 12.327,8.655 11.894,8.305C11.03,9.007 10.241,9.797 9.538,10.661C9.888,11.094 10.262,11.507 10.656,11.9C11.049,12.294 11.462,12.667 11.894,13.018C12.327,12.667 12.74,12.294 13.133,11.9ZM8.294,6.516C8.095,6.516 7.951,6.559 7.871,6.638C7.585,6.925 7.774,8.055 8.745,9.571C9.051,9.206 9.379,8.847 9.729,8.497C10.079,8.147 10.438,7.818 10.801,7.512C9.707,6.81 8.813,6.516 8.294,6.516ZM8.743,11.753C7.774,13.267 7.585,14.398 7.871,14.684C8.158,14.97 9.288,14.782 10.8,13.81C10.437,13.505 10.078,13.175 9.728,12.825C9.378,12.476 9.049,12.116 8.743,11.753ZM12.987,13.812C14.501,14.782 15.631,14.97 15.918,14.684C16.204,14.398 16.015,13.267 15.043,11.756C14.738,12.119 14.408,12.478 14.059,12.828C13.709,13.177 13.35,13.507 12.987,13.812ZM12.62,11.146C12.715,11.002 12.767,10.834 12.767,10.661C12.767,10.43 12.675,10.208 12.511,10.045C12.347,9.881 12.126,9.789 11.894,9.789C11.722,9.789 11.553,9.84 11.41,9.936C11.267,10.032 11.155,10.168 11.089,10.328C11.023,10.487 11.006,10.662 11.039,10.831C11.073,11 11.156,11.156 11.278,11.278C11.4,11.4 11.555,11.483 11.724,11.517C11.894,11.55 12.069,11.533 12.228,11.467C12.387,11.401 12.524,11.289 12.62,11.146Z"
-      android:fillColor="#4AA8FF"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/screencast.xml b/app/src/main/res/drawable/screencast.xml
deleted file mode 100644
index 03c3f515b..000000000
--- a/app/src/main/res/drawable/screencast.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M232,56L232,200a16,16 0,0 1,-16 16L144,216a8,8 0,0 1,0 -16h72L216,56L40,56L40,96a8,8 0,0 1,-16 0L24,56A16,16 0,0 1,40 40L216,40A16,16 0,0 1,232 56ZM32,184a8,8 0,0 0,0 16,8 8,0 0,1 8,8 8,8 0,0 0,16 0A24,24 0,0 0,32 184ZM32,152a8,8 0,0 0,0 16,40 40,0 0,1 40,40 8,8 0,0 0,16 0A56.06,56.06 0,0 0,32 152ZM32,120a8,8 0,0 0,0 16,72.08 72.08,0 0,1 72,72 8,8 0,0 0,16 0A88.1,88.1 0,0 0,32 120Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/shape_line_main2_200.xml b/app/src/main/res/drawable/shape_line_main2_200.xml
deleted file mode 100644
index f2349378f..000000000
--- a/app/src/main/res/drawable/shape_line_main2_200.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="line">
-    <stroke android:width="1dp" android:color="?attr/color_main2_200"/>
-    <size android:height="1dp" android:width="50dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
deleted file mode 100644
index 68dd4325a..000000000
--- a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="20dp" />
-    <solid android:color="@color/gray_900"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/wifi_high.xml b/app/src/main/res/drawable/wifi_high.xml
deleted file mode 100644
index f5f9f6c77..000000000
--- a/app/src/main/res/drawable/wifi_high.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="96dp"
-    android:height="96dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M140,204a12,12 0,1 1,-12 -12A12,12 0,0 1,140 204ZM237.08,87A172,172 0,0 0,18.92 87,8 8,0 0,0 29.08,99.37a156,156 0,0 1,197.84 0A8,8 0,0 0,237.08 87ZM205,122.77a124,124 0,0 0,-153.94 0A8,8 0,0 0,61 135.31a108,108 0,0 1,134.06 0,8 8,0 0,0 11.24,-1.3A8,8 0,0 0,205 122.77ZM172.74,158.53a76.05,76.05 0,0 0,-89.42 0,8 8,0 0,0 9.42,12.94 60,60 0,0 1,70.58 0,8 8,0 1,0 9.42,-12.94Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/wifi_low.xml b/app/src/main/res/drawable/wifi_low.xml
deleted file mode 100644
index 6717b505a..000000000
--- a/app/src/main/res/drawable/wifi_low.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="96dp"
-    android:height="96dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M140,204a12,12 0,1 1,-12 -12A12,12 0,0 1,140 204ZM172.71,158.53a76.05,76.05 0,0 0,-89.42 0,8 8,0 0,0 9.42,12.94 60,60 0,0 1,70.58 0,8 8,0 1,0 9.42,-12.94Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/layout/assistant_single_sign_on_activity.xml b/app/src/main/res/layout/assistant_single_sign_on_activity.xml
deleted file mode 100644
index 3a61d8b79..000000000
--- a/app/src/main/res/layout/assistant_single_sign_on_activity.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-        <import type="android.view.View" />
-        <variable
-            name="viewModel"
-            type="org.linphone.ui.main.sso.viewmodel.SingleSignOnViewModel" />
-    </data>
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/color_main2_000">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/back"
-                android:layout_width="@dimen/top_bar_height"
-                android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
-                android:src="@drawable/caret_left"
-                android:visibility="invisible"
-                android:contentDescription="@string/content_description_go_back_icon"
-                app:tint="?attr/color_main2_500"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"/>
-
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="@color/main1_500"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/assistant_page_title_style"
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:paddingBottom="27dp"
-                android:text="@string/assistant_login_using_single_sign_on"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
-
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/progress"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                app:indicatorColor="?attr/color_main1_500"
-                android:indeterminate="true"
-                app:layout_constraintVertical_chainStyle="packed"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/message"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style_800"
-                android:id="@+id/message"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/operation_in_progress_overlay"
-                android:textColor="?attr/color_main1_500"
-                android:textSize="18sp"
-                android:layout_below="@id/progress"
-                android:layout_centerHorizontal="true"
-                app:layout_constraintTop_toBottomOf="@id/progress"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <LinearLayout
-            android:id="@+id/toasts_area"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="@dimen/toast_top_margin"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            app:layout_constraintWidth_max="@dimen/toast_max_width"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_media_viewer_fragment.xml b/app/src/main/res/layout/file_media_viewer_fragment.xml
index c45ce9855..f9def31a3 100644
--- a/app/src/main/res/layout/file_media_viewer_fragment.xml
+++ b/app/src/main/res/layout/file_media_viewer_fragment.xml
@@ -53,7 +53,6 @@
             android:background="?attr/color_main2_000"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
-            android:text=""
             android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
             app:layout_constraintEnd_toStartOf="@id/share"
             app:layout_constraintStart_toEndOf="@id/back"
@@ -99,7 +98,7 @@
             android:paddingBottom="16dp"
             android:text="@{viewModel.currentlyDisplayedFileName, default=`nomdufichier.jpg\nenvoyé le 02/05/2023 à 11h05`}"
             android:textSize="12sp"
-            android:textColor="?attr/color_main2_400"
+            android:textColor="?attr/color_main2_600"
             android:textAlignment="center"
             android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/file_viewer_fragment.xml b/app/src/main/res/layout/file_viewer_fragment.xml
index d02444b99..ec1e92324 100644
--- a/app/src/main/res/layout/file_viewer_fragment.xml
+++ b/app/src/main/res/layout/file_viewer_fragment.xml
@@ -139,7 +139,7 @@
             android:paddingBottom="16dp"
             android:text="@{viewModel.fileName, default=`nomdufichier.jpg\nenvoyé le 02/05/2023 à 11h05`}"
             android:textSize="12sp"
-            android:textColor="?attr/color_main2_400"
+            android:textColor="?attr/color_main2_600"
             android:textAlignment="center"
             android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index 75401f4f2..280cd4837 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -168,7 +168,7 @@
                 android:layout_marginEnd="16dp"
                 android:text="@{viewModel.appVersion, default=`6.0.0 (master)`}"
                 android:textSize="14sp"
-                android:textColor="@color/gray_main2_600"
+                android:textColor="?attr/color_main2_600"
                 app:layout_constraintTop_toBottomOf="@id/app_version_title"
                 app:layout_constraintStart_toEndOf="@id/app_version_icon"
                 app:layout_constraintEnd_toEndOf="parent" />
@@ -207,7 +207,7 @@
                 android:layout_marginEnd="16dp"
                 android:text="@{viewModel.sdkVersion, default=`5.4.0 (master)`}"
                 android:textSize="14sp"
-                android:textColor="@color/gray_main2_600"
+                android:textColor="?attr/color_main2_600"
                 app:layout_constraintTop_toBottomOf="@id/sdk_version_title"
                 app:layout_constraintStart_toEndOf="@id/sdk_version_icon"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/meeting_list_today_indicator.xml b/app/src/main/res/layout/meeting_list_today_indicator.xml
index 09d8a05e2..8a10c8452 100644
--- a/app/src/main/res/layout/meeting_list_today_indicator.xml
+++ b/app/src/main/res/layout/meeting_list_today_indicator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
+<layout xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -87,7 +87,8 @@
             app:layout_constraintStart_toEndOf="@id/header_day"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/header_day_number"
-            app:layout_constraintBottom_toBottomOf="@id/header_day_number"/>
+            app:layout_constraintBottom_toBottomOf="@id/header_day_number"
+            tools:ignore="RtlSymmetry" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml b/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml
index 1b6360491..9ca7274f2 100644
--- a/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml
+++ b/app/src/main/res/layout/settings_contacts_carddav_ldap_list_cell.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:bind="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <import type="android.view.View" />
diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml
index 0671a5f7e..26b2790d3 100644
--- a/app/src/main/res/layout/toast.xml
+++ b/app/src/main/res/layout/toast.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
+<layout xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -90,7 +90,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/toast_icon"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5a4e6111e..cdbe929ff 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -16,7 +16,6 @@
     <string name="or">ou</string>
     <string name="next">suivant</string>
     <string name="start">Commencer</string>
-    <string name="required">Requis</string>
     <string name="today">Aujourd\'hui</string>
     <string name="yesterday">Hier</string>
 
@@ -110,7 +109,6 @@
     <string name="toast_call_error_user_busy">L\'utilisateur est occupé</string>
     <string name="toast_call_error_user_not_found">L\'utilisateur n\'a pu être trouvé</string>
     <string name="toast_call_error_incompatible_media_params">Paramètres media incompatibles</string>
-    <string name="toast_call_error_network_unreachable">Le réseau n\'est pas joignable</string>
     <string name="toast_call_error_io_error">Service indisponible ou erreur réseau</string>
     <string name="toast_call_error_server_timeout">Délai d\'attente du serveur dépassé</string>
     <string name="toast_call_error_temporarily_unavailable">Temporairement indisponible</string>
@@ -196,8 +194,6 @@
     <string name="help_error_checking_version_toast_message">Une erreur est survenue</string>
     <string name="help_dialog_update_available_title">Mise à jour disponible</string>
     <string name="help_dialog_update_available_message">Une nouvelle version %s est disponible. Voulez-vous mettre à jour ?</string>
-    <string name="help_clear_cache_directory">Vider le dossier de cache</string>
-    <string name="help_cache_directory_cleared_toast_message">Cache directory has been cleared</string>
     <string name="help_troubleshooting_title">Dépannage</string>
     <string name="help_troubleshooting_debug_title">Activer/désactiver les messages dans ADB</string>
     <string name="help_troubleshooting_debug_subtitle">Blah blah blah?</string> <!-- TODO -->
@@ -221,10 +217,6 @@
     <string name="settings_calls_route_audio_to_bluetooth_title">Utiliser le périphérique Bluetooth si possible</string>
     <string name="settings_calls_enable_video_title">Activer la vidéo</string>
     <string name="settings_calls_enable_fec_title">Activer la FEC vidéo</string>
-    <string name="settings_calls_ringtones_title">Choisissez votre sonnerie :</string>
-    <string name="settings_calls_use_device_ringtone_label">Utiliser la sonnerie du système</string>
-    <string name="settings_calls_play_ringtone_label">Lire</string>
-    <string name="settings_calls_pause_ringtone_label">Pause</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibrer lors de la réception d\'un appel</string>
     <string name="settings_calls_auto_record_title">Démarrer l\'enregistrement des appels automatiquement</string>
     <string name="settings_conversations_title">Conversations</string>
@@ -241,7 +233,6 @@
     <string name="settings_contacts_carddav_username_title">Nom d\'utilisateur</string>
     <string name="settings_contacts_carddav_password_title">Mot de passe</string>
     <string name="settings_contacts_carddav_realm_title">Domaine d\'authentification</string>
-    <string name="settings_contacts_carddav_add_title">Ajouter le carnet d\'adresse</string>
     <string name="settings_contacts_ldap_server_url_title">URL du serveur</string>
     <string name="settings_contacts_ldap_bind_dn_title">Bind DN</string>
     <string name="settings_contacts_ldap_password_title">Mot de passe</string>
@@ -356,7 +347,6 @@
     <string name="contact_editor_error_saving_changes_toast">Erreur lors de la sauvegarde des changements</string>
     <string name="contact_editor_saved_contact_toast">Le contact a été créé</string>
     <string name="contact_editor_error_saving_contact_toast">Erreur lors de la création du contact</string>
-    <string name="contact_editor_save_title">Sauvegarder</string>
     <string name="contact_editor_dialog_abort_confirmation_title">Ne pas sauvegarder vos changements</string>
     <string name="contact_editor_dialog_abort_confirmation_message">Toutes vos modifications seront perdues.</string>
 
@@ -419,7 +409,6 @@
     <string name="new_conversation_create_group">Créer une conversation de groupe</string>
     <string name="new_conversation_no_contact">Aucun contact ni suggestion pour le moment…</string>
     <string name="new_conversation_no_matching_contact">Aucun résultat trouvé…</string>
-    <string name="new_conversation_group_name_title">Nom du groupe</string>
     <string name="conversation_text_field_hint">Dites quelque chose…</string>
     <plurals name="conversation_composing_label" tools:ignore="MissingQuantity">
         <item quantity="one">%s est en train d\'écrire…</item>
@@ -485,7 +474,6 @@
 
     <!-- Scheduled conferences -->
     <string name="meetings_list_empty">Aucune réunion pour le moment…</string>
-    <string name="meetings_list_today_indicator">Aujourd\'hui</string>
     <string name="meetings_list_no_meeting_for_today">Aucune réunion aujourd\'hui</string>
 
     <string name="meeting_schedule_title">Nouvelle réunion</string>
@@ -511,7 +499,6 @@
     <string name="meeting_info_export_as_calendar_event">Ajouter un évènement dans le calendrier</string>
     <string name="meeting_info_deleted_toast">La réunion a été supprimée</string>
     <string name="meeting_schedule_description_title">Description</string>
-    <string name="meeting_schedule_create_title">Créer</string>
     <string name="meeting_schedule_edit_title">Modifier la réunion</string>
     <string name="meeting_schedule_cancel_dialog_title">Annuler la réunion?</string>
     <string name="meeting_schedule_cancel_dialog_message">Voulez-vous annuler la réunion et envoyer une notification aux participants?</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dc3a26941..1c15fab01 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,35 +13,24 @@
     <color name="orange_main_900">#662600</color>
 
     <color name="gray_main2_100">#EEF6F8</color>
-    <color name="gray_main2_100_night">#191919</color>
     <color name="gray_main2_200">#DFECF2</color>
-    <color name="gray_main2_200_night">#142932</color>
     <color name="gray_main2_300">#C0D1D9</color>
-    <color name="gray_main2_300_night">#30454F</color>
     <color name="gray_main2_400">#9AABB5</color>
-    <color name="gray_main2_400_night">#4E6074</color>
     <color name="gray_main2_500">#6C7A87</color>
     <color name="gray_main2_600">#4E6074</color>
-    <color name="gray_main2_600_night">#9AABB5</color>
     <color name="gray_main2_700">#364860</color>
-    <color name="gray_main2_700_night">#C0D1D9</color>
     <color name="gray_main2_800">#22334D</color>
-    <color name="gray_main2_800_night">#2A3F5F</color>
 
     <color name="gray_100">#F9F9F9</color>
-    <color name="gray_100_night">#131313</color>
     <color name="gray_200">#EDEDED</color>
     <color name="gray_200_night">#1F1F1F</color>
     <color name="gray_300">#C9C9C9</color>
     <color name="gray_400">#949494</color>
     <color name="gray_500">#4E4E4E</color>
     <color name="gray_600">#2E3030</color>
-    <color name="gray_600_night">#CFD1D1</color>
     <color name="gray_700">#383939</color>
     <color name="gray_800">#0F0F0F</color>
-    <color name="gray_800_night">#E7D2D8</color>
     <color name="gray_900">#070707</color>
-    <color name="gray_900_night">#FFFFFF</color>
 
     <color name="red_danger_500">#DD5F5F</color>
     <color name="red_danger_500_night">#E17474</color>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index ff69e0685..93a8df39e 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -18,7 +18,6 @@
     <dimen name="avatar_favorite_list_cell_size">50dp</dimen>
     <dimen name="avatar_big_size">100dp</dimen>
     <dimen name="avatar_in_call_size">120dp</dimen>
-    <dimen name="avatar_in_active_speaker_miniature_conference_call_size">50dp</dimen>
 
     <dimen name="avatar_bubble_presence_badge_size">8dp</dimen>
     <dimen name="avatar_presence_badge_size">12dp</dimen>
@@ -29,7 +28,6 @@
     <dimen name="avatar_presence_badge_big_padding">3dp</dimen>
     <dimen name="avatar_presence_badge_big_end_margin">5dp</dimen>
     <dimen name="avatar_presence_badge_in_call_end_margin">6dp</dimen>
-    <dimen name="avatar_presence_badge_in_active_speaker_miniature_conference_call_size">14dp</dimen>
 
     <dimen name="avatar_trust_border_width">5dp</dimen>
     <dimen name="avatar_large_trust_border_width">3dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ef50995c..11708589e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,7 +51,6 @@
     <string name="or">or</string>
     <string name="next">next</string>
     <string name="start">Start</string>
-    <string name="required">Required</string>
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>
 
@@ -145,7 +144,6 @@
     <string name="toast_call_error_user_busy">User is busy</string>
     <string name="toast_call_error_user_not_found">User has not been found</string>
     <string name="toast_call_error_incompatible_media_params">Incompatible media parameters</string>
-    <string name="toast_call_error_network_unreachable">Network is unreachable</string>
     <string name="toast_call_error_io_error">Service unavailable or network error</string>
     <string name="toast_call_error_server_timeout">Server timeout</string>
     <string name="toast_call_error_temporarily_unavailable">Temporarily unavailable</string>
@@ -231,8 +229,6 @@
     <string name="help_error_checking_version_toast_message">An error occurred while checking for update</string>
     <string name="help_dialog_update_available_title">Update available</string>
     <string name="help_dialog_update_available_message">A new version %s is available. Do you want to update?</string>
-    <string name="help_clear_cache_directory">Clear cache directory</string>
-    <string name="help_cache_directory_cleared_toast_message">Cache directory has been cleared</string>
     <string name="help_troubleshooting_title">Troubleshooting</string>
     <string name="help_troubleshooting_debug_title">Enable/disable printing logs in ADB</string>
     <string name="help_troubleshooting_debug_subtitle">Blah blah blah?</string> <!-- TODO -->
@@ -256,10 +252,6 @@
     <string name="settings_calls_route_audio_to_bluetooth_title">Route audio to bluetooth device, if any</string>
     <string name="settings_calls_enable_video_title">Enable video</string>
     <string name="settings_calls_enable_fec_title">Enable video FEC</string>
-    <string name="settings_calls_ringtones_title">Choose your ringtone:</string>
-    <string name="settings_calls_use_device_ringtone_label">Use this device\'s ringtone</string>
-    <string name="settings_calls_play_ringtone_label">Play</string>
-    <string name="settings_calls_pause_ringtone_label">Pause</string>
     <string name="settings_calls_vibrate_while_ringing_title">Vibrate while incoming call is ringing</string>
     <string name="settings_calls_auto_record_title">Automatically start recording calls</string>
     <string name="settings_conversations_title">Conversations</string>
@@ -276,7 +268,6 @@
     <string name="settings_contacts_carddav_username_title">Username</string>
     <string name="settings_contacts_carddav_password_title">Password</string>
     <string name="settings_contacts_carddav_realm_title">Auth realm</string>
-    <string name="settings_contacts_carddav_add_title">Add address book</string>
     <string name="settings_contacts_ldap_server_url_title">Server URL</string>
     <string name="settings_contacts_ldap_bind_dn_title">Bind DN</string>
     <string name="settings_contacts_ldap_password_title">Password</string>
@@ -392,7 +383,6 @@
     <string name="contact_editor_error_saving_changes_toast">Failed to save changes!</string>
     <string name="contact_editor_saved_contact_toast">Contact was successfully created</string>
     <string name="contact_editor_error_saving_contact_toast">Failed to create contact!</string>
-    <string name="contact_editor_save_title">Save</string>
     <string name="contact_editor_dialog_abort_confirmation_title">Don\'t save changes?</string>
     <string name="contact_editor_dialog_abort_confirmation_message">All changes will be lost</string>
 
@@ -455,7 +445,6 @@
     <string name="new_conversation_create_group">Create a group conversation</string>
     <string name="new_conversation_no_contact">No contact and no suggestion for the moment…</string>
     <string name="new_conversation_no_matching_contact">No matching result…</string>
-    <string name="new_conversation_group_name_title">Name of the group</string>
     <string name="conversation_text_field_hint">Say something…</string>
     <plurals name="conversation_composing_label">
         <item quantity="one">%s is composing…</item>
@@ -521,7 +510,6 @@
 
     <!-- Scheduled conferences -->
     <string name="meetings_list_empty">No meeting for the moment…</string>
-    <string name="meetings_list_today_indicator">Today</string>
     <string name="meetings_list_no_meeting_for_today">No meeting scheduled for today</string>
 
     <string name="meeting_schedule_title">New meeting</string>
@@ -547,7 +535,6 @@
     <string name="meeting_info_export_as_calendar_event">Create calendar event</string>
     <string name="meeting_info_deleted_toast">Meeting has been deleted</string>
     <string name="meeting_schedule_description_title">Description</string>
-    <string name="meeting_schedule_create_title">Create</string>
     <string name="meeting_schedule_edit_title">Edit meeting</string>
     <string name="meeting_schedule_cancel_dialog_title">Cancel the meeting?</string>
     <string name="meeting_schedule_cancel_dialog_message">Do you want to cancel the meeting and send a notification to all participants?</string>