fixed cherry picked new details

res/layout/file_details_fragment.xml

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2015  ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:card_view="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/card_view"
-        android:layout_gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        card_view:cardCornerRadius="3dp"
-        card_view:cardUseCompatPadding="true">
-
-        <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/fdScrollView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:fillViewport="true">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <RelativeLayout
-                    android:id="@+id/fdFileHeaderContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="150dp"
-                    android:background="@color/owncloud_blue_dark_transparent">
-
-                    <ImageView
-                        android:id="@+id/fdHeaderImage"
-                        android:layout_width="72dp"
-                        android:layout_height="72dp"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/file"/>
-
-                    <LinearLayout
-                        android:id="@+id/fdTitleLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentBottom="true"
-                        android:background="@color/owncloud_blue_transparent">
-                        <ImageView
-                            android:id="@+id/fdIcon"
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:src="@drawable/file"
-                            android:layout_marginLeft="8dp"
-                            android:layout_gravity="center_vertical"/>
-
-                        <TextView
-                            android:id="@+id/fdFilename"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/placeholder_filename"
-                            android:textSize="24sp"
-                            android:textColor="@color/white"
-                            android:layout_marginLeft="8dp"
-                            android:layout_gravity="center_vertical"/>
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/list_divider_background"/>
-
-                <TableLayout
-                    android:id="@+id/fdDetailsTable"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginBottom="8dp">
-
-                    <TableRow
-                        android:id="@+id/fdTypeRow"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="5dip"
-                        android:layout_marginTop="20dp">
-
-                        <TextView
-                            android:id="@+id/fdTypeLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/filedetails_type"
-                            android:textSize="16sp" />
-                        <TextView
-                            android:id="@+id/fdType"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/placeholder_filetype"
-                            android:textSize="16sp"
-                            android:layout_marginLeft="4dp" />
-
-                    </TableRow>
-                    <TableRow
-                        android:id="@+id/fdSizeRow"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="5dp"
-                        android:layout_marginTop="12dp">
-                        <TextView
-                            android:id="@+id/fdSizeLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/filedetails_size"
-                            android:textSize="16sp"/>
-                        <TextView
-                            android:id="@+id/fdSize"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/placeholder_filesize"
-                            android:textSize="16sp"
-                            android:layout_marginLeft="4dp" />
-
-                    </TableRow>
-                    <TableRow
-                        android:id="@+id/fdCreatedRow"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="5dp"
-                        android:layout_marginTop="12dp"
-                        android:visibility="gone">
-                        <TextView
-                            android:id="@+id/fdCreatedLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/filedetails_created"
-                            android:textSize="16sp" />
-                        <TextView
-                            android:id="@+id/fdCreated"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/placeholder_timestamp"
-                            android:textSize="16sp"
-                            android:layout_marginLeft="4dp" />
-
-                    </TableRow>
-                    <TableRow
-                        android:id="@+id/fdModifiedRow"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="5dp"
-                        android:layout_marginTop="12dp">
-                        <TextView
-                            android:id="@+id/fdModifiedLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/filedetails_modified"
-                            android:textSize="16sp" />
-                        <TextView
-                            android:id="@+id/fdModified"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/placeholder_timestamp"
-                            android:textSize="16sp"
-                            android:layout_marginLeft="4dp" />
-
-                    </TableRow>
-
-                </TableLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_margin = "5dp"
-                    android:background="@color/list_divider_background"/>
-
-                <RelativeLayout
-                    android:id="@+id/fdProgressAndControl"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:layout_margin="16dp">
-                    <Switch
-                        android:id="@+id/fdFavorite"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="16sp"
-                        android:text="@string/favorite"
-                        android:layout_gravity="start"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/fdFavorite"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/fdProgressText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="@string/downloader_download_in_progress_ticker"/>
-
-                        <LinearLayout
-                            android:id="@+id/fdProgressBlock"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:layout_marginTop="12dp"
-                            android:layout_marginBottom="12dp"
-                            android:orientation="horizontal">
-
-                            <ProgressBar
-                                android:id="@+id/fdProgressBar"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                style="?android:attr/progressBarStyleHorizontal"
-                                android:indeterminate="false"
-                                android:indeterminateOnly="false"/>
-
-                            <ImageButton
-                                android:id="@+id/fdCancelBtn"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="12dp"
-                                android:src="@drawable/ic_cancel"
-                                android:background="@android:color/transparent"/>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_margin ="5dp"
-                    android:background="@color/list_divider_background"/>
-
-                <LinearLayout
-                    android:id="@+id/fdShareContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:layout_margin="16dp">
-                    <TextView
-                        android:id="@+id/fdShareTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="16sp"
-                        android:text="@string/action_share"
-                        android:layout_gravity="start"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:padding="8dp">
-                        <ImageView
-                            android:id="@+id/fdShareLinkIcon"
-                            android:layout_width="14sp"
-                            android:layout_height="14sp"
-                            android:src="@drawable/shared_via_link"
-                            android:layout_gravity="center_vertical"
-                            android:visibility="gone"
-                            android:layout_marginRight="8dp"/>
-                        <TextView
-                            android:id="@+id/fdSharebyLink"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textSize="14sp"
-                            android:text="@string/filedetails_share_link_disable"
-                            android:layout_gravity="start"/>
-                    </LinearLayout>
-                    <TextView
-                        android:id="@+id/fdShareWithUsersTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="16sp"
-                        android:text="@string/filedetails_share_users_with_access"
-                        android:layout_gravity="start"
-                        android:layout_marginTop="8dp"/>
-                    <ListView
-                        android:layout_width="match_parent"
-                        android:layout_height="0dip"
-                        android:id="@+id/fdshareUsersList"
-                        android:visibility="gone"
-                        android:layout_weight="1"/>
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/fdShareNoUsers"
-                        android:text="@string/share_no_users"
-                        android:textSize="14sp"
-                        android:padding="12dp" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </ScrollView>
-    </android.support.v7.widget.CardView>
-</LinearLayout>

