Two distance bars (#25)

OpenIPC · Nov 28, 2024 · 00e88f0 · 00e88f0
1 parent c691b2d
commit 00e88f0
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 13 deletions.
diff --git a/app/src/main/java/com/openipc/pixelpilot/VideoActivity.java b/app/src/main/java/com/openipc/pixelpilot/VideoActivity.java
@@ -188,40 +188,59 @@ protected void onCreate(Bundle savedInstanceState) {
             binding.surfaceViewRight.getHolder().addCallback(videoPlayer.configure1(1));
 
             SeekBar seekBar = binding.seekBar;
+            SeekBar distanceSeekBar = binding.distanceSeekBar;
+            seekBar.setRotation(180);
+
             // Retrieve saved progress value
             SharedPreferences sharedPreferences = getSharedPreferences("SeekBarPrefs", MODE_PRIVATE);
-            int savedProgress = sharedPreferences.getInt("seekBarProgress", 0); // Default to 0 if no value is found
+            SharedPreferences sharedPreferencesd = getSharedPreferences("SeekBarPrefsD", MODE_PRIVATE);
+            int savedProgress = sharedPreferences.getInt("seekBarProgress", 1); // Default to 0 if no value is found
+            int savedDistanceProgress = sharedPreferencesd.getInt("distanceSeekBarProgress", 1);
             seekBar.setProgress(savedProgress);
             seekBar.setVisibility(View.VISIBLE);
+
+            distanceSeekBar.setProgress(savedDistanceProgress);
+            distanceSeekBar.setVisibility(View.VISIBLE);
+
             constraintLayout = binding.frameLayout;
+
             constraintSet = new ConstraintSet();
             constraintSet.clone(constraintLayout);
 
             // Apply the saved margin
-            int margin = savedProgress * 10; // Adjust the multiplier as needed
-            constraintSet.setMargin(R.id.surfaceViewLeft, ConstraintSet.END, margin);
-            constraintSet.setMargin(R.id.surfaceViewRight, ConstraintSet.START, margin);
+            int margin = savedProgress * 20; // Adjust the multiplier as needed
+            int size = savedDistanceProgress * 20; // Adjust the multiplier as needed
+            constraintSet.setMargin(R.id.surfaceViewLeft, ConstraintSet.START, margin);
+            constraintSet.setMargin(R.id.surfaceViewRight, ConstraintSet.END, margin);
+            constraintSet.setMargin(R.id.surfaceViewLeft, ConstraintSet.END, size);
+            constraintSet.setMargin(R.id.surfaceViewRight, ConstraintSet.START, size);
+
+            //constraintSet.constrainWidth(R.id.surfaceViewLeft, size);
+            //constraintSet.constrainWidth(R.id.surfaceViewRight, size);
             constraintSet.applyTo(constraintLayout);
 
             // Hide SeekBar after 3 seconds
             handler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     seekBar.setVisibility(View.GONE);
+                    distanceSeekBar.setVisibility(View.GONE);
                 }
             }, 3000);
 
-            // Show SeekBar when touched
+            // Show SeekBars when touched
             constraintLayout.setOnTouchListener(new View.OnTouchListener() {
                 @Override
                 public boolean onTouch(View v, MotionEvent event) {
                     if (event.getAction() == MotionEvent.ACTION_DOWN) {
                         seekBar.setVisibility(View.VISIBLE);
-                        // Hide SeekBar again after 3 seconds of inactivity
+                        distanceSeekBar.setVisibility(View.VISIBLE);
+                        // Hide seekBar after 3 seconds of inactivity
                         handler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
                                 seekBar.setVisibility(View.GONE);
+                                distanceSeekBar.setVisibility(View.GONE);
                             }
                         }, 3000);
                     }
@@ -232,27 +251,46 @@ public void run() {
             seekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
                 @Override
                 public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    int margin = progress * 10; // Adjust the multiplier as needed
-                    constraintSet.setMargin(R.id.surfaceViewLeft, ConstraintSet.END, margin);
-                    constraintSet.setMargin(R.id.surfaceViewRight, ConstraintSet.START, margin);
+                    int margin = progress * 20; // Adjust the multiplier as needed
+                    constraintSet.setMargin(R.id.surfaceViewLeft, ConstraintSet.START, margin);
+                    constraintSet.setMargin(R.id.surfaceViewRight, ConstraintSet.END, margin);
                     constraintSet.applyTo(constraintLayout);
                     // Save progress value
                     SharedPreferences sharedPreferences = getSharedPreferences("SeekBarPrefs", MODE_PRIVATE);
                     SharedPreferences.Editor editor = sharedPreferences.edit();
                     editor.putInt("seekBarProgress", progress);
-                    editor.apply();
+                    editor.commit();
                 }
 
                 @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
+                public void onStartTrackingTouch(SeekBar seekBar) { }
 
-                }
+                @Override
+                public void onStopTrackingTouch(SeekBar seekBar) { }
+            });
 
+            distanceSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
                 @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
+                public void onProgressChanged(SeekBar distanceSeekBar, int progressD, boolean fromUser) {
+                    int size = progressD * 20; // Adjust the multiplier as needed
 
+                    constraintSet.setMargin(R.id.surfaceViewLeft, ConstraintSet.END, size);
+                    constraintSet.setMargin(R.id.surfaceViewRight, ConstraintSet.START, size);
+                    constraintSet.applyTo(constraintLayout);
+                    // Save progress value
+                    SharedPreferences sharedPreferencesd = getSharedPreferences("SeekBarPrefsD", MODE_PRIVATE);
+                    SharedPreferences.Editor editor = sharedPreferencesd.edit();
+                    editor.putInt("distanceSeekBarProgress", progressD);
+                    editor.commit();
                 }
+
+                @Override
+                public void onStartTrackingTouch(SeekBar distanceSeekBar) { }
+                @Override
+                public void onStopTrackingTouch(SeekBar distanceSeekBar) { }
             });
+
+
         }
         else {
             binding.surfaceViewRight.setVisibility(View.GONE);

diff --git a/app/src/main/res/layout/activity_video.xml b/app/src/main/res/layout/activity_video.xml
@@ -47,6 +47,18 @@
         android:visibility="gone"
         android:max="20" />
 
+    <SeekBar
+        android:id="@+id/distanceSeekBar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/seekBar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="300dp"
+        android:layout_marginEnd="300dp"
+        android:visibility="gone"
+        android:max="20"  />
+
     <Button
         android:id="@+id/btnSettings"
         style="@style/Widget.Material3.Button.IconButton"