Updated meeting icon, now using video_conference from phosphoricons

app/src/main/java/org/linphone/notifications/NotificationsManager.kt

@@ -953,7 +953,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
         }
 
         val smallIcon = if (isConference) {
-            R.drawable.meeting
+            R.drawable.video_conference
         } else if (isVideo) {
             R.drawable.video_camera
         } else {

app/src/main/java/org/linphone/utils/DataBindingUtils.kt

@@ -386,7 +386,7 @@ private fun loadContactPictureWithCoil(
     val context = imageView.context
     if (model != null) {
         if (model.forceConferenceIcon.value == true) {
-            imageView.load(R.drawable.inset_meeting)
+            imageView.load(R.drawable.inset_video_conference)
             return
         } else if (model.forceConversationIcon.value == true) {
             imageView.load(R.drawable.inset_users_three)
@@ -437,7 +437,7 @@ private fun getErrorImageLoader(
     val initials = model.initials.value.orEmpty()
     return if (initials.isEmpty() || initials == "+" || model.skipInitials.value == true) {
         if (model.defaultToConferenceIcon.value == true) {
-            R.drawable.inset_meeting
+            R.drawable.inset_video_conference
         } else if (model.defaultToConversationIcon.value == true) {
             R.drawable.inset_users_three
         } else {

app/src/main/res/drawable/inset_video_conference.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/meeting"
+    android:drawable="@drawable/video_conference"
     android:inset="8dp">
 </inset>

app/src/main/res/drawable/meeting.xml

@@ -1,14 +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="M2,3.75L22,3.75A1.25,1.25 0,0 1,23.25 5L23.25,19.462A1.25,1.25 0,0 1,22 20.712L2,20.712A1.25,1.25 0,0 1,0.75 19.462L0.75,5A1.25,1.25 0,0 1,2 3.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#4E6074"/>
-  <path
-      android:pathData="M19.299,13.199C19.246,13.238 19.186,13.267 19.123,13.283C19.059,13.299 18.993,13.303 18.928,13.294C18.863,13.284 18.8,13.262 18.744,13.229C18.687,13.196 18.638,13.151 18.599,13.099C18.297,12.694 17.905,12.365 17.454,12.139C17.002,11.913 16.504,11.797 15.999,11.799C15.901,11.799 15.804,11.77 15.722,11.715C15.641,11.661 15.576,11.584 15.538,11.493C15.512,11.432 15.499,11.366 15.499,11.299C15.499,11.232 15.512,11.166 15.538,11.105C15.576,11.014 15.641,10.937 15.722,10.882C15.804,10.828 15.901,10.799 15.999,10.799C16.279,10.799 16.554,10.72 16.792,10.572C17.03,10.423 17.222,10.211 17.346,9.959C17.469,9.707 17.519,9.426 17.491,9.147C17.462,8.868 17.356,8.602 17.184,8.381C17.013,8.159 16.782,7.99 16.519,7.892C16.256,7.795 15.971,7.774 15.696,7.83C15.421,7.887 15.168,8.019 14.965,8.213C14.762,8.406 14.617,8.653 14.547,8.924C14.53,8.988 14.501,9.048 14.462,9.1C14.422,9.153 14.373,9.197 14.316,9.23C14.26,9.263 14.197,9.285 14.132,9.295C14.067,9.304 14.001,9.3 13.937,9.284C13.874,9.267 13.814,9.238 13.761,9.199C13.709,9.159 13.665,9.11 13.631,9.053C13.598,8.997 13.576,8.934 13.567,8.869C13.558,8.804 13.561,8.738 13.578,8.674C13.675,8.298 13.859,7.949 14.115,7.656C14.371,7.363 14.691,7.133 15.052,6.986C15.412,6.839 15.801,6.778 16.189,6.807C16.577,6.837 16.952,6.957 17.286,7.157C17.619,7.358 17.901,7.633 18.11,7.962C18.318,8.29 18.446,8.663 18.485,9.05C18.524,9.437 18.472,9.828 18.333,10.191C18.195,10.555 17.973,10.881 17.686,11.143C18.366,11.438 18.957,11.905 19.4,12.498C19.44,12.551 19.468,12.611 19.485,12.675C19.501,12.738 19.504,12.804 19.495,12.87C19.485,12.935 19.463,12.997 19.429,13.054C19.396,13.11 19.351,13.16 19.299,13.199ZM15.931,17.048C15.968,17.105 15.992,17.169 16.003,17.235C16.014,17.302 16.011,17.37 15.995,17.435C15.979,17.501 15.95,17.563 15.91,17.616C15.869,17.67 15.818,17.716 15.76,17.749C15.701,17.783 15.637,17.805 15.57,17.813C15.503,17.821 15.435,17.815 15.37,17.797C15.305,17.778 15.245,17.746 15.193,17.704C15.141,17.661 15.098,17.608 15.066,17.548C14.752,17.015 14.303,16.573 13.765,16.266C13.227,15.959 12.619,15.797 11.999,15.797C11.38,15.797 10.771,15.959 10.233,16.266C9.696,16.573 9.247,17.015 8.932,17.548C8.901,17.608 8.858,17.661 8.806,17.704C8.754,17.746 8.693,17.778 8.628,17.797C8.564,17.815 8.496,17.821 8.429,17.813C8.362,17.805 8.297,17.783 8.239,17.749C8.181,17.716 8.13,17.67 8.089,17.616C8.049,17.563 8.02,17.501 8.004,17.435C7.988,17.37 7.985,17.302 7.996,17.235C8.007,17.169 8.031,17.105 8.067,17.048C8.552,16.215 9.291,15.56 10.176,15.179C9.678,14.797 9.312,14.27 9.13,13.67C8.947,13.07 8.957,12.428 9.158,11.834C9.36,11.24 9.742,10.724 10.252,10.359C10.761,9.994 11.372,9.797 11.999,9.797C12.626,9.797 13.238,9.994 13.747,10.359C14.257,10.724 14.639,11.24 14.84,11.834C15.042,12.428 15.052,13.07 14.869,13.67C14.687,14.27 14.321,14.797 13.823,15.179C14.708,15.56 15.447,16.215 15.931,17.048ZM11.999,14.799C12.395,14.799 12.781,14.681 13.11,14.462C13.439,14.242 13.696,13.929 13.847,13.564C13.998,13.199 14.038,12.797 13.961,12.409C13.884,12.021 13.693,11.664 13.413,11.385C13.134,11.105 12.777,10.915 12.389,10.837C12.002,10.76 11.599,10.8 11.234,10.951C10.869,11.103 10.556,11.359 10.337,11.688C10.117,12.017 10,12.403 10,12.799C10,13.329 10.21,13.838 10.585,14.213C10.96,14.588 11.469,14.799 11.999,14.799ZM8.5,11.299C8.5,11.166 8.447,11.039 8.353,10.945C8.26,10.852 8.132,10.799 8,10.799C7.719,10.799 7.444,10.72 7.206,10.572C6.968,10.423 6.777,10.211 6.653,9.959C6.53,9.707 6.479,9.426 6.508,9.147C6.536,8.868 6.642,8.602 6.814,8.381C6.986,8.159 7.217,7.99 7.48,7.892C7.743,7.795 8.028,7.774 8.303,7.83C8.577,7.887 8.831,8.019 9.034,8.213C9.237,8.406 9.382,8.653 9.452,8.924C9.485,9.053 9.568,9.163 9.682,9.23C9.797,9.297 9.933,9.317 10.061,9.284C10.19,9.25 10.3,9.168 10.367,9.053C10.435,8.939 10.454,8.803 10.421,8.674C10.323,8.298 10.139,7.949 9.884,7.656C9.628,7.363 9.307,7.133 8.947,6.986C8.587,6.839 8.198,6.778 7.81,6.807C7.422,6.837 7.046,6.957 6.713,7.157C6.379,7.358 6.097,7.633 5.889,7.962C5.681,8.29 5.552,8.663 5.513,9.05C5.474,9.437 5.526,9.828 5.665,10.191C5.804,10.555 6.026,10.881 6.312,11.143C5.633,11.438 5.043,11.905 4.6,12.498C4.521,12.604 4.486,12.738 4.505,12.869C4.524,13 4.594,13.119 4.7,13.198C4.806,13.278 4.939,13.312 5.071,13.294C5.202,13.275 5.32,13.205 5.4,13.099C5.701,12.694 6.094,12.365 6.545,12.139C6.997,11.913 7.495,11.797 8,11.799C8.132,11.799 8.26,11.746 8.353,11.653C8.447,11.559 8.5,11.432 8.5,11.299Z"
-      android:fillColor="#4E6074"/>
-</vector>

app/src/main/res/layout-land/bottom_nav_bar.xml

@@ -101,7 +101,7 @@
             android:onClick="@{() -> viewModel.navigateToMeetings()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/meeting"
+            android:drawableTop="@drawable/video_conference"
             android:drawablePadding="10dp"
             android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
             android:text="@string/bottom_navigation_meetings_label"

app/src/main/res/layout/bottom_nav_bar.xml

@@ -120,7 +120,7 @@
             android:layout_marginStart="18dp"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
-            android:drawableTop="@drawable/meeting"
+            android:drawableTop="@drawable/video_conference"
             android:drawablePadding="10dp"
             android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
             android:text="@string/bottom_navigation_meetings_label"

app/src/main/res/layout/chat_bubble_meeting_invite_content.xml

@@ -132,7 +132,7 @@
             android:textColor="?attr/color_main2_600"
             android:maxLines="1"
             android:ellipsize="end"
-            android:drawableStart="@drawable/meeting"
+            android:drawableStart="@drawable/video_conference"
             android:drawablePadding="8dp"
             app:drawableTint="?attr/color_main2_600"
             app:layout_constraintStart_toEndOf="@id/day_background"

app/src/main/res/layout/chat_info_fragment.xml

@@ -214,7 +214,7 @@
                     android:background="@drawable/circle_light_blue_button_background"
                     android:onClick="@{() -> viewModel.scheduleMeeting()}"
                     android:padding="16dp"
-                    android:src="@drawable/meeting"
+                    android:src="@drawable/video_conference"
                     android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/call"

app/src/main/res/layout/history_fragment.xml

@@ -241,7 +241,7 @@
                         android:layout_marginTop="20dp"
                         android:background="@drawable/circle_light_blue_button_background"
                         android:padding="16dp"
-                        android:src="@drawable/meeting"
+                        android:src="@drawable/video_conference"
                         android:visibility="@{viewModel.isConferenceCallLog ? View.VISIBLE : View.GONE, default=gone}"
                         app:tint="?attr/color_main2_500"
                         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/meeting_edit_fragment.xml

@@ -91,7 +91,7 @@
                         android:textSize="20sp"
                         android:textColor="?attr/color_main2_600"
                         android:inputType="text|textCapSentences"
-                        android:drawableStart="@{viewModel.isBroadcastSelected ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}"
+                        android:drawableStart="@{viewModel.isBroadcastSelected ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}"
                         android:drawablePadding="8dp"
                         android:drawableTint="?attr/color_main2_600"
                         android:background="@color/transparent_color"

app/src/main/res/layout/meeting_fragment.xml

@@ -116,7 +116,7 @@
                         android:textColor="?attr/color_main2_600"
                         android:maxLines="2"
                         android:ellipsize="end"
-                        android:drawableStart="@{viewModel.isBroadcast ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}"
+                        android:drawableStart="@{viewModel.isBroadcast ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}"
                         android:drawablePadding="8dp"
                         android:drawableTint="?attr/color_main2_600"
                         android:background="@color/transparent_color"

app/src/main/res/layout/meeting_list_cell.xml

@@ -93,7 +93,7 @@
                 android:textColor="?attr/color_main2_600"
                 android:maxLines="1"
                 android:ellipsize="end"
-                android:drawableStart="@{model.isBroadcast ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}"
+                android:drawableStart="@{model.isBroadcast ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}"
                 android:drawablePadding="8dp"
                 android:drawableTint="?attr/color_main2_600"
                 app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/meeting_schedule_fragment.xml

@@ -89,7 +89,7 @@
                         android:textColor="@color/primary_button_label_color"
                         android:textSize="16sp"
                         android:gravity="center"
-                        android:drawableStart="@drawable/meeting"
+                        android:drawableStart="@drawable/video_conference"
                         android:drawableTint="@color/primary_button_label_color"
                         android:drawablePadding="5dp"
                         android:background="@drawable/primary_button_background"
@@ -141,7 +141,7 @@
                         android:textColor="@color/secondary_button_label_color"
                         android:textSize="16sp"
                         android:gravity="center"
-                        android:drawableStart="@drawable/meeting"
+                        android:drawableStart="@drawable/video_conference"
                         android:drawableTint="@color/secondary_button_label_color"
                         android:drawablePadding="5dp"
                         android:background="@drawable/secondary_button_background"
@@ -229,7 +229,7 @@
                         android:textSize="20sp"
                         android:textColor="?attr/color_main2_600"
                         android:inputType="text|textCapSentences"
-                        android:drawableStart="@{viewModel.isBroadcastSelected ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}"
+                        android:drawableStart="@{viewModel.isBroadcastSelected ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}"
                         android:drawablePadding="8dp"
                         android:drawableTint="?attr/color_main2_600"
                         android:background="@color/transparent_color"

app/src/main/res/layout/start_call_fragment.xml

@@ -179,7 +179,7 @@
                 android:layout_marginTop="28dp"
                 android:background="@drawable/shape_orange_round"
                 android:padding="10dp"
-                android:src="@drawable/meeting"
+                android:src="@drawable/video_conference"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/search_bar"
                 app:tint="?attr/color_on_main" />