Modify share file layout in order to sort 'Share link' settings

This commit is contained in:
jabarros 2016-04-26 12:54:58 +02:00 committed by David A. Velasco
parent aabdcaa04a
commit d387df5ff6

View file

@ -85,7 +85,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/standard_padding">
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"
android:paddingTop="@dimen/standard_padding"
>
<TextView
android:id="@+id/shareWithUsersSectionTitle"
@ -130,7 +133,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/standard_padding">
android:paddingBottom="@dimen/standard_padding"
android:paddingLeft="@dimen/standard_padding"
android:paddingRight="@dimen/standard_padding"
>
<android.support.v7.widget.SwitchCompat
android:id="@+id/shareViaLinkSectionSwitch"
@ -144,52 +150,42 @@
android:text="@string/share_via_link_section_title"
android:textColor="@color/color_accent"/>
<RelativeLayout
android:id="@+id/shareViaLinkExpirationSection"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_half_margin"
android:orientation="vertical"
android:layout_marginTop="@dimen/standard_half_margin">
<RelativeLayout
android:id="@+id/shareViaLinkEditPermissionSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_marginBottom="@dimen/standard_half_margin"
>
<android.support.v7.widget.SwitchCompat
android:id="@+id/shareViaLinkExpirationSwitch"
android:id="@+id/shareViaLinkEditPermissionSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:checked="false"
android:padding="@dimen/standard_half_padding"/>
<TextView
android:id="@+id/shareViaLinkExpirationLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
android:paddingLeft="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_half_padding"
android:paddingTop="@dimen/standard_half_padding"
android:text="@string/share_via_link_expiration_date_label"
android:textColor="@color/black"
android:textSize="14sp"
android:layout_centerInParent="true"
android:padding="@dimen/standard_half_padding"
/>
<TextView
android:id="@+id/shareViaLinkExpirationValue"
android:id="@+id/shareViaLinkEditPermissionLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/shareViaLinkExpirationLabel"
android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
android:paddingBottom="@dimen/standard_half_padding"
android:paddingLeft="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_half_padding"
android:textSize="12sp"
android:layout_toLeftOf="@id/shareViaLinkEditPermissionSwitch"
android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
android:padding="@dimen/standard_half_padding"
android:text="@string/share_via_link_edit_permission_label"
android:textColor="@color/black"
android:textSize="14sp"
/>
</RelativeLayout>
@ -246,38 +242,52 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/shareViaLinkEditPermissionSection"
android:id="@+id/shareViaLinkExpirationSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
>
<android.support.v7.widget.SwitchCompat
android:id="@+id/shareViaLinkEditPermissionSwitch"
android:id="@+id/shareViaLinkExpirationSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:padding="@dimen/standard_half_padding"
/>
android:layout_alignParentTop="true"
android:checked="false"
android:padding="@dimen/standard_half_padding"/>
<TextView
android:id="@+id/shareViaLinkEditPermissionLabel"
android:id="@+id/shareViaLinkExpirationLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@id/shareViaLinkEditPermissionSwitch"
android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
android:paddingLeft="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_half_padding"
android:paddingTop="@dimen/standard_half_padding"
android:text="@string/share_via_link_edit_permission_label"
android:text="@string/share_via_link_expiration_date_label"
android:textColor="@color/black"
android:textSize="14sp"
/>
<TextView
android:id="@+id/shareViaLinkExpirationValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/shareViaLinkExpirationLabel"
android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
android:paddingBottom="@dimen/standard_half_padding"
android:paddingLeft="@dimen/standard_half_padding"
android:paddingRight="@dimen/standard_half_padding"
android:textSize="12sp"
/>
</RelativeLayout>
<android.support.v7.widget.AppCompatButton
@ -294,4 +304,6 @@
</LinearLayout>
</LinearLayout>
</ScrollView>