commit 539e8b861b4f34564ad75a65acae995178ab6acb
author Sebastiano Barezzi <barezzisebastiano@gmail.com> Thu Aug 11 23:30:04 2022 +0200
committer LuK1337 <priv.luk@gmail.com> Thu Sep 29 22:28:28 2022 +0200
tree e629c085dc7732db25b8d7791c0bf9ee7a016323
parent 957dcbdf3a7acd6572e5686b3e50705a05f85a16

Aperture: Move top bar below preview view

Change-Id: Ic6b1045b39b83c5e1ce8d0cb6c606df667881546

app/src/main/java/org/lineageos/aperture/MainActivity.kt

diff --git a/app/src/main/java/org/lineageos/aperture/MainActivity.kt b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
index d36873d..8985d5a 100644
--- a/app/src/main/java/org/lineageos/aperture/MainActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/MainActivity.kt
@@ -267,7 +267,7 @@
         viewFinder.setOnClickListener { view ->
             viewFinderTouchEvent?.let {
                 viewFinderFocus.x = it.x - (viewFinderFocus.width / 2)
-                viewFinderFocus.y = it.y + (viewFinderFocus.height / 2)
+                viewFinderFocus.y = it.y - (viewFinderFocus.height / 2)
             } ?: run {
                 viewFinderFocus.x = (view.width - viewFinderFocus.width) / 2f
                 viewFinderFocus.y = (view.height - viewFinderFocus.height) / 2f

app/src/main/res/layout/activity_main.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0c2723d..0340d91 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,9 +16,9 @@
         android:paddingTop="8dp"
         android:paddingEnd="16dp"
         android:paddingBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/bottomButtonsLayout"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintStart_toStartOf="parent">
 
         <ImageButton
             android:id="@+id/timerButton"
@@ -126,10 +126,10 @@
         android:id="@+id/viewFinder"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/bottomButtonsLayout"
+        app:layout_constraintBottom_toTopOf="@+id/topButtonsLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/topButtonsLayout"
+        app:layout_constraintTop_toTopOf="parent"
         app:scaleType="fitCenter" />
 
     <ImageView
@@ -198,8 +198,7 @@
         android:layout_height="120dp"
         app:layout_constraintBottom_toTopOf="@+id/mode_selector_layout"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/viewFinder">
+        app:layout_constraintStart_toStartOf="parent">
 
         <ImageButton
             android:id="@+id/shutterButton"