From ff3762007e7de25b515dc6da422a16331059da2d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 4 May 2022 17:06:00 +0200
Subject: [PATCH] Started conference call incoming layout

---
 .../java/org/linphone/core/BootReceiver.kt    |   1 -
 .../res/drawable-xhdpi/voip_conference.png    | Bin 0 -> 9289 bytes
 .../drawable-xhdpi/voip_conference_new.png    | Bin 6012 -> 0 bytes
 .../res/drawable/icon_video_conf_incoming.xml |   7 ++
 .../main/res/drawable/icon_video_conf_new.xml |   6 +-
 .../main/res/layout-land/dialer_fragment.xml  |   2 +-
 .../layout-sw533dp-land/dialer_fragment.xml   |   2 +-
 .../res/layout-sw600dp/dialer_fragment.xml    |   2 +-
 .../layout/voip_call_incoming_fragment.xml    | 117 +++++++++++++++++-
 .../layout/voip_call_outgoing_fragment.xml    |   2 +-
 ...p_conference_incoming_participant_cell.xml |  36 ++++++
 app/src/main/res/values-fr/strings.xml        |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   1 +
 14 files changed, 165 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/voip_conference.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/voip_conference_new.png
 create mode 100644 app/src/main/res/drawable/icon_video_conf_incoming.xml
 create mode 100644 app/src/main/res/layout/voip_conference_incoming_participant_cell.xml

diff --git a/app/src/main/java/org/linphone/core/BootReceiver.kt b/app/src/main/java/org/linphone/core/BootReceiver.kt
index dfd765237..951eacde0 100644
--- a/app/src/main/java/org/linphone/core/BootReceiver.kt
+++ b/app/src/main/java/org/linphone/core/BootReceiver.kt
@@ -23,7 +23,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationManagerCompat
-import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.compatibility.Compatibility
diff --git a/app/src/main/res/drawable-xhdpi/voip_conference.png b/app/src/main/res/drawable-xhdpi/voip_conference.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2bbc39e68e7681c206a8e611d1f00ec1dfe8d80
GIT binary patch
literal 9289
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/voip_conference_new.png b/app/src/main/res/drawable-xhdpi/voip_conference_new.png
deleted file mode 100644
index 8985782ae0c13fe80f7c6d962f371cad54abf43a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6012
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
Y#82$0!cXia|B1HH`-WhZro)T>0Sn}_EdT%j

diff --git a/app/src/main/res/drawable/icon_video_conf_incoming.xml b/app/src/main/res/drawable/icon_video_conf_incoming.xml
new file mode 100644
index 000000000..57bca35d7
--- /dev/null
+++ b/app/src/main/res/drawable/icon_video_conf_incoming.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/voip_conference"
+            android:tint="@color/white_color"/>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/icon_video_conf_new.xml b/app/src/main/res/drawable/icon_video_conf_new.xml
index 39e2d1ed3..2c1dd4e58 100644
--- a/app/src/main/res/drawable/icon_video_conf_new.xml
+++ b/app/src/main/res/drawable/icon_video_conf_new.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
-        <bitmap android:src="@drawable/voip_conference_new"
+        <bitmap android:src="@drawable/voip_conference"
             android:tint="?attr/drawableTintOverColor"/>
     </item>
     <item android:state_enabled="false">
-        <bitmap android:src="@drawable/voip_conference_new"
+        <bitmap android:src="@drawable/voip_conference"
             android:tint="?attr/drawableTintDisabledColor"/>
     </item>
     <item>
-        <bitmap android:src="@drawable/voip_conference_new"
+        <bitmap android:src="@drawable/voip_conference"
             android:tint="?attr/drawableTintColor"/>
     </item>
 </selector>
diff --git a/app/src/main/res/layout-land/dialer_fragment.xml b/app/src/main/res/layout-land/dialer_fragment.xml
index 72fdf98c6..9a5e220e7 100644
--- a/app/src/main/res/layout-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-land/dialer_fragment.xml
@@ -77,7 +77,7 @@
                 android:layout_weight="2"
                 android:background="?attr/button_background_drawable"
                 android:padding="5dp"
-                android:src="@drawable/voip_conference_new" />
+                android:src="@drawable/icon_video_conf_new" />
 
             <ImageView
                 android:onClick="@{newContactClickListener}"
diff --git a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
index ff087e489..84daa7270 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
@@ -118,7 +118,7 @@
                     android:layout_weight="2"
                     android:background="?attr/button_background_drawable"
                     android:padding="5dp"
-                    android:src="@drawable/voip_conference_new" />
+                    android:src="@drawable/icon_video_conf_new" />
 
                 <ImageView
                     android:onClick="@{newContactClickListener}"
diff --git a/app/src/main/res/layout-sw600dp/dialer_fragment.xml b/app/src/main/res/layout-sw600dp/dialer_fragment.xml
index 532ac078b..8a0f7e4cb 100644
--- a/app/src/main/res/layout-sw600dp/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/dialer_fragment.xml
@@ -118,7 +118,7 @@
                     android:layout_weight="2"
                     android:background="?attr/button_background_drawable"
                     android:padding="5dp"
-                    android:src="@drawable/voip_conference_new" />
+                    android:src="@drawable/icon_video_conf_new" />
 
                 <ImageView
                     android:onClick="@{newContactClickListener}"
diff --git a/app/src/main/res/layout/voip_call_incoming_fragment.xml b/app/src/main/res/layout/voip_call_incoming_fragment.xml
index e7419afb0..43321583a 100644
--- a/app/src/main/res/layout/voip_call_incoming_fragment.xml
+++ b/app/src/main/res/layout/voip_call_incoming_fragment.xml
@@ -29,7 +29,7 @@
             android:id="@+id/progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             android:indeterminate="true"
             android:indeterminateDrawable="@drawable/icon_spinner_rotating"
             app:layout_constraintEnd_toEndOf="parent"
