Fix devicelistfragment and remove two dependencies.

This commit is contained in:
Alex Hart 2022-05-27 14:55:22 -03:00 committed by Greyson Parrelli
parent f2d5bfe51d
commit 7896a525f2
6 changed files with 7 additions and 17 deletions

View file

@ -476,7 +476,6 @@ dependencies {
implementation libs.materialish.progress implementation libs.materialish.progress
implementation libs.greenrobot.eventbus implementation libs.greenrobot.eventbus
implementation libs.waitingdots implementation libs.waitingdots
implementation libs.floatingactionbutton
implementation libs.google.zxing.android.integration implementation libs.google.zxing.android.integration
implementation libs.time.duration.picker implementation libs.time.duration.picker
implementation libs.google.zxing.core implementation libs.google.zxing.core

View file

@ -21,7 +21,7 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader; import androidx.loader.content.Loader;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; 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.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.loaders.DeviceListLoader; import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;

View file

@ -1,6 +1,8 @@
package org.thoughtcrime.securesms.mediasend; package org.thoughtcrime.securesms.mediasend;
import android.Manifest; import android.Manifest;
import android.animation.Animator;
import android.animation.ValueAnimator;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
@ -17,8 +19,6 @@ import androidx.camera.view.SignalCameraView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.bumptech.glide.util.Executors; 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.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -46,6 +46,7 @@ class CameraXVideoCaptureHelper implements CameraButtonView.VideoCaptureListener
private ValueAnimator cameraMetricsAnimator; private ValueAnimator cameraMetricsAnimator;
private final VideoCapture.OnVideoSavedCallback videoSavedListener = new VideoCapture.OnVideoSavedCallback() { private final VideoCapture.OnVideoSavedCallback videoSavedListener = new VideoCapture.OnVideoSavedCallback() {
@SuppressLint("RestrictedApi")
@Override @Override
public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) { public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
try { try {
@ -58,6 +59,7 @@ class CameraXVideoCaptureHelper implements CameraButtonView.VideoCaptureListener
} }
} }
@SuppressLint("RestrictedApi")
@Override @Override
public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) { public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
isRecording = false; isRecording = false;

View file

@ -17,7 +17,7 @@
android:id="@+id/progress" android:id="@+id/progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:indeterminate="true"></ProgressBar> android:indeterminate="true" />
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -47,7 +47,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_device" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"

View file

@ -103,7 +103,6 @@ dependencyResolutionManagement {
alias('roundedimageview').to('com.makeramen:roundedimageview:2.1.0') alias('roundedimageview').to('com.makeramen:roundedimageview:2.1.0')
alias('materialish-progress').to('com.pnikosis:materialish-progress:1.5') alias('materialish-progress').to('com.pnikosis:materialish-progress:1.5')
alias('waitingdots').to('pl.tajchert:waitingdots:0.1.0') 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('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('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') alias('numberpickerview').to('cn.carbswang.android:NumberPickerView:1.0.9')

View file

@ -1868,21 +1868,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1" origin="Generated by Gradle"/> <sha256 value="1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </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"> <component group="com.mobilecoin" name="android-sdk" version="1.1.0">
<artifact name="android-sdk-1.1.0.aar"> <artifact name="android-sdk-1.1.0.aar">
<sha256 value="a57b73613c8fb255bf735d910268f945a6c690ff24d45cc6034aa34e9a3ae4d5" origin="Generated by Gradle"/> <sha256 value="a57b73613c8fb255bf735d910268f945a6c690ff24d45cc6034aa34e9a3ae4d5" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </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"> <component group="com.pinterest" name="ktlint" version="0.43.2">
<artifact name="ktlint-0.43.2.jar"> <artifact name="ktlint-0.43.2.jar">
<sha256 value="99ec69ef0628695c24dbbc2cc4b8d7c61a754697d624f5233fc65f43faf2d235" origin="Generated by Gradle"/> <sha256 value="99ec69ef0628695c24dbbc2cc4b8d7c61a754697d624f5233fc65f43faf2d235" origin="Generated by Gradle"/>