From dcb50cc7128ee1f10e1bb1290cc9fbf933af4e46 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 17 Aug 2022 16:22:46 +0600
Subject: [PATCH 01/10] Fix popup on open crash issue

---
 .../java/net/sourceforge/opencamera/ui/PopupView.java    | 9 +++------
 app/src/main/res/drawable/ic_arrow_right.xml             | 2 +-
 app/src/main/res/layout/popupview_arrayoptions.xml       | 8 ++++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java b/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java
index 8100aa0f0..d5c92b5f1 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java
@@ -44,6 +44,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.ImageView.ScaleType;
 
+import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.appcompat.widget.SwitchCompat;
 
 /** This defines the UI for the "popup" button, that provides quick access to a
@@ -1844,8 +1845,8 @@ public class PopupView extends LinearLayout {
             @SuppressLint("InflateParams")
             final View ll2 = LayoutInflater.from(this.getContext()).inflate(R.layout.popupview_arrayoptions, null);
             final TextView text_view = ll2.findViewById(R.id.text_view);
-            final ImageButton prev_button = ll2.findViewById(R.id.button_left);
-            final ImageButton next_button = ll2.findViewById(R.id.button_right);
+            final AppCompatImageButton prev_button = ll2.findViewById(R.id.button_left);
+            final AppCompatImageButton next_button = ll2.findViewById(R.id.button_right);
 
             setArrayOptionsText(supported_options, title, text_view, title_in_options, title_in_options_first_only, current_index);
             //text_view.setBackgroundColor(Color.GRAY); // debug
@@ -1861,8 +1862,6 @@ public class PopupView extends LinearLayout {
 
             final float scale = getResources().getDisplayMetrics().density;
             final int padding = (int) (0 * scale + 0.5f); // convert dps to pixels
-            prev_button.setBackgroundColor(Color.TRANSPARENT); // workaround for Android 6 crash!
-            prev_button.setImageDrawable(this.getResources().getDrawable(R.drawable.ic_arrow_left));
             prev_button.setPadding(padding, padding, padding, padding);
             ViewGroup.LayoutParams vg_params = prev_button.getLayoutParams();
             vg_params.width = arrow_button_w;
@@ -1875,8 +1874,6 @@ public class PopupView extends LinearLayout {
             //ll2.addView(text_view);
             main_activity.getMainUI().getTestUIButtonsMap().put(test_key, text_view);
 
-            next_button.setBackgroundColor(Color.TRANSPARENT); // workaround for Android 6 crash!
-            next_button.setImageDrawable(this.getResources().getDrawable(R.drawable.ic_arrow_right));
             next_button.setPadding(padding, padding, padding, padding);
             vg_params = next_button.getLayoutParams();
             vg_params.width = arrow_button_w;
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index 0c95084ab..206dd4fde 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="25dp"
-    android:height="23dp"
+    android:height="25dp"
     android:viewportWidth="25"
     android:viewportHeight="23">
   <path
diff --git a/app/src/main/res/layout/popupview_arrayoptions.xml b/app/src/main/res/layout/popupview_arrayoptions.xml
index 2429e2570..3d441eac0 100644
--- a/app/src/main/res/layout/popupview_arrayoptions.xml
+++ b/app/src/main/res/layout/popupview_arrayoptions.xml
@@ -9,10 +9,12 @@
     android:layout_height="match_parent"
     android:orientation="horizontal">
 
-    <Button
+    <ImageButton
         android:id="@+id/button_left"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:src="@drawable/ic_arrow_left"
         />
     <TextView
         android:id="@+id/text_view"
@@ -22,9 +24,11 @@
         android:gravity="center"
         android:textColor="#ffffffff"
         />
-    <Button
+    <ImageButton
         android:id="@+id/button_right"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:src="@drawable/ic_arrow_right"
         />
 </LinearLayout>
-- 
GitLab


From c60a60b53b9cc85f83475b6335276dab3e2f58da Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 17 Aug 2022 16:27:58 +0600
Subject: [PATCH 02/10] Fix accentColor missing issue

---
 app/src/main/res/values-v21/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index d03e6a887..a0a3b85ab 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -7,6 +7,7 @@
     -->
     <style name="AppBaseTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <!-- API 21 theme customizations can go here. -->
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:imageButtonStyle">@style/image_button</item>
         <item name="android:navigationBarColor">@color/navigation_background</item>
@@ -20,6 +21,7 @@
     </style>
 
     <style name="customAlertDialog" parent="android:Theme.Material.Dialog.Alert">
+        <item name="colorAccent">@color/color_default_accent</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
-- 
GitLab


From 91d55e92aa56a5125285735b621a5a67f925c5ef Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 17 Aug 2022 17:33:43 +0600
Subject: [PATCH 03/10] Fix top & bottom bar holder placement

---
 .../net/sourceforge/opencamera/ui/MainUI.java | 53 ++++++++++++++-----
 app/src/main/res/layout/activity_main.xml     |  8 ++-
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index bbe2fa97d..a3a0b8cbb 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -31,8 +31,6 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 
-import androidx.constraintlayout.widget.ConstraintLayout;
-
 import net.sourceforge.opencamera.MainActivity;
 import net.sourceforge.opencamera.MyApplicationInterface;
 import net.sourceforge.opencamera.MyDebug;
@@ -528,11 +526,7 @@ public class MainUI {
                         }
                     }
 
-                    view = main_activity.findViewById(R.id.top_bg);
-                    layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
-                    layoutParams.width = button_size;
-                    view.setLayoutParams(layoutParams);
-                    top_icon = view;
+                    top_icon = setUpTopBarHolderUI(system_orientation_portrait, system_orientation_reversed_landscape, button_size);
                 }
             } else {
                 // need to reset size/margins to their default
@@ -555,13 +549,10 @@ public class MainUI {
 
             // end icon panel
 
-            int rightSideMargin = (int) ScaleUtils.convertDpToPx(main_activity, 23.0f);
-            rightSideMargin += navigation_gap;
+            int navigationBarSideMargin = (int) ScaleUtils.convertDpToPx(main_activity, 23.0f);
+            navigationBarSideMargin += navigation_gap;
 
-            view = main_activity.findViewById(R.id.bottom_buttons_holder);
-            int bottomBarLeftPadding = (int) ScaleUtils.convertDpToPx(main_activity, 23.0f);
-            int bottomBarTopBottomPadding = (int) ScaleUtils.convertDpToPx(main_activity, 20.0f);
-            view.setPadding(bottomBarLeftPadding, bottomBarTopBottomPadding, rightSideMargin, bottomBarTopBottomPadding);
+            setUpBottomBarHolderUI(system_orientation_portrait, system_orientation_reversed_landscape, navigationBarSideMargin);
 
             view = main_activity.findViewById(R.id.take_photo);
             setViewRotation(view, ui_rotation);
@@ -592,7 +583,7 @@ public class MainUI {
 
             view = main_activity.findViewById(R.id.zoom_seekbar);
             LinearLayout.LayoutParams linearLayoutParams = (LinearLayout.LayoutParams) view.getLayoutParams();
-            int zoomSeekBarMarginRight = (rightSideMargin + 140);
+            int zoomSeekBarMarginRight = (navigationBarSideMargin + 140);
             linearLayoutParams.setMargins(0, 0, zoomSeekBarMarginRight, 0);
             view.setLayoutParams(linearLayoutParams);
 
@@ -816,6 +807,40 @@ public class MainUI {
         }
     }
 
+    private View setUpTopBarHolderUI(boolean orientationPortrait, boolean orientationReverseLandscape, int topButtonSize) {
+        View topBar = main_activity.findViewById(R.id.top_bg);
+        int width = orientationPortrait ? ViewGroup.LayoutParams.MATCH_PARENT : topButtonSize;
+        int height = orientationPortrait ? topButtonSize : ViewGroup.LayoutParams.MATCH_PARENT;
+        RelativeLayout.LayoutParams topBarLayoutParams = new RelativeLayout.LayoutParams(width, height);
+
+        int topBarAlignment = orientationPortrait ? RelativeLayout.ALIGN_PARENT_TOP : (orientationReverseLandscape ? RelativeLayout.ALIGN_PARENT_END : RelativeLayout.ALIGN_PARENT_START);
+        topBarLayoutParams.addRule(topBarAlignment, RelativeLayout.TRUE);
+
+        topBar.setLayoutParams(topBarLayoutParams);
+        return topBar;
+    }
+
+    private void setUpBottomBarHolderUI(boolean orientationPortrait, boolean orientationReverseLandscape, int navigationBarSideMargin) {
+        View bottomBar = main_activity.findViewById(R.id.bottom_buttons_holder);
+        // set up layoutParam
+        int bottomBarWidth = orientationPortrait ? ViewGroup.LayoutParams.MATCH_PARENT : ViewGroup.LayoutParams.WRAP_CONTENT;
+        int bottomBarHeight = orientationPortrait ? ViewGroup.LayoutParams.WRAP_CONTENT : ViewGroup.LayoutParams.MATCH_PARENT;
+        int bottomBarAlignment = orientationPortrait ? RelativeLayout.ALIGN_PARENT_BOTTOM : (orientationReverseLandscape ? RelativeLayout.ALIGN_PARENT_START : RelativeLayout.ALIGN_PARENT_END);
+        RelativeLayout.LayoutParams bottomBarLayoutParams = new RelativeLayout.LayoutParams(bottomBarWidth, bottomBarHeight);
+        bottomBarLayoutParams.addRule(bottomBarAlignment, RelativeLayout.TRUE);
+        bottomBar.setLayoutParams(bottomBarLayoutParams);
+
+        // set up padding
+        int size20dp = (int) ScaleUtils.convertDpToPx(main_activity, 20.0f);
+        int size23dp = (int) ScaleUtils.convertDpToPx(main_activity, 23.0f);
+
+        int bottomBarLeftPadding = orientationPortrait ? size20dp : (orientationReverseLandscape ? navigationBarSideMargin : size23dp);
+        int bottomBarRightPadding = orientationPortrait ? size20dp : (orientationReverseLandscape ? size23dp : navigationBarSideMargin);
+        int bottomBarTopPadding = orientationPortrait ? size23dp : size20dp;
+        int bottomBarBottomPadding = orientationPortrait ? navigationBarSideMargin : size20dp;
+        bottomBar.setPadding(bottomBarLeftPadding, bottomBarTopPadding, bottomBarRightPadding, bottomBarBottomPadding);
+    }
+
     /** Wrapper for layoutParams.setMargins, but where the margins are supplied for landscape orientation,
      *  and if in portrait these are automatically rotated.
      */
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 24b654ffd..94ec080eb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,9 +15,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_buttons_holder"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:background="@color/navigation_background"
-        android:layout_alignParentEnd="true">
+        android:layout_height="wrap_content"
+        android:background="@color/navigation_background">
 
         <View
             android:id="@+id/place_holder_view"
