From 6c8216d360a2c9775d5c500895877fc3ae561d43 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 9 Aug 2023 10:07:33 +0200
Subject: [PATCH] No need for third partly lib to display devices trust
 progress

---
 app/build.gradle                              |  3 --
 .../ui/contacts/viewmodel/ContactViewModel.kt |  1 +
 app/src/main/res/layout/contact_fragment.xml  | 38 +++++++++++++------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8ae73c3b1..26c2c7611 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,9 +83,6 @@ dependencies {
     // https://github.com/GetStream/avatarview-android/blob/main/LICENSE Apache v2.0
     implementation "io.getstream:avatarview-coil:1.0.7"
 
-    // https://github.com/akexorcist/RoundCornerProgressBar/blob/master/LICENSE.txt
-    implementation 'com.akexorcist:round-corner-progress-bar:2.2.1'
-
     implementation platform('com.google.firebase:firebase-bom:30.3.2')
     implementation 'com.google.firebase:firebase-messaging'
 
diff --git a/app/src/main/java/org/linphone/ui/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/contacts/viewmodel/ContactViewModel.kt
index ad6e5428b..100dead49 100644
--- a/app/src/main/java/org/linphone/ui/contacts/viewmodel/ContactViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/contacts/viewmodel/ContactViewModel.kt
@@ -77,6 +77,7 @@ class ContactViewModel : ViewModel() {
 
     init {
         showNumbersAndAddresses.value = true
+        showDevicesTrust.value = true
         showCompany.value = false
     }
 
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 21852aafe..1a22c2cb5 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -69,12 +69,17 @@
                 android:layout_height="wrap_content">
 
                 <androidx.constraintlayout.widget.Group
-                    android:id="@+id/info_group"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:constraint_referenced_ids="info_background, company_label, company"
                     android:visibility="@{viewModel.showCompany ? View.VISIBLE : View.GONE}" />
 
+                <androidx.constraintlayout.widget.Group
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:constraint_referenced_ids="trusted_devices_count, trust_background, trusted_devices_progress, devices, trusted_devices_progress_label"
+                    android:visibility="@{viewModel.showDevicesTrust ? View.VISIBLE : View.GONE}" />
+
                 <io.getstream.avatarview.AvatarView
                     android:id="@+id/avatar"
                     android:layout_width="72dp"
@@ -328,26 +333,37 @@
                     app:layout_constraintEnd_toEndOf="@id/trust_background"
                     app:layout_constraintTop_toTopOf="@id/trust_background" />
 
-                <com.akexorcist.roundcornerprogressbar.TextRoundCornerProgressBar
+                <com.google.android.material.progressindicator.LinearProgressIndicator
                     android:id="@+id/trusted_devices_progress"
                     android:layout_width="0dp"
                     android:layout_height="28dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginStart="17dp"
                     android:layout_marginEnd="17dp"
-                    app:rcBackgroundColor="#EEF6F8"
-                    app:rcBackgroundPadding="2dp"
-                    app:rcMax="100"
-                    app:rcProgress="75"
-                    app:rcProgressColor="#4AA8FF"
-                    app:rcRadius="50dp"
-                    app:rcTextProgress="75%"
-                    app:rcTextProgressColor="@color/white"
-                    app:rcTextPositionPriority="inside"
+                    app:trackCornerRadius="50dp"
+                    app:trackThickness="22dp"
+                    app:trackColor="@color/gray_3"
+                    app:indicatorColor="@color/trusted_blue"
+                    android:max="100"
+                    android:progress="75"
                     app:layout_constraintStart_toStartOf="@id/trust_background"
                     app:layout_constraintEnd_toEndOf="@id/trust_background"
                     app:layout_constraintTop_toBottomOf="@id/trusted_devices_count"/>
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/trusted_devices_progress_label"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:text="75%"
+                    android:textColor="@color/white"
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    android:gravity="center"
+                    app:layout_constraintStart_toStartOf="@id/trusted_devices_progress"
+                    app:layout_constraintEnd_toEndOf="@id/trusted_devices_progress"
+                    app:layout_constraintTop_toTopOf="@id/trusted_devices_progress"
+                    app:layout_constraintBottom_toBottomOf="@id/trusted_devices_progress" />
+
                 <LinearLayout
                     android:id="@+id/devices"
                     android:layout_width="0dp"