From 1caabc2554193c5c034961a474c9bcb27f51ec9f Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Sun, 10 Apr 2022 15:53:08 +0200
Subject: [PATCH] Fix explorer layouts

---
 .../layout/adapter_explorer_element_grid.xml  | 28 +--------------
 .../layout/adapter_explorer_element_list.xml  | 36 +++----------------
 .../res/layout/explorer_element_details.xml   | 31 ++++++++++++++++
 3 files changed, 37 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/res/layout/explorer_element_details.xml

diff --git a/app/src/main/res/layout/adapter_explorer_element_grid.xml b/app/src/main/res/layout/adapter_explorer_element_grid.xml
index 1accf31..28c10c1 100644
--- a/app/src/main/res/layout/adapter_explorer_element_grid.xml
+++ b/app/src/main/res/layout/adapter_explorer_element_grid.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -25,32 +24,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/text_element_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/adapter_text_size"/>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_gravity="bottom">
-
-                <TextView
-                    android:id="@+id/text_element_mtime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/details_text_size"
-                    android:layout_marginEnd="7dp"/>
-
-                <TextView
-                    android:id="@+id/text_element_size"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/details_text_size"/>
-
-            </LinearLayout>
+            <include layout="@layout/explorer_element_details"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/adapter_explorer_element_list.xml b/app/src/main/res/layout/adapter_explorer_element_list.xml
index 5d4a796..7eeec8e 100644
--- a/app/src/main/res/layout/adapter_explorer_element_list.xml
+++ b/app/src/main/res/layout/adapter_explorer_element_list.xml
@@ -1,53 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/selectable_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground">
 
         <ImageView
             android:id="@+id/icon_element"
             android:layout_width="50dp"
-            android:layout_height="50dp"/>
+            android:layout_height="50dp"
+            android:layout_gravity="center_vertical"/>
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="3dp"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/text_element_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/adapter_text_size"/>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_gravity="bottom">
-
-                <TextView
-                    android:id="@+id/text_element_mtime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/details_text_size"
-                    android:layout_marginEnd="7dp"/>
-
-                <TextView
-                    android:id="@+id/text_element_size"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/details_text_size"/>
-
-            </LinearLayout>
-
+            <include layout="@layout/explorer_element_details"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/explorer_element_details.xml b/app/src/main/res/layout/explorer_element_details.xml
new file mode 100644
index 0000000..7cc1d6b
--- /dev/null
+++ b/app/src/main/res/layout/explorer_element_details.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <TextView
+        android:id="@+id/text_element_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/adapter_text_size"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="bottom">
+
+        <TextView
+            android:id="@+id/text_element_mtime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/details_text_size"
+            android:layout_marginEnd="7dp"/>
+
+        <TextView
+            android:id="@+id/text_element_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/details_text_size"/>
+
+    </LinearLayout>
+
+</merge>
\ No newline at end of file