@@ -162,8 +161,7 @@
     <View
         android:id="@+id/top_bg"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
+        android:layout_height="wrap_content"
         android:background="@color/navigation_background"/>
 
 
-- 
GitLab


From 0a18db5b53767767927a80338ce3e5c07bdd0e2e Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Wed, 17 Aug 2022 19:27:03 +0600
Subject: [PATCH 04/10] Fix zoom buttons placement

---
 .../net/sourceforge/opencamera/ui/MainUI.java | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index a3a0b8cbb..b81a958d8 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -578,8 +578,7 @@ public class MainUI {
             view = main_activity.findViewById(R.id.take_photo_when_video_recording);
             setViewRotation(view, ui_rotation);
 
-            view = main_activity.findViewById(R.id.zoom);
-            setViewRotation(view, ui_rotation);
+            setUpZoomControlUI(ui_rotation, system_orientation_portrait, system_orientation_reversed_landscape);
 
             view = main_activity.findViewById(R.id.zoom_seekbar);
             LinearLayout.LayoutParams linearLayoutParams = (LinearLayout.LayoutParams) view.getLayoutParams();
@@ -807,6 +806,31 @@ public class MainUI {
         }
     }
 
+    private void setUpZoomControlUI(int rotation, boolean orientationPortrait, boolean orientationReverseLandscape) {
+        View zoom = main_activity.findViewById(R.id.zoom);
+        int width = (int) ScaleUtils.convertDpToPx(main_activity, 112.0f);
+        int height = (int) ScaleUtils.convertDpToPx(main_activity, 38.0f);
+        int margin = (int) ScaleUtils.convertDpToPx(main_activity, 25.0f);
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
+
+        if (orientationPortrait) {
+            layoutParams.addRule(RelativeLayout.BELOW, R.id.top_bg);
+            layoutParams.setMargins(0, margin, 0, 0);
+            layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL, RelativeLayout.TRUE);
+        } else if (orientationReverseLandscape) {
+            layoutParams.addRule(RelativeLayout.START_OF, R.id.top_bg);
+            layoutParams.setMargins(0, 0, margin, 0);
+            layoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+        } else {
+            layoutParams.addRule(RelativeLayout.END_OF, R.id.top_bg);
+            layoutParams.setMargins(margin, 0, 0, 0);
+            layoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+        }
+
+        zoom.setLayoutParams(layoutParams);
+        setViewRotation(zoom, rotation);
+    }
+
     private View setUpTopBarHolderUI(boolean orientationPortrait, boolean orientationReverseLandscape, int topButtonSize) {
         View topBar = main_activity.findViewById(R.id.top_bg);
         int width = orientationPortrait ? ViewGroup.LayoutParams.MATCH_PARENT : topButtonSize;
-- 
GitLab


From 37eb5cdafd6bfc7a7b6a021e1271e8a61f280bb1 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 18 Aug 2022 10:35:59 +0600
Subject: [PATCH 05/10] Fix zoom seekbar placement

---
 .../net/sourceforge/opencamera/ui/MainUI.java |  9 +++----
 app/src/main/res/layout/activity_main.xml     | 25 +++++++++++++------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index b81a958d8..953f175e5 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -580,11 +580,8 @@ public class MainUI {
 
             setUpZoomControlUI(ui_rotation, system_orientation_portrait, system_orientation_reversed_landscape);
 
-            view = main_activity.findViewById(R.id.zoom_seekbar);
-            LinearLayout.LayoutParams linearLayoutParams = (LinearLayout.LayoutParams) view.getLayoutParams();
-            int zoomSeekBarMarginRight = (navigationBarSideMargin + 140);
-            linearLayoutParams.setMargins(0, 0, zoomSeekBarMarginRight, 0);
-            view.setLayoutParams(linearLayoutParams);
+            view = main_activity.findViewById(R.id.zoom_seekbar_holder);
+            setViewRotation(view, ui_rotation);
 
             view = main_activity.findViewById(R.id.focus_seekbar);
             layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
@@ -810,7 +807,7 @@ public class MainUI {
         View zoom = main_activity.findViewById(R.id.zoom);
         int width = (int) ScaleUtils.convertDpToPx(main_activity, 112.0f);
         int height = (int) ScaleUtils.convertDpToPx(main_activity, 38.0f);
-        int margin = (int) ScaleUtils.convertDpToPx(main_activity, 25.0f);
+        int margin = (int) ScaleUtils.convertDpToPx(main_activity, 60.0f);
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
 
         if (orientationPortrait) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 94ec080eb..dc939b2bc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -230,10 +230,14 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/zoom_seekbar_holder"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center|end"
+        android:gravity="center"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="-170dp"
         android:orientation="horizontal">
 
         <ImageView
@@ -241,9 +245,11 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:src="@drawable/ic_zoom_in"
-            android:layout_marginTop="155dp"
-            android:layout_marginEnd="-150dp"
-            android:rotation="270"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/zoom_seekbar"
+            android:contentDescription="@string/zoom" />
 
         <SeekBar
             android:id="@+id/zoom_seekbar"
@@ -251,8 +257,11 @@
             android:layout_height="48dp"
             android:background="@null"
             android:contentDescription="@string/zoom"
-            android:rotation="270" />
-    </LinearLayout>
+            app:layout_constraintStart_toEndOf="@id/zoom_seekbar_icon"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <!-- n.b., layout_marginLeft set programmatically in DrawPreview -->
     <SeekBar
-- 
GitLab


From 757c2cc1abcca63eb6ddd3275f910179c9fa1093 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 18 Aug 2022 13:06:46 +0600
Subject: [PATCH 06/10] Fix focus seekbar placement

---
 .../opencamera/ui/DrawPreview.java            | 67 -------------------
 .../net/sourceforge/opencamera/ui/MainUI.java | 45 ++++++-------
 app/src/main/res/layout/activity_main.xml     | 20 +++---
 3 files changed, 30 insertions(+), 102 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
index 41df47378..0150f16f0 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
@@ -2074,73 +2074,6 @@ public class DrawPreview {
             }
         }
 
-        {
-            /*int focus_seekbars_margin_left_dp = 85;
-            if( want_histogram )
-                focus_seekbars_margin_left_dp += DrawPreview.histogram_height_dp;*/
-            // 135 needed to make room for on-screen info lines in DrawPreview.onDrawInfoLines(), including the histogram
-            // but we also need to take the top_icon_shift into account, for widescreen aspect ratios and "icons along top" UI placement
-            int focus_seekbars_margin_left_dp = 135;
-            int new_focus_seekbars_margin_left = (int) (focus_seekbars_margin_left_dp * scale + 0.5f); // convert dps to pixels
-            if( top_icon_shift > 0 ) {
-                //noinspection SuspiciousNameCombination
-                new_focus_seekbars_margin_left += top_icon_shift;
-            }
-
-            if( focus_seekbars_margin_left == -1 || new_focus_seekbars_margin_left != focus_seekbars_margin_left ) {
-                // we check whether focus_seekbars_margin_left has changed, in case there is a performance cost for setting layoutparams
-                this.focus_seekbars_margin_left = new_focus_seekbars_margin_left;
-                if( MyDebug.LOG )
-                    Log.d(TAG, "set focus_seekbars_margin_left to " + focus_seekbars_margin_left);
-
-                // "left" and "right" here are written assuming we're in landscape system orientation
-
-                View view = main_activity.findViewById(R.id.focus_seekbar);
-                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)view.getLayoutParams();
-                preview.getView().getLocationOnScreen(gui_location);
-                int preview_left = gui_location[system_orientation_portrait ? 1 : 0];
-                if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE )
-                    preview_left += preview.getView().getWidth(); // actually want preview-right for reverse landscape
-
-                view.getLocationOnScreen(gui_location);
-                int seekbar_right = gui_location[system_orientation_portrait ? 1 : 0];
-                if( system_orientation == MainActivity.SystemOrientation.LANDSCAPE || system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
-                    // n.b., we read view.getWidth() even if system_orientation is portrait, because the seekbar is rotated in portrait orientation
-                    seekbar_right += view.getWidth();
-                }
-                else {
-                    // and for reversed landscape, the seekbar is rotated 180 degrees, and getLocationOnScreen() returns the location after the rotation
-                    seekbar_right -= view.getWidth();
-                }
-
-                int min_seekbar_width = (int) (150 * scale + 0.5f); // convert dps to pixels
-                int new_seekbar_width;
-                if( system_orientation == MainActivity.SystemOrientation.LANDSCAPE || system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
-                    new_seekbar_width = seekbar_right - (preview_left+focus_seekbars_margin_left);
-                }
-                else {
-                    // reversed landscape
-                    new_seekbar_width = preview_left - focus_seekbars_margin_left - seekbar_right;
-                }
-                new_seekbar_width = Math.max(new_seekbar_width, min_seekbar_width);
-                /*if( MyDebug.LOG ) {
-                    Log.d(TAG, "preview_left: " + preview_left);
-                    Log.d(TAG, "seekbar_right: " + seekbar_right);
-                    Log.d(TAG, "new_seekbar_width: " + new_seekbar_width);
-                }*/
-                layoutParams.width = new_seekbar_width;
-                view.setLayoutParams(layoutParams);
-
-                view = main_activity.findViewById(R.id.focus_bracketing_target_seekbar);
-                layoutParams = (RelativeLayout.LayoutParams)view.getLayoutParams();
-                layoutParams.width = new_seekbar_width;
-                view.setLayoutParams(layoutParams);
-
-                // need to update due to changing width of focus seekbars
-                main_activity.getMainUI().setFocusSeekbarsRotation();
-            }
-        }
-
         int battery_x = top_x;
         int battery_y = top_y + (int) (5 * scale + 0.5f);
         int battery_width = (int) (5 * scale + 0.5f); // convert dps to pixels
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index 953f175e5..1fc4dfffe 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -583,31 +583,7 @@ public class MainUI {
             view = main_activity.findViewById(R.id.zoom_seekbar_holder);
             setViewRotation(view, ui_rotation);
 
-            view = main_activity.findViewById(R.id.focus_seekbar);
-            layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
-            layoutParams.addRule(align_left, R.id.preview);
-            layoutParams.addRule(align_right, 0);
-            // layoutParams.addRule(left_of, R.id.zoom_seekbar);
-            layoutParams.addRule(right_of, 0);
-            layoutParams.addRule(above, 0);
-            layoutParams.addRule(below, 0);
-            layoutParams.addRule(align_parent_top, 0);
-            layoutParams.addRule(align_parent_bottom, RelativeLayout.TRUE);
-            layoutParams.addRule(align_parent_left, 0);
-            layoutParams.addRule(align_parent_right, 0);
-            view.setLayoutParams(layoutParams);
-
-            view = main_activity.findViewById(R.id.focus_bracketing_target_seekbar);
-            layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
-            layoutParams.addRule(align_left, R.id.preview);
-            layoutParams.addRule(align_right, 0);
-            //layoutParams.addRule(left_of, R.id.zoom_seekbar);
-            layoutParams.addRule(right_of, 0);
-            layoutParams.addRule(above, R.id.focus_seekbar);
-            layoutParams.addRule(below, 0);
-            view.setLayoutParams(layoutParams);
-
-            setFocusSeekbarsRotation();
+            setupFocusSeekBarUI(ui_rotation, system_orientation_portrait, system_orientation_reversed_landscape);
         }
 
         if (!popup_container_only) {
@@ -803,6 +779,25 @@ public class MainUI {
         }
     }
 
