From 7896a525f239b49a482c617d6962fe452a0c2c31 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 27 May 2022 14:55:22 -0300
Subject: [PATCH] Fix devicelistfragment and remove two dependencies.

---
 app/build.gradle                                       |  1 -
 .../org/thoughtcrime/securesms/DeviceListFragment.java |  2 +-
 .../securesms/mediasend/CameraXVideoCaptureHelper.java |  6 ++++--
 app/src/main/res/layout/device_list_fragment.xml       |  4 ++--
 dependencies.gradle                                    |  1 -
 gradle/verification-metadata.xml                       | 10 ----------
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f2dabc038..972282457 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -476,7 +476,6 @@ dependencies {
     implementation libs.materialish.progress
     implementation libs.greenrobot.eventbus
     implementation libs.waitingdots
-    implementation libs.floatingactionbutton
     implementation libs.google.zxing.android.integration
     implementation libs.time.duration.picker
     implementation libs.google.zxing.core
diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
index 59ad3ecf8..2c32b90d3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
@@ -21,7 +21,7 @@ import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.melnykov.fab.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
index ef17a9f0f..d017543dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.Manifest;
+import android.animation.Animator;
+import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.DisplayMetrics;
@@ -17,8 +19,6 @@ import androidx.camera.view.SignalCameraView;
 import androidx.fragment.app.Fragment;
 
 import com.bumptech.glide.util.Executors;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ValueAnimator;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
@@ -46,6 +46,7 @@ class CameraXVideoCaptureHelper implements CameraButtonView.VideoCaptureListener
   private       ValueAnimator cameraMetricsAnimator;
 
   private final VideoCapture.OnVideoSavedCallback videoSavedListener = new VideoCapture.OnVideoSavedCallback() {
+    @SuppressLint("RestrictedApi")
     @Override
     public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
       try {
@@ -58,6 +59,7 @@ class CameraXVideoCaptureHelper implements CameraButtonView.VideoCaptureListener
       }
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
     public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
       isRecording = false;
diff --git a/app/src/main/res/layout/device_list_fragment.xml b/app/src/main/res/layout/device_list_fragment.xml
index 1784f0660..2bd3dd012 100644
--- a/app/src/main/res/layout/device_list_fragment.xml
+++ b/app/src/main/res/layout/device_list_fragment.xml
@@ -17,7 +17,7 @@
             android:id="@+id/progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminate="true"></ProgressBar>
+            android:indeterminate="true" />
     </LinearLayout>
 
     <TextView
@@ -47,7 +47,7 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_device"
-        style="@style/Widget.Material3.FloatingActionButton.Large.Primary"
+        style="@style/Widget.Material3.FloatingActionButton.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
diff --git a/dependencies.gradle b/dependencies.gradle
index 0a9396632..0c679bfcb 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -103,7 +103,6 @@ dependencyResolutionManagement {
             alias('roundedimageview').to('com.makeramen:roundedimageview:2.1.0')
             alias('materialish-progress').to('com.pnikosis:materialish-progress:1.5')
             alias('waitingdots').to('pl.tajchert:waitingdots:0.1.0')
-            alias('floatingactionbutton').to('com.melnykov:floatingactionbutton:1.3.0')
             alias('time-duration-picker').to('mobi.upod:time-duration-picker:1.1.3')
             alias('subsampling-scale-image-view').to('com.davemorrissey.labs:subsampling-scale-image-view:3.10.0')
             alias('numberpickerview').to('cn.carbswang.android:NumberPickerView:1.0.9')
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 04cd62abf..9a18d3ff4 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1868,21 +1868,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.melnykov" name="floatingactionbutton" version="1.3.0">
-         <artifact name="floatingactionbutton-1.3.0.aar">
-            <sha256 value="15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.mobilecoin" name="android-sdk" version="1.1.0">
          <artifact name="android-sdk-1.1.0.aar">
             <sha256 value="a57b73613c8fb255bf735d910268f945a6c690ff24d45cc6034aa34e9a3ae4d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.nineoldandroids" name="library" version="2.4.0">
-         <artifact name="library-2.4.0.jar">
-            <sha256 value="68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.pinterest" name="ktlint" version="0.43.2">
          <artifact name="ktlint-0.43.2.jar">
             <sha256 value="99ec69ef0628695c24dbbc2cc4b8d7c61a754697d624f5233fc65f43faf2d235" origin="Generated by Gradle"/>