src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java

@@ -21,6 +21,7 @@
 package com.owncloud.android.ui.adapter;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -64,10 +65,10 @@ public class UserListAdapter extends ArrayAdapter {
     }
 
     @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
-        LayoutInflater inflator = (LayoutInflater) mContext
+    public @NonNull View getView(final int position, View convertView, @NonNull ViewGroup parent) {
+        LayoutInflater inflater = (LayoutInflater) mContext
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View view = inflator.inflate(R.layout.file_details_share_user_item, parent, false);
+        View view = inflater.inflate(R.layout.file_details_share_user_item, parent, false);
 
         if (mShares != null && mShares.size() > position) {
             OCShare share = mShares.get(position);
@@ -77,7 +78,10 @@ public class UserListAdapter extends ArrayAdapter {
             String name = share.getSharedWithDisplayName();
             if (share.getShareType() == ShareType.GROUP) {
                 name = getContext().getString(R.string.share_group_clarification, name);
-                icon.setImageResource(R.drawable.ic_group_dark);
+                icon.setImageResource(R.drawable.ic_group);
+            } else if (share.getShareType() == ShareType.EMAIL) {
+                name = getContext().getString(R.string.share_email_clarification, name);
+                icon.setImageResource(R.drawable.ic_email);
             }
             userName.setText(name);
 

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -24,6 +24,7 @@ package com.owncloud.android.ui.fragment;
 import android.accounts.Account;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.AppCompatCheckBox;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,9 +33,12 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.owncloud.android.MainApp;
@@ -47,8 +51,10 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.adapter.UserListAdapter;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 import com.owncloud.android.utils.AnalyticsUtils;
@@ -57,6 +63,7 @@ import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 
 
 /**
@@ -345,8 +352,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        Switch favSwitch = (Switch) getView().findViewById(R.id.fdFavorite);
-        mContainerActivity.getFileOperationsHelper().toggleFavorite(getFile(), favSwitch.isChecked());
+        SwitchCompat favSwitch = (SwitchCompat) getView().findViewById(R.id.fdFavorite);
+        mContainerActivity.getFileOperationsHelper().toggleOfflineFile(getFile(), favSwitch.isChecked());
     }
 
     /**
@@ -396,7 +403,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
             setTimeModified(file.getModificationTimestamp());
             
             SwitchCompat favSwitch = (SwitchCompat) getView().findViewById(R.id.fdFavorite);
-            favSwitch.setChecked(file.isFavorite());
+            favSwitch.setChecked(file.isAvailableOffline());
 
             setShareByLinkInfo(file.isSharedViaLink());
 
@@ -465,7 +472,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
             iv.setTag(file.getFileId());
             // Name of the file, to deduce the icon to use in case the MIME type is not precise enough
             String filename = file.getFileName();
-            int resource = MimetypeIconUtil.getFileTypeIconId(mimetype, filename);
+            int resource = MimeTypeUtil.getFileTypeIconId(mimetype, filename);
             iv.setImageResource(resource);
 
             Bitmap thumbnail;
@@ -500,7 +507,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
                     }
                 }
             } else {
-                headerImage.setImageResource(resource);
+                iv.setImageResource(resource);
 			}
         }
     }

src/main/res/layout/file_details_fragment.xml

@@ -2,8 +2,8 @@
 <!--
   ownCloud Android client application
 
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2012 Bartek Przybylski
+  Copyright (C) 2017 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -18,206 +18,273 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/fdScrollView"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:fillViewport="true"
-	>
+			android:id="@+id/fdScrollView"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:fillViewport="true">
 
-	<RelativeLayout
+	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content" >
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
 
 		<RelativeLayout
 			android:id="@+id/fdFileHeaderContainer"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/standard_margin"
-			android:layout_marginRight="@dimen/standard_margin"
-			android:layout_marginTop="@dimen/standard_margin">
-	
+			android:layout_margin="@dimen/standard_margin">
+
 			<ImageView
 				android:id="@+id/fdIcon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:src="@drawable/file" />
-				
+				android:src="@drawable/file"/>
+
 			<TextView
-			    android:id="@+id/fdFilename"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_centerVertical="true"
-			    android:layout_toRightOf="@+id/fdIcon"
+				android:id="@+id/fdFilename"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_centerVertical="true"
+				android:layout_toRightOf="@+id/fdIcon"
 				android:paddingLeft="@dimen/standard_padding"
-			    android:text="@string/placeholder_filename"
-			    android:textAppearance="?android:attr/textAppearanceLarge" />
-			
+				android:text="@string/placeholder_filename"
+				android:textAppearance="?android:attr/textAppearanceLarge"/>
+
 		</RelativeLayout>
-	
-		<RelativeLayout
-			android:id="@+id/fdDetailsContainer"
+
+		<TableLayout
+			android:id="@+id/fdDetailsTable"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/standard_margin"
-			android:layout_marginRight="@dimen/standard_margin"
-			android:layout_marginTop="@dimen/standard_margin"
-			android:layout_below="@id/fdFileHeaderContainer" >
-		
-			<RelativeLayout
-				android:id="@+id/fdLabelContainer"
-				android:layout_width="wrap_content"
+			android:layout_marginLeft="16dp"
+			android:layout_marginRight="16dp"
+			android:layout_marginBottom="8dp">
+
+			<TableRow
+				android:id="@+id/fdTypeRow"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_alignParentTop="true" >
-				
+				android:layout_marginBottom="@dimen/standard_half_margin">
+
 				<TextView
 					android:id="@+id/fdTypeLabel"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="@string/filedetails_type"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-					
+					android:textSize="16sp" />
 				<TextView
-					android:id="@+id/fdSizeLabel"
+					android:id="@+id/fdType"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_below="@+id/fdTypeLabel"
-					android:layout_marginTop="@dimen/fragment_margin"
-					android:text="@string/filedetails_size"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-					
+					android:text="@string/placeholder_filetype"
+					android:textSize="16sp"
+					android:layout_marginLeft="@dimen/standard_half_margin" />
+
+			</TableRow>
+			<TableRow
+				android:id="@+id/fdSizeRow"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/standard_half_margin">
 				<TextView
-					android:id="@+id/fdCreatedLabel"
+					android:id="@+id/fdSizeLabel"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_below="@+id/fdSizeLabel"
-					android:layout_marginTop="@dimen/fragment_margin"
-					android:text="@string/filedetails_created"
-					android:visibility="gone"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-					  
+					android:text="@string/filedetails_size"
+					android:textSize="16sp"/>
 				<TextView
-					android:id="@+id/fdModifiedLabel"
+					android:id="@+id/fdSize"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_below="@+id/fdCreatedLabel"
-					android:layout_marginTop="@dimen/fragment_margin"
-					android:text="@string/filedetails_modified"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-			</RelativeLayout>
-	
-			<RelativeLayout
-				android:id="@+id/fdValueContainer"
-				android:layout_width="wrap_content"
+					android:text="@string/placeholder_filesize"
+					android:textSize="16sp"
+					android:layout_marginLeft="@dimen/standard_half_margin" />
+
+			</TableRow>
+			<TableRow
+				android:id="@+id/fdCreatedRow"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_alignParentTop="true"
-				android:layout_marginLeft="@dimen/standard_margin"
-				android:layout_toRightOf="@+id/fdLabelContainer" >
-				
+				android:padding="5dp"
+				android:layout_marginTop="12dp"
+				android:visibility="gone">
 				<TextView
-					android:id="@+id/fdType"
+					android:id="@+id/fdCreatedLabel"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="@string/placeholder_filetype"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-					
+					android:text="@string/filedetails_created"
+					android:textSize="16sp" />
 				<TextView
-					android:id="@+id/fdSize"
+					android:id="@+id/fdCreated"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_below="@+id/fdType"
-					android:layout_marginTop="@dimen/fragment_margin"
-					android:text="@string/placeholder_filesize"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-					
+					android:text="@string/placeholder_timestamp"
+					android:textSize="16sp"
+					android:layout_marginLeft="4dp" />
+
+			</TableRow>
+			<TableRow
+				android:id="@+id/fdModifiedRow"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/standard_half_margin">
 				<TextView
-					android:id="@+id/fdCreated"
+					android:id="@+id/fdModifiedLabel"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_below="@+id/fdSize"
-					android:layout_marginTop="@dimen/fragment_margin"
-					android:visibility="gone"
-					android:text="@string/placeholder_timestamp"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-					
+					android:text="@string/filedetails_modified"
+					android:textSize="16sp" />
 				<TextView
 					android:id="@+id/fdModified"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_below="@+id/fdCreated"
-					android:layout_marginTop="@dimen/fragment_margin"
 					android:text="@string/placeholder_timestamp"
-					android:textAppearance="?android:attr/textAppearanceMedium" />
-		
-			</RelativeLayout>
-	
-		</RelativeLayout>
-	
+					android:textSize="16sp"
+					android:layout_marginLeft="@dimen/standard_half_margin" />
+
+			</TableRow>
+
+		</TableLayout>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="@color/list_divider_background"/>
+
 		<RelativeLayout
 			android:id="@+id/fdProgressAndControl"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/fdDetailsContainer"
-			android:gravity="center_horizontal" 
-			android:layout_margin="@dimen/standard_margin"
-			>
-			
-			<android.support.v7.widget.AppCompatCheckBox
+			android:layout_marginBottom="@dimen/standard_half_margin"
+			android:layout_marginLeft="@dimen/standard_margin"
+			android:layout_marginRight="@dimen/standard_margin"
+			android:layout_marginTop="@dimen/standard_half_margin"
+			android:gravity="center_horizontal">
+
+			<android.support.v7.widget.SwitchCompat
 				android:id="@+id/fdFavorite"
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true"
+				android:layout_gravity="start"
 				android:text="@string/favorite"
-				android:checked="false" />
+				android:textSize="16sp"/>
 
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_below="@id/fdFavorite"
-				android:orientation="vertical" >
-				
-    			<TextView 
-    			    android:id="@+id/fdProgressText" 
-    			    android:layout_width="match_parent"
-      				android:layout_height="wrap_content" 
-      				android:text="@string/downloader_download_in_progress_ticker"
-      				/>
-    			
-			    <LinearLayout
-			        android:id="@+id/fdProgressBlock"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/fdProgressText"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="8dp"
+					android:text="@string/downloader_download_in_progress_ticker"/>
+
+				<LinearLayout
+					android:id="@+id/fdProgressBlock"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:layout_marginBottom="@dimen/standard_quarter_margin"
+					android:layout_marginTop="@dimen/standard_half_margin"
 					android:gravity="center"
-					android:layout_marginTop="@dimen/fragment_margin"
-					android:layout_marginBottom="@dimen/fragment_margin"
-					android:orientation="horizontal"
-					>
-				    				
-    				<ProgressBar 
-    				    android:id="@+id/fdProgressBar"
-						android:layout_width="@dimen/zero"
+					android:orientation="horizontal">
+
+					<ProgressBar
+						android:id="@+id/fdProgressBar"
+						style="?android:attr/progressBarStyleHorizontal"
+						android:layout_width="0dp"
 						android:layout_height="wrap_content"
 						android:layout_weight="1"
-                        style="?android:attr/progressBarStyleHorizontal"
-                        android:indeterminate="false"
-						android:indeterminateOnly="false" 
-					/>
-				    								
+						android:indeterminate="false"
+						android:indeterminateOnly="false"/>
+
 					<ImageButton
 						android:id="@+id/fdCancelBtn"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/fragment_margin"
-						android:src="@drawable/ic_action_cancel_grey"
+						android:layout_marginLeft="@dimen/standard_half_margin"
 						android:background="@android:color/transparent"
-						/>
-						
+						android:src="@drawable/ic_cancel"/>
+
 				</LinearLayout>
-	
+
 			</LinearLayout>
-			
+
 		</RelativeLayout>
 
-	</RelativeLayout>
-	
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:background="@color/list_divider_background"/>
+
+		<LinearLayout
+			android:id="@+id/fdShareContainer"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_marginBottom="@dimen/standard_half_margin"
+			android:layout_marginLeft="@dimen/standard_margin"
+			android:layout_marginRight="@dimen/standard_margin"
+			android:layout_marginTop="@dimen/standard_half_margin"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/fdShareTitle"
+				style="?android:attr/listSeparatorTextViewStyle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/standard_half_margin"
+				android:text="@string/action_share"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+
+				<ImageView
+					android:id="@+id/fdShareLinkIcon"
+					android:layout_width="14sp"
+					android:layout_height="14sp"
+					android:layout_gravity="center_vertical"
+					android:layout_marginRight="@dimen/standard_half_margin"
+					android:src="@drawable/shared_via_link"
+					android:visibility="gone"/>
+
+				<TextView
+					android:id="@+id/fdSharebyLink"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_gravity="start"
+					android:text="@string/filedetails_share_link_disable"/>
+			</LinearLayout>
+
+			<TextView
+				android:id="@+id/fdShareWithUsersTitle"
+				style="?android:attr/listSeparatorTextViewStyle"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="start"
+				android:layout_marginBottom="@dimen/standard_half_margin"
+				android:layout_marginTop="@dimen/standard_half_margin"
+				android:text="@string/filedetails_share_users_with_access"/>
+
+			<ListView
+				android:id="@+id/fdshareUsersList"
+				android:layout_width="match_parent"
+				android:layout_height="0dip"
+				android:layout_weight="1"
+				android:visibility="gone"/>
+
+			<TextView
+				android:id="@+id/fdShareNoUsers"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/share_no_users"
+				android:textSize="14sp"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
 </ScrollView>

src/main/res/layout/file_details_share_user_item.xml

@@ -25,7 +25,7 @@
             android:id="@+id/userIcon"
             android:layout_width="32sp"
             android:layout_height="32sp"
-            android:src="@drawable/ic_account_circle_dark"
+            android:src="@drawable/ic_user"
             android:layout_gravity="center_vertical"/>
 
         <TextView
@@ -37,5 +37,5 @@
             android:layout_margin="12dp"
             android:singleLine="true"
             android:ellipsize="middle"
-            android:textColor="@color/owncloud_blue"/>
+            android:textColor="@color/black"/>
 </LinearLayout>

src/main/res/values/strings.xml

@@ -524,6 +524,9 @@
     <string name="share_known_remote_clarification">%1$s ( at %2$s )</string>
 
     <string name="share_sharee_unavailable">Upgrade the server version to allow sharing between users from within their clients.\nPlease contact your administrator</string>
+    <string name="filedetails_share_link_enable">Share by link enabled</string>
+    <string name="filedetails_share_link_disable">Share by link disabled</string>
+    <string name="filedetails_share_users_with_access">Users and Groups with access</string>
     <string name="share_privilege_can_share">can share</string>
     <string name="share_privilege_can_edit">can edit</string>
     <string name="share_privilege_can_edit_create">create</string>