Revert "Remove optional navbarcheck"

This reverts commit 677c80ee4b0e2cdac24e86209ff5604dd02af133.

app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt

@@ -33,6 +33,7 @@ import androidx.core.graphics.drawable.DrawableCompat
 import com.canhub.cropper.CropImageView
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.utils.extensions.getParcelableArgument
+import com.nextcloud.utils.extensions.hasNavBar
 import com.nextcloud.utils.extensions.navBarHeight
 import com.nextcloud.utils.extensions.shiftUp
 import com.owncloud.android.R
@@ -102,7 +103,10 @@ class EditImageActivity :
         }
 
         setupCropper()
-        shiftLayout()
+
+        if (resources.hasNavBar()) {
+            shiftLayout()
+        }
     }
 
     private fun shiftLayout() {

app/src/main/java/com/nextcloud/utils/extensions/ResourcesExtensions.kt

@@ -34,3 +34,12 @@ fun Resources.navBarHeight(): Int {
         0
     }
 }
+
+/**
+ * This method only works in real device
+ */
+@SuppressLint("DiscouragedApi")
+fun Resources.hasNavBar(): Boolean {
+    val id = getIdentifier("config_showNavigationBar", "bool", "android")
+    return id > 0 && getBoolean(id)
+}

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

@@ -18,11 +18,9 @@
  You should have received a copy of the GNU Affero General Public License
  along with this program. If not, see <https://www.gnu.org/licenses/>.
 -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:orientation="vertical"
     android:layout_height="match_parent"
     android:background="@color/black">
 
@@ -33,27 +31,33 @@
         android:background="@color/black"
         android:elevation="4dp"
         android:minHeight="?attr/actionBarSize"
-        android:theme="@style/Theme.ownCloud.Toolbar.AppWidgetContainer" />
+        android:theme="@style/Theme.ownCloud.Toolbar.AppWidgetContainer"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.canhub.cropper.CropImageView
         android:id="@+id/cropImageView"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"/>
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_margin="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
 
     <LinearLayout
         android:id="@+id/edit_buttons_layout"
-        android:layout_gravity="center"
         android:layout_width="wrap_content"
-        android:gravity="center_vertical"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         android:background="@drawable/rounded_rect"
         android:backgroundTint="@color/grey_900"
         android:elevation="4dp"
         android:orientation="horizontal"
         android:paddingLeft="8dp"
-        android:paddingRight="8dp">
+        android:paddingRight="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <ImageButton
             android:id="@+id/rotate_left"
@@ -105,4 +109,4 @@
             app:srcCompat="@drawable/outline_flip_24"
             app:tint="@color/white" />
     </LinearLayout>
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>