Update various deprecated methods

Author: weberbox

app/src/main/java/com/weberbox/pifire/service/NotificationServiceExtension.java

@@ -42,9 +42,6 @@ public void remoteNotificationReceived(Context context, OSNotificationReceivedEv
             return builder;
         });
 
-        //JSONObject data = notification.getAdditionalData();
-        //Timber.d( "Received Notification Data: %s", data);
-
         receivedEvent.complete(mutableNotification);
     }
 }

app/src/main/java/com/weberbox/pifire/ui/dialogs/ProbeEditDialog.java

@@ -8,6 +8,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import com.google.android.material.textfield.TextInputEditText;
@@ -49,24 +50,7 @@ public AlertDialog showDialog() {
         dialog.setTitle(R.string.dialog_probe_edit);
 
         final TextInputEditText probeNameTv = binding.probeEditNameTv;
-        final AutoCompleteTextView probeProfileTv = binding.probeEditProfileTv;
-
-        List<String> profileNames = new ArrayList<>();
-
-        ProbeProfileModel probeProfile = probeInfo.getProbeProfile();
-
-        if (probeProfile != null) {
-            probeProfileTv.setText(probeProfile.getName());
-        }
-
-        for (ProbeProfileModel profile : profiles) {
-            profileNames.add(profile.getName());
-        }
-
-        ArrayAdapter<String> profileAdapter = new ArrayAdapter<>(context,
-                R.layout.item_menu_popup, profileNames);
-
-        probeProfileTv.setAdapter(profileAdapter);
+        final AutoCompleteTextView probeProfileTv = getAutoCompleteTextView(binding);
 
         String probeName = probeInfo.getName();
 
@@ -119,6 +103,29 @@ public void afterTextChanged(Editable editable) {
 
         return alertDialog;
     }
+
+    @NonNull
+    private AutoCompleteTextView getAutoCompleteTextView(DialogProbeEditBinding binding) {
+        final AutoCompleteTextView probeProfileTv = binding.probeEditProfileTv;
+
+        List<String> profileNames = new ArrayList<>();
+
+        ProbeProfileModel probeProfile = probeInfo.getProbeProfile();
+
+        if (probeProfile != null) {
+            probeProfileTv.setText(probeProfile.getName());
+        }
+
+        for (ProbeProfileModel profile : profiles) {
+            profileNames.add(profile.getName());
+        }
+
+        ArrayAdapter<String> profileAdapter = new ArrayAdapter<>(context,
+                R.layout.item_menu_popup, profileNames);
+
+        probeProfileTv.setAdapter(profileAdapter);
+        return probeProfileTv;
+    }
 }
 
 

app/src/main/java/com/weberbox/pifire/ui/utils/AnimUtils.java

@@ -13,15 +13,13 @@
 import android.view.animation.OvershootInterpolator;
 import android.view.animation.TranslateAnimation;
 
-import androidx.core.view.ViewCompat;
-
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.weberbox.pifire.constants.Constants;
 
 public class AnimUtils {
 
     public static void rotateFabBackwards(FloatingActionButton fab) {
-        ViewCompat.animate(fab)
+        fab.animate()
                 .rotation(180)
                 .withLayer()
                 .setDuration(300L)
@@ -30,7 +28,7 @@ public static void rotateFabBackwards(FloatingActionButton fab) {
     }
 
     public static void rotateFabForwards(FloatingActionButton fab) {
-        ViewCompat.animate(fab)
+        fab.animate()
                 .rotation(0)
                 .withLayer()
                 .setDuration(300L)

app/src/main/java/com/weberbox/pifire/ui/utils/RichDrawableHelper.java

@@ -5,14 +5,14 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.view.ViewCompat;
 
 import com.weberbox.pifire.R;
 import com.weberbox.pifire.interfaces.DrawableEnriched;
@@ -89,7 +89,7 @@ private void initCompoundDrawables(TextView textView, int drawableStartVectorId,
     private void inflateVectors(TextView textView, int drawableStartVectorId,
                                 int drawableTopVectorId, int drawableEndVectorId,
                                 int drawableBottomVectorId, Drawable[] drawables) {
-        boolean rtl = ViewCompat.getLayoutDirection(textView) == ViewCompat.LAYOUT_DIRECTION_RTL;
+        boolean rtl = textView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
 
         if (drawableStartVectorId != UNDEFINED) {
             drawables[rtl ? RIGHT_DRAWABLE_INDEX : LEFT_DRAWABLE_INDEX] =

app/src/main/java/com/weberbox/pifire/ui/views/SwipeButton.java

@@ -364,6 +364,14 @@ private void expandButton() {
         });
 
 
+        AnimatorSet animatorSet = getAnimatorSet();
+
+        animatorSet.playTogether(positionAnimator, widthAnimator);
+        animatorSet.start();
+    }
+
+    @NonNull
+    private AnimatorSet getAnimatorSet() {
         AnimatorSet animatorSet = new AnimatorSet();
         animatorSet.addListener(new AnimatorListenerAdapter() {
             @Override
@@ -382,9 +390,7 @@ public void onAnimationEnd(Animator animation) {
                 }
             }
         });
-
-        animatorSet.playTogether(positionAnimator, widthAnimator);
-        animatorSet.start();
+        return animatorSet;
     }
 
     private void moveButtonBack() {