From 4a79c862fbf97bb4ba301ecce55ea99d13a25c9c Mon Sep 17 00:00:00 2001
From: Sanimys <36693490+Sanimys@users.noreply.github.com>
Date: Thu, 21 May 2020 21:40:27 +0200
Subject: [PATCH] Move crop button (#197)

* Moved the crop button so that it doesn't take space in the activity

* Semi transparent in the middle, same position than the image

Co-authored-by: Joachim Dunant <joachim.dunant@epfl.ch>
---
 .../main/res/layout/content_photo_edit.xml    | 102 +++++++++++-------
 1 file changed, 66 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/layout/content_photo_edit.xml b/app/src/main/res/layout/content_photo_edit.xml
index c32c97b9..f3ad48d3 100644
--- a/app/src/main/res/layout/content_photo_edit.xml
+++ b/app/src/main/res/layout/content_photo_edit.xml
@@ -1,46 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+
+<androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".PhotoEditActivity"
-    tools:showIn="@layout/activity_photo_edit"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <ImageView
-        android:id="@+id/image_preview"
+    <LinearLayout
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight=".70"
-        android:scaleType="centerInside" />
+        android:layout_height="match_parent"
+        tools:context=".PhotoEditActivity"
+        tools:showIn="@layout/activity_photo_edit"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        >
+
+        <ImageView
+            android:id="@+id/image_preview"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight=".70"
+            android:scaleType="centerInside" />
+
+        <com.h.pixeldroid.utils.NonSwipeableViewPager
+            android:id="@+id/viewPager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight=".22" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            app:tabGravity="fill"
+            app:tabMode="fixed"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight=".08"/>
+
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/left_guideline"
+        app:layout_constraintGuide_percent=".15"
+        android:orientation="vertical"/>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/right_guideline"
+        app:layout_constraintGuide_percent=".85"
+        android:orientation="vertical"/>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/bottom_guideline"
+        app:layout_constraintGuide_percent=".7"
+        android:orientation="horizontal"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/cropImageButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_crop_black_24dp" />
-
-    <com.h.pixeldroid.utils.NonSwipeableViewPager
-        android:id="@+id/viewPager"
-        android:layout_above="@+id/tabs"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:layout_below="@+id/image_preview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight=".22" />
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tabs"
-        app:tabGravity="fill"
-        app:tabMode="fixed"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight=".08"/>
-
-</LinearLayout>
\ No newline at end of file
+        android:layout_marginTop="411dp"
+        android:backgroundTint="#FFFFFFFF"
+        android:src="@drawable/ic_crop_black_24dp"
+        app:layout_constraintLeft_toLeftOf="@+id/left_guideline"
+        app:layout_constraintRight_toRightOf="@+id/right_guideline"
+        app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file