@@ -42,7 +42,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="@string/call_incoming_title"
+            android:text="@{callsViewModel.currentCallData.remoteConferenceSubject.length > 0 ? @string/conference_incoming_title : @string/call_incoming_title, default=@string/call_incoming_title}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/progress" />
@@ -57,13 +57,24 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/incoming_call_title" />
 
+        <TextView
+            android:id="@+id/incoming_conference_subject"
+            style="@style/call_header_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:text="@{callsViewModel.currentCallData.remoteConferenceSubject, default=`Conference subject`}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/incoming_call_title" />
+
         <ImageView
             android:id="@+id/avatar"
+            coilVoipContactAlt="@{callsViewModel.currentCallData}"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_margin="10dp"
             android:contentDescription="@null"
-            coilVoipContactAlt="@{callsViewModel.currentCallData}"
             app:layout_constraintBottom_toTopOf="@id/caller_name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHeight_max="@dimen/voip_contact_avatar_max_size"
@@ -81,13 +92,13 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:text="@{callsViewModel.currentCallData.contact.name ?? callsViewModel.currentCallData.displayName, default=`Bilbo Baggins`}"
-            app:layout_constraintBottom_toTopOf="@id/textView"
+            app:layout_constraintBottom_toTopOf="@id/sipAddress"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/avatar" />
 
         <TextView
-            android:id="@+id/textView"
+            android:id="@+id/sipAddress"
             style="@style/call_header_subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -101,6 +112,102 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/caller_name" />
 
+        <ImageView
+            android:id="@+id/conference_avatar"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/icon_video_conf_incoming"
+            app:layout_constraintBottom_toTopOf="@id/participants_count"
+            app:layout_constraintHeight_max="120dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/incoming_conference_subject" />
+
+        <LinearLayout
+            android:id="@+id/participants_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/event_decoration_gray"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toTopOf="@id/participants_list"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                style="@style/call_header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/voipBackgroundColor"
+                android:lineSpacingExtra="0sp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="Participants (6)" /><!-- TODO -->
+
+        </LinearLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/participants_list"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="10dp"
+            android:fadeScrollbars="false"
+            android:scrollbars="vertical"
+            app:layout_constraintBottom_toTopOf="@id/buttons"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="400dp"
+            app:layout_constraintHeight_min="200dp"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+
+                <include layout="@layout/voip_conference_incoming_participant_cell" />
+                <!-- TODO -->
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/single_call_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="@{callsViewModel.currentCallData.remoteConferenceSubject.length > 0 ? View.GONE : View.VISIBLE, default=visible}"
+            app:constraint_referenced_ids="incoming_call_timer, avatar, caller_name, sipAddress" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/conference_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="@{callsViewModel.currentCallData.remoteConferenceSubject.length > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            app:constraint_referenced_ids="incoming_conference_subject, conference_avatar, participants_count, participants_list" />
+
         <include
             android:id="@+id/buttons"
             layout="@layout/voip_buttons_incoming"
diff --git a/app/src/main/res/layout/voip_call_outgoing_fragment.xml b/app/src/main/res/layout/voip_call_outgoing_fragment.xml
index 838348d47..a030b9339 100644
--- a/app/src/main/res/layout/voip_call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/voip_call_outgoing_fragment.xml
@@ -24,7 +24,7 @@
             android:id="@+id/progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             android:indeterminate="true"
             android:indeterminateDrawable="@drawable/icon_spinner_rotating"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/voip_conference_incoming_participant_cell.xml b/app/src/main/res/layout/voip_conference_incoming_participant_cell.xml
new file mode 100644
index 000000000..52374bb7d
--- /dev/null
+++ b/app/src/main/res/layout/voip_conference_incoming_participant_cell.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+        <import type="android.view.View"/>
+        <variable
+            name="data"
+            type="org.linphone.activities.voip.data.ConferenceParticipantData" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_margin="5dp"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <org.linphone.views.MarqueeTextView
+            style="@style/call_header_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="Bilbo Baggins" />
+
+        <org.linphone.views.MarqueeTextView
+            style="@style/sip_uri_font"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:text="sip:bilbo.baggins@sip.linphone.org" />
+
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3640d9d30..4ec1e05f6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -718,4 +718,5 @@
     <string name="content_description_conference_participants">Participants de la conférence</string>
     <string name="conference_first_to_join">Vous êtes le premier à avoir rejoint la conférence</string>
     <string name="conference_last_user">Tous les autres participants ont quitté la conférence</string>
+    <string name="conference_incoming_title">Appel de conférence entrant</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b82118e2..01be1e555 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,6 +290,7 @@
     <string name="conference_low_bandwidth">Low bandwidth detected, disabling video</string>
     <string name="conference_first_to_join">You\'re the first to join the conference</string>
     <string name="conference_last_user">All other participants have left the conference</string>
+    <string name="conference_incoming_title">Incoming conference call</string>
 
     <!-- Call -->
     <string name="call_incoming_title">Incoming Call</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9c512908e..391b58547 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
         <item name="android:windowBackground">@color/transparent_color</item>
 
         <!-- Android theme override -->
+        <item name="android:scrollbarThumbVertical">@color/light_grey_color</item>
         <item name="colorAccent">@color/primary_color</item>
         <item name="colorPrimary">@color/primary_color</item>
         <item name="android:colorPrimary">@color/primary_color</item>