+    private void setupFocusSeekBarUI(int rotation, boolean orientationPortrait, boolean orientationReverseLandscape) {
+        View focusSeekBarHolder = main_activity.findViewById(R.id.focus_seekbar_holder);
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
+        if (orientationPortrait) {
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_START, RelativeLayout.TRUE);
+            layoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+        } else if (orientationReverseLandscape) {
+            layoutParams.addRule(RelativeLayout.END_OF, R.id.bottom_buttons_holder);
+            layoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+        } else {
+            layoutParams.addRule(RelativeLayout.START_OF, R.id.bottom_buttons_holder);
+            layoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+        }
+
+        focusSeekBarHolder.setLayoutParams(layoutParams);
+        setViewRotation(focusSeekBarHolder, rotation + 90);
+    }
+
     private void setUpZoomControlUI(int rotation, boolean orientationPortrait, boolean orientationReverseLandscape) {
         View zoom = main_activity.findViewById(R.id.zoom);
         int width = (int) ScaleUtils.convertDpToPx(main_activity, 112.0f);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dc939b2bc..e383b5eb3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -237,8 +237,7 @@
         android:gravity="center"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="-170dp"
-        android:orientation="horizontal">
+        android:layout_marginBottom="-200dp">
 
         <ImageView
             android:id="@+id/zoom_seekbar_icon"
@@ -264,14 +263,18 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <!-- n.b., layout_marginLeft set programmatically in DrawPreview -->
+    <LinearLayout
+        android:id="@+id/focus_seekbar_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true"
+        android:orientation="vertical">
     <SeekBar
         android:id="@+id/focus_seekbar"
         android:layout_width="150dp"
         android:layout_height="50dp"
-        android:layout_marginLeft="135dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginBottom="0dp"
+        android:layout_marginBottom="5dp"
         android:background="@drawable/bg_rounded_corner"
         android:contentDescription="@string/focus_distance"
         android:visibility="gone" />
@@ -281,13 +284,10 @@
         android:id="@+id/focus_bracketing_target_seekbar"
         android:layout_width="150dp"
         android:layout_height="50dp"
-        android:layout_marginLeft="135dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginBottom="0dp"
         android:background="@drawable/bg_rounded_corner"
         android:contentDescription="@string/focus_bracketing_target_distance"
         android:visibility="gone" />
+    </LinearLayout>
 
     <Button
         android:id="@+id/gui_anchor"
-- 
GitLab


From f2359c168f7b8e087993dc702cd88f244807153a Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 18 Aug 2022 14:00:58 +0600
Subject: [PATCH 07/10] Fix multiCameraButton placement

---
 .../net/sourceforge/opencamera/ui/MainUI.java | 28 +++++++++++++++++--
 app/src/main/res/layout/activity_main.xml     |  4 ---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index 1fc4dfffe..0fdc915b1 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -560,8 +560,7 @@ public class MainUI {
             view = main_activity.findViewById(R.id.switch_camera);
             setViewRotation(view, ui_rotation);
 
-            view = main_activity.findViewById(R.id.switch_multi_camera);
-            setViewRotation(view, ui_rotation);
+            setupMultiCameraUI(ui_rotation, system_orientation_portrait, system_orientation_reversed_landscape);
 
             view = main_activity.findViewById(R.id.pause_video);
             setViewRotation(view, ui_rotation);
@@ -779,6 +778,31 @@ public class MainUI {
         }
     }
 
+    private void setupMultiCameraUI(int ui_rotation, boolean orientationPortrait, boolean orientationReverseLandscape) {
+        View multiCamera = main_activity.findViewById(R.id.switch_multi_camera);
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(multiCamera.getLayoutParams().width, multiCamera.getLayoutParams().height);
+
+        int size21dp = (int) ScaleUtils.convertDpToPx(main_activity, 21.0f);
+        int size20dp = (int) ScaleUtils.convertDpToPx(main_activity, 20.0f);
+
+        if (orientationPortrait) {
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_END, RelativeLayout.TRUE);
+            layoutParams.addRule(RelativeLayout.ABOVE, R.id.bottom_buttons_holder);
+            layoutParams.setMargins(0, 0, size21dp, size20dp);
+        } else if (orientationReverseLandscape) {
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, RelativeLayout.TRUE);
+            layoutParams.addRule(RelativeLayout.END_OF, R.id.bottom_buttons_holder);
+            layoutParams.setMargins(size20dp, 0, 0, size21dp);
+        } else {
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP, RelativeLayout.TRUE);
+            layoutParams.addRule(RelativeLayout.START_OF, R.id.bottom_buttons_holder);
+            layoutParams.setMargins(0, size21dp, size20dp, 0);
+        }
+
+        multiCamera.setLayoutParams(layoutParams);
+        setViewRotation(multiCamera, ui_rotation);
+    }
+
     private void setupFocusSeekBarUI(int rotation, boolean orientationPortrait, boolean orientationReverseLandscape) {
         View focusSeekBarHolder = main_activity.findViewById(R.id.focus_seekbar_holder);
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e383b5eb3..91cd57c7a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -169,10 +169,6 @@
         android:id="@+id/switch_multi_camera"
         android:layout_width="@dimen/onscreen_bottom_button_size"
         android:layout_height="@dimen/onscreen_bottom_button_size"
-        android:layout_alignParentTop="true"
-        android:layout_toStartOf="@id/bottom_buttons_holder"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="21dp"
         android:background="@null"
         android:contentDescription="@string/switch_multi_camera"
         android:onClick="clickedSwitchMultiCamera"
-- 
GitLab


From c910046561cc374b23213421141c40cdd9f97616 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 18 Aug 2022 18:30:10 +0600
Subject: [PATCH 08/10] Fix BottomBarItems placement

---
 .../net/sourceforge/opencamera/ui/MainUI.java | 168 +++++++++++++++++-
 app/src/main/res/layout/activity_main.xml     |  35 +---
 2 files changed, 169 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index 0fdc915b1..b776123b2 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -31,6 +31,11 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+
 import net.sourceforge.opencamera.MainActivity;
 import net.sourceforge.opencamera.MyApplicationInterface;
 import net.sourceforge.opencamera.MyDebug;
@@ -861,7 +866,7 @@ public class MainUI {
     }
 
     private void setUpBottomBarHolderUI(boolean orientationPortrait, boolean orientationReverseLandscape, int navigationBarSideMargin) {
-        View bottomBar = main_activity.findViewById(R.id.bottom_buttons_holder);
+        ConstraintLayout bottomBar = main_activity.findViewById(R.id.bottom_buttons_holder);
         // set up layoutParam
         int bottomBarWidth = orientationPortrait ? ViewGroup.LayoutParams.MATCH_PARENT : ViewGroup.LayoutParams.WRAP_CONTENT;
         int bottomBarHeight = orientationPortrait ? ViewGroup.LayoutParams.WRAP_CONTENT : ViewGroup.LayoutParams.MATCH_PARENT;
@@ -879,6 +884,167 @@ public class MainUI {
         int bottomBarTopPadding = orientationPortrait ? size23dp : size20dp;
         int bottomBarBottomPadding = orientationPortrait ? navigationBarSideMargin : size20dp;
         bottomBar.setPadding(bottomBarLeftPadding, bottomBarTopPadding, bottomBarRightPadding, bottomBarBottomPadding);
+
+        setUpBottomItemsUI(bottomBar, orientationPortrait, orientationReverseLandscape);
+    }
+
+    private void setUpBottomItemsUI(ConstraintLayout bottomHolder, boolean orientationPortrait, boolean orientationReverseLandscape) {
+        ConstraintSet constraintSet = new ConstraintSet();
+        constraintSet.clone(bottomHolder);
+
+        clearAllDynamicBottomBarItemConstraint(constraintSet);
+
+        if (orientationPortrait) {
+            connectPortraitConstraintForBottomItems(constraintSet);
+        } else if (orientationReverseLandscape) {
+            connectReverseLandscapeConstraintForBottomItems(constraintSet);
+        } else {
+            connectLandscapeConstraintForBottomItems(constraintSet);
+        }
+
+        constraintSet.applyTo(bottomHolder);
+    }
+
+    private void clearAllDynamicBottomBarItemConstraint(@NonNull ConstraintSet constraintSet) {
+        clearAllConstraint(constraintSet, R.id.place_holder_view);
+        clearAllConstraint(constraintSet, R.id.gallery);
+        clearAllConstraint(constraintSet, R.id.switch_camera);
+        clearAllConstraint(constraintSet, R.id.pause_video);
+        clearAllConstraint(constraintSet, R.id.switch_video);
+        clearAllConstraint(constraintSet, R.id.take_photo_when_video_recording);
+        clearAllConstraint(constraintSet, R.id.cancel_panorama);
+        clearAllConstraint(constraintSet, R.id.finish_panorama);
+    }
+
+    private void clearAllConstraint(@NonNull ConstraintSet constraintSet, @IdRes int id) {
+        constraintSet.clear(id, ConstraintSet.TOP);
+        constraintSet.clear(id, ConstraintSet.BOTTOM);
+        constraintSet.clear(id, ConstraintSet.START);
+        constraintSet.clear(id, ConstraintSet.END);
+    }
+
+    private void connectConstraintParentTopBottom(@NonNull ConstraintSet constraintSet, @IdRes int id) {
+        constraintSet.connect(id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
+    }
+
+    private void connectConstraintParentStartEnd(@NonNull ConstraintSet constraintSet, @IdRes int id) {
+        constraintSet.connect(id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START);
+        constraintSet.connect(id, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+    }
+
+    private void connectPortraitConstraintForBottomItems(@NonNull ConstraintSet constraintSet) {
+        //placeHolderView
+        connectConstraintParentTopBottom(constraintSet, R.id.place_holder_view);
+        constraintSet.connect(R.id.place_holder_view, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START);
+
+        //gallery
+        connectConstraintParentTopBottom(constraintSet, R.id.gallery);
+        constraintSet.connect(R.id.gallery, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+
+        //switchCamera
+        connectConstraintParentTopBottom(constraintSet, R.id.switch_camera);
+        constraintSet.connect(R.id.switch_camera, ConstraintSet.END, R.id.gallery, ConstraintSet.START);
+        constraintSet.connect(R.id.switch_camera, ConstraintSet.START, R.id.take_photo, ConstraintSet.END);
+
+        //pauseVideo
+        connectConstraintParentTopBottom(constraintSet, R.id.pause_video);
+        constraintSet.connect(R.id.pause_video, ConstraintSet.END, R.id.gallery, ConstraintSet.START);
+        constraintSet.connect(R.id.pause_video, ConstraintSet.START, R.id.take_photo, ConstraintSet.END);
+
+        //switchVideo
+        connectConstraintParentTopBottom(constraintSet, R.id.switch_video);
+        constraintSet.connect(R.id.switch_video, ConstraintSet.END, R.id.take_photo, ConstraintSet.START);
+        constraintSet.connect(R.id.switch_video, ConstraintSet.START, R.id.place_holder_view, ConstraintSet.END);
+
+        //takePhotoOnVideo
+        connectConstraintParentTopBottom(constraintSet, R.id.take_photo_when_video_recording);
+        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.END, R.id.take_photo, ConstraintSet.START);
+        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.START, R.id.place_holder_view, ConstraintSet.END);
+
+        //cancelPanorama
+        connectConstraintParentTopBottom(constraintSet, R.id.cancel_panorama);
+        constraintSet.connect(R.id.cancel_panorama, ConstraintSet.START, R.id.place_holder_center_view, ConstraintSet.END);
+
+        //finishPanorama
+        connectConstraintParentTopBottom(constraintSet, R.id.finish_panorama);
+        constraintSet.connect(R.id.finish_panorama, ConstraintSet.END, R.id.place_holder_center_view, ConstraintSet.START);
+    }
+
+    private void connectReverseLandscapeConstraintForBottomItems(@NonNull ConstraintSet constraintSet) {
+        //placeHolderView
+        connectConstraintParentStartEnd(constraintSet, R.id.place_holder_view);
+        constraintSet.connect(R.id.place_holder_view, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
+
+        //gallery
+        connectConstraintParentStartEnd(constraintSet, R.id.gallery);
+        constraintSet.connect(R.id.gallery, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
+
+        //switchCamera
+        connectConstraintParentStartEnd(constraintSet, R.id.switch_camera);
+        constraintSet.connect(R.id.switch_camera, ConstraintSet.BOTTOM, R.id.gallery, ConstraintSet.TOP);
+        constraintSet.connect(R.id.switch_camera, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+
+        //pauseVideo
+        connectConstraintParentStartEnd(constraintSet, R.id.pause_video);
+        constraintSet.connect(R.id.pause_video, ConstraintSet.BOTTOM, R.id.gallery, ConstraintSet.TOP);
+        constraintSet.connect(R.id.pause_video, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+
+        //switchVideo
+        connectConstraintParentStartEnd(constraintSet, R.id.switch_video);
+        constraintSet.connect(R.id.switch_video, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+        constraintSet.connect(R.id.switch_video, ConstraintSet.TOP, R.id.place_holder_view, ConstraintSet.BOTTOM);
+
+        //takePhotoOnVideo
+        connectConstraintParentStartEnd(constraintSet, R.id.take_photo_when_video_recording);
+        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.TOP, R.id.place_holder_view, ConstraintSet.BOTTOM);
+
+        //cancelPanorama
+        connectConstraintParentStartEnd(constraintSet, R.id.cancel_panorama);
+        constraintSet.connect(R.id.cancel_panorama, ConstraintSet.TOP, R.id.place_holder_center_view, ConstraintSet.BOTTOM);
+
+        //finishPanorama
+        connectConstraintParentStartEnd(constraintSet, R.id.finish_panorama);
+        constraintSet.connect(R.id.finish_panorama, ConstraintSet.BOTTOM, R.id.place_holder_center_view, ConstraintSet.TOP);
+    }
+
+    private void connectLandscapeConstraintForBottomItems(@NonNull ConstraintSet constraintSet) {
+        //placeHolderView
+        connectConstraintParentStartEnd(constraintSet, R.id.place_holder_view);
+        constraintSet.connect(R.id.place_holder_view, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
+
+        //gallery
+        connectConstraintParentStartEnd(constraintSet, R.id.gallery);
+        constraintSet.connect(R.id.gallery, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
+
+        //switchCamera
+        connectConstraintParentStartEnd(constraintSet, R.id.switch_camera);
+        constraintSet.connect(R.id.switch_camera, ConstraintSet.TOP, R.id.gallery, ConstraintSet.BOTTOM);
+        constraintSet.connect(R.id.switch_camera, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+
+        //pauseVideo
+        connectConstraintParentStartEnd(constraintSet, R.id.pause_video);
+        constraintSet.connect(R.id.pause_video, ConstraintSet.TOP, R.id.gallery, ConstraintSet.BOTTOM);
+        constraintSet.connect(R.id.pause_video, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+
+        //switchVideo
+        connectConstraintParentStartEnd(constraintSet, R.id.switch_video);
+        constraintSet.connect(R.id.switch_video, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+        constraintSet.connect(R.id.switch_video, ConstraintSet.BOTTOM, R.id.place_holder_view, ConstraintSet.TOP);
+
+        //takePhotoOnVideo
+        connectConstraintParentStartEnd(constraintSet, R.id.take_photo_when_video_recording);
+        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.BOTTOM, R.id.place_holder_view, ConstraintSet.TOP);
+
+        //cancelPanorama
+        connectConstraintParentStartEnd(constraintSet, R.id.cancel_panorama);
+        constraintSet.connect(R.id.cancel_panorama, ConstraintSet.BOTTOM, R.id.place_holder_center_view, ConstraintSet.TOP);
+
+        //finishPanorama
+        connectConstraintParentStartEnd(constraintSet, R.id.finish_panorama);
+        constraintSet.connect(R.id.finish_panorama, ConstraintSet.TOP, R.id.place_holder_center_view, ConstraintSet.BOTTOM);
     }
 
     /** Wrapper for layoutParams.setMargins, but where the margins are supplied for landscape orientation,
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 91cd57c7a..f013b39e3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,17 +23,14 @@
             android:layout_width="@dimen/onscreen_bottom_button_size"
             android:layout_height="@dimen/onscreen_bottom_button_size"
             android:background="@android:color/transparent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:clickable="false"
             android:focusable="false"
             android:visibility="invisible"/>
 
         <View
             android:id="@+id/place_holder_center_view"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
             android:background="@android:color/transparent"
             android:clickable="false"
             android:focusable="false"
@@ -62,9 +59,6 @@
             android:layout_width="@dimen/onscreen_bottom_button_size"
             android:layout_height="@dimen/onscreen_bottom_button_size"
             android:onClick="clickedGallery"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:src="@drawable/ic_album"
             app:civ_border_color="#40FFFFFF"
             app:civ_border_width="0dp" />
@@ -73,10 +67,6 @@
             android:id="@+id/switch_camera"
             android:layout_width="@dimen/onscreen_bottom_button_size"
             android:layout_height="@dimen/onscreen_bottom_button_size"
-            app:layout_constraintTop_toBottomOf="@id/gallery"
-            app:layout_constraintBottom_toTopOf="@id/take_photo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:background="@null"
             android:contentDescription="@string/switch_to_front_camera"
             android:onClick="clickedSwitchCamera"
@@ -87,10 +77,6 @@
             android:id="@+id/pause_video"
             android:layout_width="@dimen/onscreen_bottom_button_size"
             android:layout_height="@dimen/onscreen_bottom_button_size"
-            app:layout_constraintTop_toBottomOf="@id/gallery"
-            app:layout_constraintBottom_toTopOf="@id/take_photo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:background="@null"
             android:contentDescription="@string/pause_video"
             android:onClick="clickedPauseVideo"
@@ -102,10 +88,6 @@
             android:id="@+id/cancel_panorama"
             android:layout_width="@dimen/onscreen_bottom_panorama_button_size"
             android:layout_height="@dimen/onscreen_bottom_panorama_button_size"
-            app:layout_constraintBottom_toTopOf="@id/place_holder_center_view"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginBottom="13dp"
             android:background="@null"
             android:contentDescription="@string/cancel_panorama"
             android:onClick="clickedCancelPanorama"
@@ -117,10 +99,6 @@
             android:id="@+id/finish_panorama"
             android:layout_width="@dimen/onscreen_bottom_panorama_button_size"
             android:layout_height="@dimen/onscreen_bottom_panorama_button_size"
-            app:layout_constraintTop_toBottomOf="@id/place_holder_center_view"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="13dp"
             android:background="@null"
             android:contentDescription="@string/finish_panorama"
             android:onClick="clickedFinishPanorama"
@@ -132,10 +110,6 @@
             android:id="@+id/switch_video"
             android:layout_width="@dimen/onscreen_bottom_button_size"
             android:layout_height="@dimen/onscreen_bottom_button_size"
-            app:layout_constraintBottom_toTopOf="@id/place_holder_view"
-            app:layout_constraintTop_toBottomOf="@id/take_photo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:background="@null"
             android:contentDescription="@string/switch_to_video"
             android:onClick="clickedSwitchVideo"
@@ -146,10 +120,6 @@
             android:id="@+id/take_photo_when_video_recording"
             android:layout_width="@dimen/onscreen_bottom_button_size"
             android:layout_height="@dimen/onscreen_bottom_button_size"
-            app:layout_constraintBottom_toTopOf="@id/place_holder_view"
-            app:layout_constraintTop_toBottomOf="@id/take_photo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:background="@null"
             android:contentDescription="@string/take_photo"
             android:onClick="clickedTakePhotoVideoSnapshot"
@@ -164,7 +134,6 @@
         android:layout_height="wrap_content"
         android:background="@color/navigation_background"/>
 
-
     <ImageButton
         android:id="@+id/switch_multi_camera"
         android:layout_width="@dimen/onscreen_bottom_button_size"
-- 
GitLab


From 12599a50d17993e4bdb9ce48f7972d6be15b73e5 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 18 Aug 2022 19:11:26 +0600
Subject: [PATCH 09/10] Update zoom seekbar margin

---
 app/src/main/res/layout/activity_main.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f013b39e3..fb6866eeb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -202,7 +202,7 @@
         android:gravity="center"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="-200dp">
+        android:layout_marginBottom="-300dp">
 
         <ImageView
             android:id="@+id/zoom_seekbar_icon"
-- 
GitLab


From f221a17c97ef79bfa661c98e12fcd9947903b721 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 18 Aug 2022 19:33:36 +0600
Subject: [PATCH 10/10] Refactor code

---
 .../net/sourceforge/opencamera/ui/MainUI.java | 164 ++++++++++--------
 1 file changed, 96 insertions(+), 68 deletions(-)

diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index b776123b2..136d0f738 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -828,11 +828,10 @@ public class MainUI {
     }
 
     private void setUpZoomControlUI(int rotation, boolean orientationPortrait, boolean orientationReverseLandscape) {
-        View zoom = main_activity.findViewById(R.id.zoom);
-        int width = (int) ScaleUtils.convertDpToPx(main_activity, 112.0f);
-        int height = (int) ScaleUtils.convertDpToPx(main_activity, 38.0f);
         int margin = (int) ScaleUtils.convertDpToPx(main_activity, 60.0f);
-        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
+
+        View zoom = main_activity.findViewById(R.id.zoom);
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(zoom.getLayoutParams().width, zoom.getLayoutParams().height);
 
         if (orientationPortrait) {
             layoutParams.addRule(RelativeLayout.BELOW, R.id.top_bg);
@@ -853,14 +852,13 @@ public class MainUI {
     }
 
     private View setUpTopBarHolderUI(boolean orientationPortrait, boolean orientationReverseLandscape, int topButtonSize) {
-        View topBar = main_activity.findViewById(R.id.top_bg);
         int width = orientationPortrait ? ViewGroup.LayoutParams.MATCH_PARENT : topButtonSize;
         int height = orientationPortrait ? topButtonSize : ViewGroup.LayoutParams.MATCH_PARENT;
-        RelativeLayout.LayoutParams topBarLayoutParams = new RelativeLayout.LayoutParams(width, height);
-
         int topBarAlignment = orientationPortrait ? RelativeLayout.ALIGN_PARENT_TOP : (orientationReverseLandscape ? RelativeLayout.ALIGN_PARENT_END : RelativeLayout.ALIGN_PARENT_START);
-        topBarLayoutParams.addRule(topBarAlignment, RelativeLayout.TRUE);
 
+        View topBar = main_activity.findViewById(R.id.top_bg);
+        RelativeLayout.LayoutParams topBarLayoutParams = new RelativeLayout.LayoutParams(width, height);
+        topBarLayoutParams.addRule(topBarAlignment, RelativeLayout.TRUE);
         topBar.setLayoutParams(topBarLayoutParams);
         return topBar;
     }
@@ -934,117 +932,147 @@ public class MainUI {
     }
 
     private void connectPortraitConstraintForBottomItems(@NonNull ConstraintSet constraintSet) {
+        int id;
+
         //placeHolderView
-        connectConstraintParentTopBottom(constraintSet, R.id.place_holder_view);
-        constraintSet.connect(R.id.place_holder_view, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START);
+        id = R.id.place_holder_view;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START);
 
         //gallery
-        connectConstraintParentTopBottom(constraintSet, R.id.gallery);
-        constraintSet.connect(R.id.gallery, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+        id = R.id.gallery;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
 
         //switchCamera
-        connectConstraintParentTopBottom(constraintSet, R.id.switch_camera);
-        constraintSet.connect(R.id.switch_camera, ConstraintSet.END, R.id.gallery, ConstraintSet.START);
-        constraintSet.connect(R.id.switch_camera, ConstraintSet.START, R.id.take_photo, ConstraintSet.END);
+        id = R.id.switch_camera;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.END, R.id.gallery, ConstraintSet.START);
+        constraintSet.connect(id, ConstraintSet.START, R.id.take_photo, ConstraintSet.END);
 
         //pauseVideo
-        connectConstraintParentTopBottom(constraintSet, R.id.pause_video);
-        constraintSet.connect(R.id.pause_video, ConstraintSet.END, R.id.gallery, ConstraintSet.START);
-        constraintSet.connect(R.id.pause_video, ConstraintSet.START, R.id.take_photo, ConstraintSet.END);
+        id = R.id.pause_video;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.END, R.id.gallery, ConstraintSet.START);
+        constraintSet.connect(id, ConstraintSet.START, R.id.take_photo, ConstraintSet.END);
 
         //switchVideo
-        connectConstraintParentTopBottom(constraintSet, R.id.switch_video);
-        constraintSet.connect(R.id.switch_video, ConstraintSet.END, R.id.take_photo, ConstraintSet.START);
-        constraintSet.connect(R.id.switch_video, ConstraintSet.START, R.id.place_holder_view, ConstraintSet.END);
+        id = R.id.switch_video;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.END, R.id.take_photo, ConstraintSet.START);
+        constraintSet.connect(id, ConstraintSet.START, R.id.place_holder_view, ConstraintSet.END);
 
         //takePhotoOnVideo
-        connectConstraintParentTopBottom(constraintSet, R.id.take_photo_when_video_recording);
-        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.END, R.id.take_photo, ConstraintSet.START);
-        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.START, R.id.place_holder_view, ConstraintSet.END);
+        id = R.id.take_photo_when_video_recording;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.END, R.id.take_photo, ConstraintSet.START);
+        constraintSet.connect(id, ConstraintSet.START, R.id.place_holder_view, ConstraintSet.END);
 
         //cancelPanorama
-        connectConstraintParentTopBottom(constraintSet, R.id.cancel_panorama);
-        constraintSet.connect(R.id.cancel_panorama, ConstraintSet.START, R.id.place_holder_center_view, ConstraintSet.END);
+        id = R.id.cancel_panorama;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.START, R.id.place_holder_center_view, ConstraintSet.END);
 
         //finishPanorama
-        connectConstraintParentTopBottom(constraintSet, R.id.finish_panorama);
-        constraintSet.connect(R.id.finish_panorama, ConstraintSet.END, R.id.place_holder_center_view, ConstraintSet.START);
+        id = R.id.finish_panorama;
+        connectConstraintParentTopBottom(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.END, R.id.place_holder_center_view, ConstraintSet.START);
     }
 
     private void connectReverseLandscapeConstraintForBottomItems(@NonNull ConstraintSet constraintSet) {
+        int id;
+
         //placeHolderView
-        connectConstraintParentStartEnd(constraintSet, R.id.place_holder_view);
-        constraintSet.connect(R.id.place_holder_view, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
+        id = R.id.place_holder_view;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
 
         //gallery
-        connectConstraintParentStartEnd(constraintSet, R.id.gallery);
-        constraintSet.connect(R.id.gallery, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
+        id = R.id.gallery;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
 
         //switchCamera
-        connectConstraintParentStartEnd(constraintSet, R.id.switch_camera);
-        constraintSet.connect(R.id.switch_camera, ConstraintSet.BOTTOM, R.id.gallery, ConstraintSet.TOP);
-        constraintSet.connect(R.id.switch_camera, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+        id = R.id.switch_camera;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.gallery, ConstraintSet.TOP);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
 
         //pauseVideo
-        connectConstraintParentStartEnd(constraintSet, R.id.pause_video);
-        constraintSet.connect(R.id.pause_video, ConstraintSet.BOTTOM, R.id.gallery, ConstraintSet.TOP);
-        constraintSet.connect(R.id.pause_video, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+        id = R.id.pause_video;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.gallery, ConstraintSet.TOP);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
 
         //switchVideo
-        connectConstraintParentStartEnd(constraintSet, R.id.switch_video);
-        constraintSet.connect(R.id.switch_video, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
-        constraintSet.connect(R.id.switch_video, ConstraintSet.TOP, R.id.place_holder_view, ConstraintSet.BOTTOM);
+        id = R.id.switch_video;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.place_holder_view, ConstraintSet.BOTTOM);
 
         //takePhotoOnVideo
-        connectConstraintParentStartEnd(constraintSet, R.id.take_photo_when_video_recording);
-        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
-        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.TOP, R.id.place_holder_view, ConstraintSet.BOTTOM);
+        id = R.id.take_photo_when_video_recording;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.place_holder_view, ConstraintSet.BOTTOM);
 
         //cancelPanorama
-        connectConstraintParentStartEnd(constraintSet, R.id.cancel_panorama);
-        constraintSet.connect(R.id.cancel_panorama, ConstraintSet.TOP, R.id.place_holder_center_view, ConstraintSet.BOTTOM);
+        id = R.id.cancel_panorama;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.place_holder_center_view, ConstraintSet.BOTTOM);
 
         //finishPanorama
-        connectConstraintParentStartEnd(constraintSet, R.id.finish_panorama);
-        constraintSet.connect(R.id.finish_panorama, ConstraintSet.BOTTOM, R.id.place_holder_center_view, ConstraintSet.TOP);
+        id = R.id.finish_panorama;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.place_holder_center_view, ConstraintSet.TOP);
     }
 
     private void connectLandscapeConstraintForBottomItems(@NonNull ConstraintSet constraintSet) {
+        int id;
+
         //placeHolderView
-        connectConstraintParentStartEnd(constraintSet, R.id.place_holder_view);
-        constraintSet.connect(R.id.place_holder_view, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
+        id = R.id.place_holder_view;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM);
 
         //gallery
-        connectConstraintParentStartEnd(constraintSet, R.id.gallery);
-        constraintSet.connect(R.id.gallery, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
+        id = R.id.gallery;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP);
 
         //switchCamera
-        connectConstraintParentStartEnd(constraintSet, R.id.switch_camera);
-        constraintSet.connect(R.id.switch_camera, ConstraintSet.TOP, R.id.gallery, ConstraintSet.BOTTOM);
-        constraintSet.connect(R.id.switch_camera, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+        id = R.id.switch_camera;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.gallery, ConstraintSet.BOTTOM);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
 
         //pauseVideo
-        connectConstraintParentStartEnd(constraintSet, R.id.pause_video);
-        constraintSet.connect(R.id.pause_video, ConstraintSet.TOP, R.id.gallery, ConstraintSet.BOTTOM);
-        constraintSet.connect(R.id.pause_video, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
+        id = R.id.pause_video;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.gallery, ConstraintSet.BOTTOM);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.take_photo, ConstraintSet.TOP);
 
         //switchVideo
-        connectConstraintParentStartEnd(constraintSet, R.id.switch_video);
-        constraintSet.connect(R.id.switch_video, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
-        constraintSet.connect(R.id.switch_video, ConstraintSet.BOTTOM, R.id.place_holder_view, ConstraintSet.TOP);
+        id = R.id.switch_video;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.place_holder_view, ConstraintSet.TOP);
 
         //takePhotoOnVideo
-        connectConstraintParentStartEnd(constraintSet, R.id.take_photo_when_video_recording);
-        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
-        constraintSet.connect(R.id.take_photo_when_video_recording, ConstraintSet.BOTTOM, R.id.place_holder_view, ConstraintSet.TOP);
+        id = R.id.take_photo_when_video_recording;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.take_photo, ConstraintSet.BOTTOM);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.place_holder_view, ConstraintSet.TOP);
 
         //cancelPanorama
-        connectConstraintParentStartEnd(constraintSet, R.id.cancel_panorama);
-        constraintSet.connect(R.id.cancel_panorama, ConstraintSet.BOTTOM, R.id.place_holder_center_view, ConstraintSet.TOP);
+        id = R.id.cancel_panorama;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.BOTTOM, R.id.place_holder_center_view, ConstraintSet.TOP);
 
         //finishPanorama
-        connectConstraintParentStartEnd(constraintSet, R.id.finish_panorama);
-        constraintSet.connect(R.id.finish_panorama, ConstraintSet.TOP, R.id.place_holder_center_view, ConstraintSet.BOTTOM);
+        id = R.id.finish_panorama;
+        connectConstraintParentStartEnd(constraintSet, id);
+        constraintSet.connect(id, ConstraintSet.TOP, R.id.place_holder_center_view, ConstraintSet.BOTTOM);
     }
 
     /** Wrapper for layoutParams.setMargins, but where the margins are supplied for landscape orientation,
-- 
GitLab