rebased to new dev branch

Author: markussta

app/src/main/java/com/fpvout/digiview/MainActivity.java

@@ -11,6 +11,7 @@
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
@@ -22,13 +23,13 @@
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.PreferenceManager;
+import io.sentry.SentryLevel;
+import io.sentry.android.core.SentryAndroid;
+
 import com.fpvout.digiview.dvr.DVR;
 import java.io.IOException;
 import java.util.HashMap;
 
-import io.sentry.SentryLevel;
-import io.sentry.android.core.SentryAndroid;
 
 import static com.fpvout.digiview.VideoReaderExoplayer.VideoZoomedIn;
 
@@ -40,6 +41,7 @@ public class MainActivity extends AppCompatActivity implements UsbDeviceListener
     private int shortAnimationDuration;
     private float buttonAlpha = 1;
     private View settingsButton;
+    private View recordButton;
     private View watermarkView;
     private OverlayView overlayView;
     PendingIntent permissionIntent;
@@ -113,6 +115,7 @@ public void onClick(View v) {
                 v.getContext().startActivity(intent);
             }
         });
+        recordButton = findViewById(R.id.recordbt);
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
@@ -137,7 +140,7 @@ private void setupGestureDetectors() {
         gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
             @Override
             public boolean onSingleTapConfirmed(MotionEvent e) {
-                toggleSettingsButton();
+                toggleButton();
                 return super.onSingleTapConfirmed(e);
             }
 
@@ -162,7 +165,7 @@ public void onScaleEnd(ScaleGestureDetector detector) {
         watermarkView.setVisibility(View.GONE);
 
         mUsbMaskConnection = new UsbMaskConnection();
-        mVideoReader = new VideoReaderExoplayer(fpvView, overlayView, this, recorder);
+        mVideoReader = new VideoReaderExoplayer(fpvView, overlayView, this);
 
         if (!usbConnected) {
             if (searchDevice()) {
@@ -232,9 +235,10 @@ private void updateVideoZoom() {
         }
     }
 
-    private void toggleSettingsButton() {
+    private void toggleButton() {
         // cancel any pending delayed animations first
         settingsButton.getHandler().removeCallbacksAndMessages(null);
+        recordButton.getHandler().removeCallbacksAndMessages(null);
 
         if (buttonAlpha == 1) {
             buttonAlpha = 0;
@@ -251,6 +255,10 @@ public void onAnimationEnd(Animator animation) {
                         autoHideSettingsButton();
                     }
                 });
+
+        recordButton.animate()
+                .alpha(buttonAlpha)
+                .setDuration(shortAnimationDuration);
     }
 
     private void autoHideSettingsButton() {
@@ -265,6 +273,16 @@ public void run() {
                         .setDuration(shortAnimationDuration);
             }
         }, 3000);
+
+        recordButton.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                buttonAlpha = 0;
+                recordButton.animate()
+                        .alpha(0)
+                        .setDuration(shortAnimationDuration);
+            }
+        }, 3000);
     }
 
     @Override
@@ -347,15 +365,10 @@ public void onResume() {
         }
 
         settingsButton.setAlpha(1);
+        recordButton.setAlpha(1);
         autoHideSettingsButton();
         updateWatermark();
         updateVideoZoom();
-
-        try {
-            recorder.init();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
     @Override

app/src/main/java/com/fpvout/digiview/VideoReaderExoplayer.java

@@ -5,10 +5,10 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.SurfaceView;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.preference.PreferenceManager;
 
 import com.fpvout.digiview.dvr.DVR;
 import com.google.android.exoplayer2.C;

app/src/main/res/values/strings.xml

@@ -40,8 +40,6 @@
     <string name="copyright">Copyright</string>
     <string name="open_source_license">Open-Source License</string>
     <string name="open_source_license_summary">MIT License</string>
-
-    <string name="app_name">DigiView</string>
     <string name="connectButtonText">Connect</string>
     <string name="recording_started">recording started</string>
     <string name="recording_stopped">recording stopped</string>