Browse Source

Fix layout

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 1 năm trước cách đây
mục cha
commit
561f73fe20

+ 21 - 11
app/src/main/res/layout/upload_list_header.xml

@@ -2,6 +2,7 @@
 <!--
   ~ Nextcloud - Android Client
   ~
+  ~ SPDX-FileCopyrightText: 2024 Jonas Mayer
   ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
   ~ SPDX-FileCopyrightText: 2018 Tobias Kaminsky <tobias@kaminsky.me>
   ~ SPDX-FileCopyrightText: 2018 Nextcloud
@@ -14,27 +15,36 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/upload_list_state"
-        android:layout_width="wrap_content"
+    <FrameLayout
+        android:id="@+id/upload_list_state_layout"
+        android:layout_width="@dimen/upload_list_item_frame_layout_width"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:contentDescription="@string/delete_entries"
-        android:paddingStart="@dimen/zero"
-        android:paddingTop="@dimen/standard_half_padding"
-        android:paddingEnd="@dimen/standard_half_padding"
         android:paddingBottom="@dimen/standard_half_padding"
-        android:src="@drawable/ic_expand_less" />
+        android:paddingTop="@dimen/standard_half_padding"
+        android:focusable="false"
+        android:layout_alignParentStart="true"
+        android:focusableInTouchMode="false">
+
+        <ImageView
+            android:id="@+id/upload_list_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:contentDescription="@string/upload_list_expand_header"
+            android:src="@drawable/ic_expand_less" />
+    </FrameLayout>
 
     <TextView
         android:id="@+id/upload_list_title"
         style="@style/TextAppearance.AppCompat.Body2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/upload_list_state"
+        android:layout_toEndOf="@id/upload_list_state_layout"
         android:layout_toStartOf="@id/upload_list_action"
         android:ellipsize="middle"
-        android:padding="@dimen/standard_half_padding"
+        android:gravity="center_vertical"
+        android:paddingTop="@dimen/standard_half_padding"
+        android:paddingBottom="@dimen/standard_half_padding"
         android:textColor="@color/color_accent"
         tools:text="Current (2)" />
 

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -899,6 +899,7 @@
     <string name="upload_quota_exceeded">Storage quota exceeded</string>
     <string name="host_not_available">Server not available</string>
     <string name="delete_entries">Delete entries</string>
+    <string name="upload_list_expand_header">Toggle expansion of header</string>
     <string name="upload_action_failed_retry">Retry failed uploads</string>
     <string name="upload_action_failed_clear">Clear failed uploads</string>
     <string name="upload_action_global_upload_pause">Pause all uploads</string>