Merge pull request #3571 from nextcloud/linkOnFolder

Overflow menu on sharing of folders

build.gradle

@@ -235,6 +235,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
     implementation 'com.github.tobiaskaminsky:qrcodescanner:0.1.2.2' // 'com.github.blikoon:QRCodeScanner:0.1.2'
+    implementation 'com.google.android:flexbox:1.1.0'
 
     implementation 'org.parceler:parceler-api:1.1.12'
     annotationProcessor 'org.parceler:parceler:1.1.12'

src/main/res/layout/file_details_sharing_fragment.xml

@@ -18,6 +18,7 @@
   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="1">
@@ -47,52 +48,64 @@
             android:layout_marginBottom="@dimen/standard_half_margin"
             android:orientation="horizontal"
             android:paddingLeft="@dimen/standard_padding"
-            android:paddingRight="@dimen/standard_padding"
-            android:paddingTop="@dimen/standard_padding">
+            android:paddingTop="@dimen/standard_padding"
+            android:paddingRight="@dimen/standard_padding">
 
-            <androidx.appcompat.widget.AppCompatCheckBox
-                android:id="@+id/share_by_link"
+            <com.google.android.flexbox.FlexboxLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/share_via_link_section_title"/>
-
-            <ImageView
-                android:id="@+id/share_link_copy_icon"
-                android:layout_width="0dp"
-                android:layout_height="32dp"
-                android:paddingEnd="@dimen/standard_eighth_margin"
-                android:paddingLeft="@dimen/standard_half_margin"
-                android:paddingRight="@dimen/standard_eighth_margin"
-                android:paddingStart="@dimen/standard_half_margin"
-                android:paddingTop="@dimen/standard_quarter_margin"
                 android:layout_weight="1"
-                android:contentDescription="@string/copy_link"
-                android:paddingBottom="@dimen/standard_quarter_margin"
-                android:scaleType="fitStart"
-                android:src="@drawable/ic_content_copy"
-                android:layout_gravity="start|center" />
-
-            <androidx.appcompat.widget.AppCompatCheckBox
-                android:id="@+id/share_by_link_allow_editing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:textSize="16sp"
-                android:text="@string/edit_permission_label" />
+                android:orientation="horizontal"
+                app:alignContent="stretch"
+                app:alignItems="stretch"
+                app:flexWrap="wrap">
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/share_by_link"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/share_via_link_section_title" />
+
+                <ImageView
+                    android:id="@+id/share_link_copy_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="32dp"
+                    android:layout_gravity="start|center"
+                    android:layout_weight="1"
+                    android:contentDescription="@string/copy_link"
+                    android:paddingStart="@dimen/standard_half_margin"
+                    android:paddingLeft="@dimen/standard_half_margin"
+                    android:paddingTop="@dimen/standard_quarter_margin"
+                    android:paddingEnd="@dimen/standard_eighth_margin"
+                    android:paddingRight="@dimen/standard_eighth_margin"
+                    android:paddingBottom="@dimen/standard_quarter_margin"
+                    android:scaleType="fitStart"
+                    android:src="@drawable/ic_content_copy" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/share_by_link_allow_editing"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:ellipsize="middle"
+                    android:text="@string/edit_permission_label"
+                    android:textSize="16sp" />
+            </com.google.android.flexbox.FlexboxLayout>
 
             <ImageView
                 android:id="@+id/overflow_menu_share_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center"
-                android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_marginStart="@dimen/standard_half_margin"
+                android:layout_marginLeft="@dimen/standard_half_margin"
+                android:layout_weight="0"
                 android:contentDescription="@string/overflow_menu"
-                android:paddingEnd="@dimen/zero"
+                android:paddingStart="@dimen/standard_half_padding"
                 android:paddingLeft="@dimen/standard_half_padding"
+                android:paddingEnd="@dimen/zero"
                 android:paddingRight="@dimen/zero"
-                android:paddingStart="@dimen/standard_half_padding"
                 android:src="@drawable/ic_dots_vertical" />
         </LinearLayout>