From 6856a399c59f1012d43b60fbd8a504eb33794240 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 25 Apr 2024 10:08:32 +0200 Subject: [PATCH] Updated meeting icon, now using video_conference from phosphoricons --- .../linphone/notifications/NotificationsManager.kt | 2 +- .../java/org/linphone/utils/DataBindingUtils.kt | 4 ++-- ...nset_meeting.xml => inset_video_conference.xml} | 2 +- app/src/main/res/drawable/meeting.xml | 14 -------------- app/src/main/res/layout-land/bottom_nav_bar.xml | 2 +- app/src/main/res/layout/bottom_nav_bar.xml | 2 +- .../layout/chat_bubble_meeting_invite_content.xml | 2 +- app/src/main/res/layout/chat_info_fragment.xml | 2 +- app/src/main/res/layout/history_fragment.xml | 2 +- app/src/main/res/layout/meeting_edit_fragment.xml | 2 +- app/src/main/res/layout/meeting_fragment.xml | 2 +- app/src/main/res/layout/meeting_list_cell.xml | 2 +- .../main/res/layout/meeting_schedule_fragment.xml | 6 +++--- app/src/main/res/layout/start_call_fragment.xml | 2 +- 14 files changed, 16 insertions(+), 30 deletions(-) rename app/src/main/res/drawable/{inset_meeting.xml => inset_video_conference.xml} (69%) delete mode 100644 app/src/main/res/drawable/meeting.xml diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index a04c43097..44c352885 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/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 { diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index faa464e30..673da9069 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/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 { diff --git a/app/src/main/res/drawable/inset_meeting.xml b/app/src/main/res/drawable/inset_video_conference.xml similarity index 69% rename from app/src/main/res/drawable/inset_meeting.xml rename to app/src/main/res/drawable/inset_video_conference.xml index e25a01e75..df4723683 100644 --- a/app/src/main/res/drawable/inset_meeting.xml +++ b/app/src/main/res/drawable/inset_video_conference.xml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/meeting.xml b/app/src/main/res/drawable/meeting.xml deleted file mode 100644 index 86feb8bd6..000000000 --- a/app/src/main/res/drawable/meeting.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 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 c36ed3258..725e2a9bf 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/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" diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index 81d99546d..544964fc5 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/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" diff --git a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml index c57eb590f..264496ffa 100644 --- a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml +++ b/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" diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index 8658de125..8e0f8b8e7 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/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" diff --git a/app/src/main/res/layout/history_fragment.xml b/app/src/main/res/layout/history_fragment.xml index 753a08cfd..a983fbefb 100644 --- a/app/src/main/res/layout/history_fragment.xml +++ b/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" diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml index 79a39c542..1c42c81b8 100644 --- a/app/src/main/res/layout/meeting_edit_fragment.xml +++ b/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" diff --git a/app/src/main/res/layout/meeting_fragment.xml b/app/src/main/res/layout/meeting_fragment.xml index eb9dced55..6733ce486 100644 --- a/app/src/main/res/layout/meeting_fragment.xml +++ b/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" diff --git a/app/src/main/res/layout/meeting_list_cell.xml b/app/src/main/res/layout/meeting_list_cell.xml index 21998c98f..f625def5b 100644 --- a/app/src/main/res/layout/meeting_list_cell.xml +++ b/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" diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml index 9eba30080..4713db374 100644 --- a/app/src/main/res/layout/meeting_schedule_fragment.xml +++ b/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" diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml index b74545ef5..0849a6c95 100644 --- a/app/src/main/res/layout/start_call_fragment.xml +++ b/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" />