From 7312979808d27ca614b45e1b17dc0e96735b292b Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Mon, 2 Oct 2017 11:56:51 +0530
Subject: [PATCH 01/18] Add options for operations on single files

---
 .../ui/adapter/FileListListAdapter.java       |  58 +++++++++---------
 .../ui/fragment/OCFileListFragment.java       |  56 ++++++++++++++---
 .../OCFileListFragmentInterface.java          |  13 +++-
 .../{shared_via_users.png => ic_unshared.png} | Bin
 .../{shared_via_users.png => ic_unshared.png} | Bin
 .../{shared_via_users.png => ic_unshared.png} | Bin
 .../{shared_via_users.png => ic_unshared.png} | Bin
 .../{shared_via_users.png => ic_unshared.png} | Bin
 src/main/res/drawable/shared_via_users.xml    |   9 +++
 src/main/res/layout/list_item.xml             |  33 ++++++----
 10 files changed, 117 insertions(+), 52 deletions(-)
 rename src/main/res/drawable-hdpi/{shared_via_users.png => ic_unshared.png} (100%)
 rename src/main/res/drawable-mdpi/{shared_via_users.png => ic_unshared.png} (100%)
 rename src/main/res/drawable-xhdpi/{shared_via_users.png => ic_unshared.png} (100%)
 rename src/main/res/drawable-xxhdpi/{shared_via_users.png => ic_unshared.png} (100%)
 rename src/main/res/drawable-xxxhdpi/{shared_via_users.png => ic_unshared.png} (100%)
 create mode 100644 src/main/res/drawable/shared_via_users.xml

diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 2d87d2dadd..0f339aeb21 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -26,7 +26,6 @@ package com.owncloud.android.ui.adapter;
 import android.accounts.Account;
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Handler;
@@ -62,8 +61,6 @@ import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.operations.RemoteOperationFailedException;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.ShareActivity;
 import com.owncloud.android.ui.fragment.ExtendedListFragment;
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
 import com.owncloud.android.utils.DisplayUtils;
@@ -237,7 +234,18 @@ public class FileListListAdapter extends BaseAdapter {
             ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
             if (file.isSharedWithSharee() || file.isSharedWithMe()) {
                 sharedIconV.setImageResource(R.drawable.shared_via_users);
+            } else if (file.isSharedViaLink()) {
+                sharedIconV.setImageResource(R.drawable.shared_via_link);
+            } else {
+                sharedIconV.setImageResource(R.drawable.ic_unshared);
             }
+            final OCFile temp = file;
+            sharedIconV.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    OCFileListFragmentInterface.onShareIconClick(temp);
+                }
+            });
 
             fileIcon.setTag(file.getFileId());
             TextView fileName;
@@ -258,21 +266,6 @@ public class FileListListAdapter extends BaseAdapter {
                     fileSizeV.setVisibility(View.VISIBLE);
                     fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
 
-                    // Shared icon clickable
-                    if (file.isSharedViaLink() || file.isSharedWithSharee()) {
-                        final OCFile temp = file;
-                        sharedIconV.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                Intent intent = new Intent(mContext, ShareActivity.class);
-                                intent.putExtra(FileActivity.EXTRA_FILE, temp);
-                                intent.putExtra(FileActivity.EXTRA_ACCOUNT, mAccount);
-                                mContext.startActivity(intent);
-                            }
-                        });
-                    }
-
-
                 case GRID_ITEM:
                     // filename
                     fileName = (TextView) view.findViewById(R.id.Filename);
@@ -284,16 +277,6 @@ public class FileListListAdapter extends BaseAdapter {
                     }
 
                 case GRID_IMAGE:
-                    // sharedIcon
-                    if (file.isSharedViaLink()) {
-                        sharedIconV.setVisibility(View.VISIBLE);
-                        sharedIconV.bringToFront();
-                    } else if (file.isSharedWithSharee() || file.isSharedWithMe()) {
-                        sharedIconV.setVisibility(View.VISIBLE);
-                        sharedIconV.bringToFront();
-                    } else {
-                        sharedIconV.setVisibility(View.GONE);
-                    }
 
                     // local state
                     ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);
@@ -333,11 +316,18 @@ public class FileListListAdapter extends BaseAdapter {
             }
 
             // For all Views
+            ImageView favoriteV = (ImageView) view.findViewById(R.id.favorite_action);
             if (file.getIsFavorite()) {
-                view.findViewById(R.id.favorite_action).setVisibility(View.VISIBLE);
+                favoriteV.setImageResource(R.drawable.ic_favorite);
             } else {
-                view.findViewById(R.id.favorite_action).setVisibility(View.GONE);
+                favoriteV.setImageResource(R.drawable.nav_favorites);
             }
+            favoriteV.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    OCFileListFragmentInterface.onFavoriteIconClick(temp);
+                }
+            });
 
             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
             checkBoxV.setVisibility(View.GONE);
@@ -357,6 +347,14 @@ public class FileListListAdapter extends BaseAdapter {
                 checkBoxV.setVisibility(View.VISIBLE);
             }
 
+            ImageView overflowIndicatorV = (ImageView) view.findViewById(R.id.overflow_menu);
+            overflowIndicatorV.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    OCFileListFragmentInterface.onOverflowIconClick(v, temp);
+                }
+            });
+
             // this if-else is needed even though kept-in-sync icon is visible by default
             // because android reuses views in listview
             if (!file.isAvailableOffline()) {
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index bfc5c185db..7a84dbd67e 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -53,6 +53,7 @@ import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.PopupMenu;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -107,6 +108,7 @@ import org.parceler.Parcels;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -513,6 +515,39 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         updateFooter();
     }
 
+    @Override
+    public void onFavoriteIconClick(OCFile file) {
+        mContainerActivity.getFileOperationsHelper().toggleFavoriteFiles(Collections.singleton(file),
+                !file.getIsFavorite());
+    }
+
+    @Override
+    public void onShareIconClick(OCFile file) {
+        shareFile(file);
+    }
+
+    @Override
+    public void onOverflowIconClick(View view, OCFile file) {
+        PopupMenu popup = new PopupMenu(getActivity(), view);
+        popup.inflate(R.menu.file_actions_menu);
+        FileMenuFilter mf = new FileMenuFilter(
+                mAdapter.getFiles().size(),
+                Collections.singleton(file),
+                ((FileActivity) getActivity()).getAccount(),
+                mContainerActivity,
+                getActivity()
+        );
+        mf.filter(popup.getMenu());
+        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                ArrayList<OCFile> checkedFiles = new ArrayList<>(Collections.singletonList(file));
+                return onFileActionChosen(item.getItemId(), checkedFiles);
+            }
+        });
+        popup.show();
+    }
+
     /**
      * Handler for multiple selection mode.
      *
@@ -643,7 +678,8 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
          */
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            return onFileActionChosen(item.getItemId());
+            ArrayList<OCFile> checkedFiles = mAdapter.getCheckedItems(getListView());
+            return onFileActionChosen(item.getItemId(), checkedFiles);
         }
 
         /**
@@ -902,10 +938,10 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
      * Start the appropriate action(s) on the currently selected files given menu selected by the user.
      *
      * @param menuId Identifier of the action menu selected by the user
+     * @param checkedFiles List of files selected by the user on which the action should be performed
      * @return 'true' if the menu selection started any action, 'false' otherwise.
      */
-    public boolean onFileActionChosen(int menuId) {
-        final ArrayList<OCFile> checkedFiles = mAdapter.getCheckedItems(getListView());
+    public boolean onFileActionChosen(int menuId, ArrayList<OCFile> checkedFiles) {
         if (checkedFiles.size() <= 0) {
             return false;
         }
@@ -915,11 +951,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
             OCFile singleFile = checkedFiles.get(0);
             switch (menuId) {
                 case R.id.action_share_file: {
-                    if(singleFile.isSharedWithMe() && !singleFile.canReshare()){
-                        Snackbar.make(getView(), R.string.resharing_is_not_allowed, Snackbar.LENGTH_LONG).show();
-                    } else {
-                        mContainerActivity.getFileOperationsHelper().showShareFile(singleFile);
-                    }
+                    shareFile(singleFile);
                     return true;
                 }
                 case R.id.action_open_file_with: {
@@ -1019,6 +1051,14 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         }
     }
 
+    private void shareFile(OCFile file) {
+        if(file.isSharedWithMe() && !file.canReshare()){
+            Snackbar.make(getView(), R.string.resharing_is_not_allowed, Snackbar.LENGTH_LONG).show();
+        } else {
+            mContainerActivity.getFileOperationsHelper().showShareFile(file);
+        }
+    }
+
     /**
      * Use this to query the {@link OCFile} that is currently
      * being displayed by this fragment
diff --git a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java b/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
index 195c499cc6..2ad6b6f6af 100644
--- a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
+++ b/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
@@ -20,12 +20,23 @@
  */
 package com.owncloud.android.ui.interfaces;
 
+import android.view.View;
+
+import com.owncloud.android.datamodel.OCFile;
+
 /**
- * Interface for signaling filter finish
+ * Interface for communication between {@link com.owncloud.android.ui.fragment.OCFileListFragment}
+ * and {@link com.owncloud.android.ui.adapter.FileListListAdapter}
  */
 
 public interface OCFileListFragmentInterface {
     void finishedFiltering();
 
     int getColumnSize();
+
+    void onFavoriteIconClick(OCFile file);
+
+    void onShareIconClick(OCFile file);
+
+    void onOverflowIconClick(View view, OCFile file);
 }
diff --git a/src/main/res/drawable-hdpi/shared_via_users.png b/src/main/res/drawable-hdpi/ic_unshared.png
similarity index 100%
rename from src/main/res/drawable-hdpi/shared_via_users.png
rename to src/main/res/drawable-hdpi/ic_unshared.png
diff --git a/src/main/res/drawable-mdpi/shared_via_users.png b/src/main/res/drawable-mdpi/ic_unshared.png
similarity index 100%
rename from src/main/res/drawable-mdpi/shared_via_users.png
rename to src/main/res/drawable-mdpi/ic_unshared.png
diff --git a/src/main/res/drawable-xhdpi/shared_via_users.png b/src/main/res/drawable-xhdpi/ic_unshared.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/shared_via_users.png
rename to src/main/res/drawable-xhdpi/ic_unshared.png
diff --git a/src/main/res/drawable-xxhdpi/shared_via_users.png b/src/main/res/drawable-xxhdpi/ic_unshared.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/shared_via_users.png
rename to src/main/res/drawable-xxhdpi/ic_unshared.png
diff --git a/src/main/res/drawable-xxxhdpi/shared_via_users.png b/src/main/res/drawable-xxxhdpi/ic_unshared.png
similarity index 100%
rename from src/main/res/drawable-xxxhdpi/shared_via_users.png
rename to src/main/res/drawable-xxxhdpi/ic_unshared.png
diff --git a/src/main/res/drawable/shared_via_users.xml b/src/main/res/drawable/shared_via_users.xml
new file mode 100644
index 0000000000..e3fe874d61
--- /dev/null
+++ b/src/main/res/drawable/shared_via_users.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 8ae40df923..734bbe83d8 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -30,6 +30,14 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
+        <ImageView
+            android:id="@+id/favorite_action"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginLeft="16dp"
+            android:layout_gravity="center_vertical"
+            android:clickable="true"
+            android:src="@drawable/nav_favorites" />
 
         <RelativeLayout
             android:layout_width="72dp"
@@ -43,20 +51,8 @@
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_centerInParent="true"
-                android:layout_marginLeft="8dp"
                 android:src="@drawable/folder" />
 
-            <ImageView
-                android:id="@+id/favorite_action"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="4dp"
-                android:src="@drawable/ic_favorite"
-                />
-
-
             <ImageView
                 android:id="@+id/keptOfflineIcon"
                 android:layout_height="12dp"
@@ -152,7 +148,8 @@
                 android:layout_marginLeft="@dimen/standard_quarter_margin"
                 android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:layout_marginRight="@dimen/standard_quarter_margin"
-                android:src="@drawable/shared_via_link" />
+                android:clickable="true"
+                android:src="@drawable/ic_unshared" />
 
             <ImageView
                 android:id="@+id/custom_checkbox"
@@ -163,6 +160,16 @@
 
                 android:src="@drawable/ic_checkbox_blank_outline"
                 android:layout_toRightOf="@id/sharedIcon"/>
+
+            <ImageView
+                android:id="@+id/overflow_menu"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:clickable="true"
+                android:src="@drawable/ic_dots_vertical"
+                android:layout_toRightOf="@id/custom_checkbox"/>
         </RelativeLayout>
 
 

From 1e7bc78d87300fbba9f1a28520ebe2f69249bbc9 Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Wed, 4 Oct 2017 12:35:07 +0530
Subject: [PATCH 02/18] Revert change in favourite icon

---
 .../ui/adapter/FileListListAdapter.java       | 11 ++---------
 .../ui/fragment/OCFileListFragment.java       |  6 ------
 .../OCFileListFragmentInterface.java          |  2 --
 src/main/res/layout/list_item.xml             | 19 ++++++++++---------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 0f339aeb21..db153e5272 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -316,18 +316,11 @@ public class FileListListAdapter extends BaseAdapter {
             }
 
             // For all Views
-            ImageView favoriteV = (ImageView) view.findViewById(R.id.favorite_action);
             if (file.getIsFavorite()) {
-                favoriteV.setImageResource(R.drawable.ic_favorite);
+                view.findViewById(R.id.favorite_action).setVisibility(View.VISIBLE);
             } else {
-                favoriteV.setImageResource(R.drawable.nav_favorites);
+                view.findViewById(R.id.favorite_action).setVisibility(View.GONE);
             }
-            favoriteV.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    OCFileListFragmentInterface.onFavoriteIconClick(temp);
-                }
-            });
 
             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
             checkBoxV.setVisibility(View.GONE);
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 7a84dbd67e..d3d311ec78 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -515,12 +515,6 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         updateFooter();
     }
 
-    @Override
-    public void onFavoriteIconClick(OCFile file) {
-        mContainerActivity.getFileOperationsHelper().toggleFavoriteFiles(Collections.singleton(file),
-                !file.getIsFavorite());
-    }
-
     @Override
     public void onShareIconClick(OCFile file) {
         shareFile(file);
diff --git a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java b/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
index 2ad6b6f6af..9fe06ac331 100644
--- a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
+++ b/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
@@ -34,8 +34,6 @@ public interface OCFileListFragmentInterface {
 
     int getColumnSize();
 
-    void onFavoriteIconClick(OCFile file);
-
     void onShareIconClick(OCFile file);
 
     void onOverflowIconClick(View view, OCFile file);
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 734bbe83d8..46c1445d31 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -30,15 +30,6 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/favorite_action"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginLeft="16dp"
-            android:layout_gravity="center_vertical"
-            android:clickable="true"
-            android:src="@drawable/nav_favorites" />
-
         <RelativeLayout
             android:layout_width="72dp"
             android:layout_height="@dimen/standard_list_item_size"
@@ -51,8 +42,18 @@
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_centerInParent="true"
+                android:layout_marginLeft="8dp"
                 android:src="@drawable/folder" />
 
+            <ImageView
+                android:id="@+id/favorite_action"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="4dp"
+                android:src="@drawable/ic_favorite" />
+
             <ImageView
                 android:id="@+id/keptOfflineIcon"
                 android:layout_height="12dp"

From 8d476f657861435ec837303a27ddcbfd65ac5a4e Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Wed, 4 Oct 2017 16:20:18 +0530
Subject: [PATCH 03/18] Add material design specs

---
 src/main/res/layout/list_item.xml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 46c1445d31..a535a82104 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -138,17 +138,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:gravity="center"
+            android:paddingLeft="@dimen/standard_padding"
             android:paddingRight="@dimen/standard_padding">
 
             <ImageView
                 android:id="@+id/sharedIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:layout_marginTop="@dimen/standard_quarter_margin"
-                android:layout_marginLeft="@dimen/standard_quarter_margin"
                 android:layout_marginBottom="@dimen/standard_quarter_margin"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
+                android:layout_marginRight="@dimen/standard_half_margin"
                 android:clickable="true"
                 android:src="@drawable/ic_unshared" />
 
@@ -156,29 +156,28 @@
                 android:id="@+id/custom_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/standard_quarter_margin"
-
-                android:src="@drawable/ic_checkbox_blank_outline"
-                android:layout_toRightOf="@id/sharedIcon"/>
+                android:layout_marginLeft="@dimen/standard_half_margin"
+                android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_toRightOf="@id/sharedIcon"
+                android:clickable="true"
+                android:src="@drawable/ic_checkbox_blank_outline" />
 
             <ImageView
                 android:id="@+id/overflow_menu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginLeft="@dimen/standard_half_margin"
+                android:layout_toRightOf="@id/custom_checkbox"
                 android:clickable="true"
-                android:src="@drawable/ic_dots_vertical"
-                android:layout_toRightOf="@id/custom_checkbox"/>
-        </RelativeLayout>
+                android:src="@drawable/ic_dots_vertical" />
 
+        </RelativeLayout>
 
     </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/list_divider_background"></View>
+        android:background="@color/list_divider_background" />
 
 </LinearLayout>

From dbad84667d113c48cafcc3072f3232a907e36f44 Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Wed, 4 Oct 2017 17:03:35 +0530
Subject: [PATCH 04/18] Do not show select/deselect all in the per-item
 overflow menus

---
 .../owncloud/android/files/FileMenuFilter.java   | 16 +++++++++++-----
 .../android/ui/fragment/FileDetailFragment.java  |  3 ++-
 .../android/ui/fragment/OCFileListFragment.java  |  6 ++++--
 .../android/ui/preview/PreviewImageFragment.java |  3 ++-
 .../android/ui/preview/PreviewMediaFragment.java |  3 ++-
 .../android/ui/preview/PreviewTextFragment.java  |  3 ++-
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/src/main/java/com/owncloud/android/files/FileMenuFilter.java
index db820ec99f..bfa9e8445d 100644
--- a/src/main/java/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/main/java/com/owncloud/android/files/FileMenuFilter.java
@@ -52,6 +52,7 @@ public class FileMenuFilter {
     private ComponentsGetter mComponentsGetter;
     private Account mAccount;
     private Context mContext;
+    private boolean mOverflowMenu;
 
     /**
      * Constructor
@@ -61,14 +62,16 @@ public class FileMenuFilter {
      * @param account           ownCloud {@link Account} holding targetFile.
      * @param cg                Accessor to app components, needed to access synchronization services
      * @param context           Android {@link Context}, needed to access build setup resources.
+     * @param overflowMenu      true if the overflow menu items are being filtered
      */
     public FileMenuFilter(int numberOfAllFiles, Collection<OCFile> targetFiles, Account account,
-                          ComponentsGetter cg, Context context) {
+                          ComponentsGetter cg, Context context, boolean overflowMenu) {
         mNumberOfAllFiles = numberOfAllFiles;
         mFiles = targetFiles;
         mAccount = account;
         mComponentsGetter = cg;
         mContext = context;
+        mOverflowMenu = overflowMenu;
     }
 
     /**
@@ -78,9 +81,12 @@ public class FileMenuFilter {
      * @param account           ownCloud {@link Account} holding targetFile.
      * @param cg                Accessor to app components, needed to access synchronization services
      * @param context           Android {@link Context}, needed to access build setup resources.
+     * @param overflowMenu      true if the overflow menu items are being filtered
      */
-    public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg, Context context) {
-        this(1, Collections.singletonList(targetFile), account, cg, context);
+    public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg, Context context,
+                          boolean overflowMenu) {
+        this(1, Collections.singletonList(targetFile), account, cg, context,
+                overflowMenu);
     }
 
     /**
@@ -178,7 +184,7 @@ public class FileMenuFilter {
         // SELECT ALL
         if (!inSingleFileFragment) {
             // Show only if at least one item isn't selected.
-            if (mFiles.size() >= mNumberOfAllFiles) {
+            if (mFiles.size() >= mNumberOfAllFiles || mOverflowMenu) {
                 toHide.add(R.id.action_select_all_action_menu);
             } else {
                 toShow.add(R.id.action_select_all_action_menu);
@@ -191,7 +197,7 @@ public class FileMenuFilter {
         // DESELECT ALL
         if (!inSingleFileFragment) {
             // Show only if at least one item is selected.
-            if (mFiles.isEmpty()) {
+            if (mFiles.isEmpty() || mOverflowMenu) {
                 toHide.add(R.id.action_deselect_all_action_menu);
             } else {
                 toShow.add(R.id.action_deselect_all_action_menu);
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 4a94ba6abe..59883b4c95 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -216,7 +216,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
                 getFile(),
                 mContainerActivity.getStorageManager().getAccount(),
                 mContainerActivity,
-                getActivity()
+                getActivity(),
+                false
             );
             mf.filter(menu, true);
         }
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index d3d311ec78..0f4e3a4ebd 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -529,7 +529,8 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                 Collections.singleton(file),
                 ((FileActivity) getActivity()).getAccount(),
                 mContainerActivity,
-                getActivity()
+                getActivity(),
+                true
         );
         mf.filter(popup.getMenu());
         popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@@ -661,7 +662,8 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                     checkedFiles,
                     ((FileActivity) getActivity()).getAccount(),
                     mContainerActivity,
-                    getActivity()
+                    getActivity(),
+                    false
             );
             mf.filter(menu, false);
             return true;
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
index d92fe401ee..169f65a299 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -275,7 +275,8 @@ public class PreviewImageFragment extends FileFragment {
                     getFile(),
                     mContainerActivity.getStorageManager().getAccount(),
                     mContainerActivity,
-                    getActivity()
+                    getActivity(),
+                    false
             );
             mf.filter(menu, true);
         }
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 3188de0a6e..09de311abe 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -375,7 +375,8 @@ public class PreviewMediaFragment extends FileFragment implements
                 getFile(),
                 mContainerActivity.getStorageManager().getAccount(),
                 mContainerActivity,
-                getActivity()
+                getActivity(),
+                false
             );
             mf.filter(menu, true);
         }
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
index c048c5e2e4..26d670dbef 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -285,7 +285,8 @@ public class PreviewTextFragment extends FileFragment {
                     getFile(),
                     mContainerActivity.getStorageManager().getAccount(),
                     mContainerActivity,
-                    getActivity()
+                    getActivity(),
+                    false
             );
             mf.filter(menu, true);
         }

From 8e65a1decee646d45266d62cdb09c0b28f52e519 Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Thu, 5 Oct 2017 10:51:45 +0530
Subject: [PATCH 05/18] Align the overflow icon and share icon vertically

---
 src/main/res/layout/list_item.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index a535a82104..7e9aff61c1 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -138,7 +138,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:gravity="center"
             android:paddingLeft="@dimen/standard_padding"
             android:paddingRight="@dimen/standard_padding">
 
@@ -146,6 +145,7 @@
                 android:id="@+id/sharedIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_marginTop="@dimen/standard_quarter_margin"
                 android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
@@ -156,6 +156,7 @@
                 android:id="@+id/custom_checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_toRightOf="@id/sharedIcon"
@@ -166,6 +167,7 @@
                 android:id="@+id/overflow_menu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_toRightOf="@id/custom_checkbox"
                 android:clickable="true"

From 2eae215984250870f3ca3ba04c7a99fd3f06ac7f Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Thu, 5 Oct 2017 13:37:24 +0530
Subject: [PATCH 06/18] Change dimensions of svg to 16dp x 16dp

---
 src/main/res/drawable/shared_via_users.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/res/drawable/shared_via_users.xml b/src/main/res/drawable/shared_via_users.xml
index e3fe874d61..73954766e5 100644
--- a/src/main/res/drawable/shared_via_users.xml
+++ b/src/main/res/drawable/shared_via_users.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="16dp"
+        android:height="16dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path

From f3755fa8421bc87c2fc57f6977c2dc7250540330 Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Thu, 5 Oct 2017 16:24:18 +0530
Subject: [PATCH 07/18] Align row icons to action bar icons

---
 src/main/res/layout/list_item.xml | 6 +++---
 src/main/res/values/dims.xml      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 7e9aff61c1..1d96360a64 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -138,8 +138,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingLeft="@dimen/standard_padding"
-            android:paddingRight="@dimen/standard_padding">
+            android:paddingLeft="@dimen/alternate_padding"
+            android:paddingRight="@dimen/alternate_padding">
 
             <ImageView
                 android:id="@+id/sharedIcon"
@@ -148,7 +148,7 @@
                 android:layout_centerVertical="true"
                 android:layout_marginTop="@dimen/standard_quarter_margin"
                 android:layout_marginBottom="@dimen/standard_quarter_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_marginRight="@dimen/list_item_share_right_margin"
                 android:clickable="true"
                 android:src="@drawable/ic_unshared" />
 
diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index 9df5c75c47..5d0ca3c0e7 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -47,6 +47,7 @@
     <dimen name="two_line_secondary_text_size">14sp</dimen>
     <dimen name="list_item_avatar_icon_margin">20dp</dimen>
     <dimen name="list_item_avatar_text_margin">20dp</dimen>
+    <dimen name="list_item_share_right_margin">14dp</dimen>
     <dimen name="account_action_layout_height">72dp</dimen>
     <dimen name="zero">0dp</dimen>
     <dimen name="account_item_layout_height">72dp</dimen>

From b555e975f0dfeedcdc5bef474932f7558828f1a8 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 5 Oct 2017 14:39:03 +0200
Subject: [PATCH 08/18] replace share via user vector with Nextcloud variant

---
 src/main/res/drawable/shared_via_users.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/res/drawable/shared_via_users.xml b/src/main/res/drawable/shared_via_users.xml
index 73954766e5..a33c1d61ec 100644
--- a/src/main/res/drawable/shared_via_users.xml
+++ b/src/main/res/drawable/shared_via_users.xml
@@ -1,9 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="16dp"
         android:height="16dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportWidth="16.0"
+        android:viewportHeight="16.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.2"
+        android:strokeMiterLimit="4"
+        android:pathData="M12.228 1a2.457 2.457 0 0 0-2.46 2.454c0 0.075 0.01 0.15 0.016 0.224L5.05 6.092a2.445 2.445 0 0 0-1.596-0.586A2.453 2.453 0 0 0 1 7.96a2.453 2.453 0 0 0 2.454 2.455 2.45 2.45 0 0 0 1.46-0.477l4.865 2.474c-0.004 0.044-0.01 0.09-0.01 0.134a2.457 2.457 0 1 0 0.804-1.818l-4.696-2.4c 0.02-0.123 0.035-0.25 0.035-0.378 0-0.072-0.01-0.144-0.015-0.214l4.74-2.414A2.457 2.457 0 1 0 12.228 0.99z"/>
 </vector>

From 4508370acad736bf28bf103a796b09ba01c94815 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 5 Oct 2017 14:39:33 +0200
Subject: [PATCH 09/18] replace shared via link pngs with vector variant

---
 .../res/drawable-hdpi/shared_via_link.png     | Bin 992 -> 0 bytes
 .../res/drawable-mdpi/shared_via_link.png     | Bin 701 -> 0 bytes
 .../res/drawable-xhdpi/shared_via_link.png    | Bin 1436 -> 0 bytes
 .../res/drawable-xxhdpi/shared_via_link.png   | Bin 2098 -> 0 bytes
 .../res/drawable-xxxhdpi/shared_via_link.png  | Bin 2991 -> 0 bytes
 src/main/res/drawable/shared_via_link.xml     |  18 ++++++++++++++++++
 6 files changed, 18 insertions(+)
 delete mode 100644 src/main/res/drawable-hdpi/shared_via_link.png
 delete mode 100644 src/main/res/drawable-mdpi/shared_via_link.png
 delete mode 100644 src/main/res/drawable-xhdpi/shared_via_link.png
 delete mode 100644 src/main/res/drawable-xxhdpi/shared_via_link.png
 delete mode 100644 src/main/res/drawable-xxxhdpi/shared_via_link.png
 create mode 100644 src/main/res/drawable/shared_via_link.xml

diff --git a/src/main/res/drawable-hdpi/shared_via_link.png b/src/main/res/drawable-hdpi/shared_via_link.png
deleted file mode 100644
index a7c3fd6ba373b73581762ec9d593729cc483c66d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 992
zcmV<610Vc}P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H116@f(K~zYI&6UqfBWD=LpEvF#%#0b)M8v^(5lLiQc4^T}GBYVj
z!BOy!=&{#=?O}JpEx2CX(qrkRr{YDtDJFv2WE?{@beH~+j5&CT6R2q7#Qbp6`1ImP
zlBT<^w$S(XKJWW}KD;mA_k98W<3{eYIGfE1`FuW9DwP<PWh;Y&gGsN~tKM6Hh;~&~
z=QK?V7YYTtRp&Ua9t;LmpU?N4=lKc%z=ONMx3{+!W3iZsh%IBLX;RT>G;-bj3IM=%
zAGpnC15p%TPft((C`nS9q9_CaNG6lAuIti!?VuBUW@ctf6vZcmkUtU8hKS#3n)dPe
z`8j16h5!INx7xwG-~a%GkgJ}a9^G0~tJS&zZgE7nfnU#iP$(20T78<P&07gnRejb0
zK6h|%@HrydEx4+x3#nA<5deV8<+}8EJc)M-vf1oM$z<}=c6dA<pI=&9`b<^TrvLyu
zJ3G(T*ViLgS64s?fj}UzIWjVm{zm~K+RNqgU_PG@ot~aL008`c|F5DbKGk)7HWrJ0
zQm@w`l}bg9j*cGJ>-Eb<qXC2vP!vUzWqICW{Y`*~_CzA_?b+Gc<4UFCwCWtkWe6d4
zj^n-=A0Ph>0N~{0gwEx1p`oE6y{oGWCMPF%!{P9kgpfBK1&C<h+S+;<jYj>|YL)Kp
z?k-tl#bVKih&0dh6_#b2)8eFQx;8a6m5M|nv(4}pft8kxjg4TV(STeo=N%Xrh`ZhH
z8UR2#o&HeQ^;txuE-o&7);fk^N_~BOuR@{F7wzyCfvT!=&1rEs9FEb^(N}^XY*G{j
zilW55Uhhjy(_ZZF?>__p=<n~Z4i69i#IkI@6CB|BCLbOi`d3y~!p&(327~he0J1E<
zaJ$`qjE#-`plRCItE;OwX%Pfr)8p~{(h1xmI6gj>tyj_S_rGqtp>GiJdri|8n&FC~
zXp$r?ybXSHMCEdsvkJYvy}!5L&`$97w7gZoFw9L_Ow;rtqV3;+16+SNx~@yh%gc+V
zX;KtL;l#wm&rYW^Q!Exg*xTECbXWL|001B!k1wvRt%W;Ix+A<rU>F9I$z-1I?(WK_
zX;N0*<#JsH0)b6gmgnCW-XgG?uIrLv7(%sLWt>ju1<&&d>*4xew!Z+3ee!b6kz^YH
O0000<MNUMnLSTaRYSfSb

diff --git a/src/main/res/drawable-mdpi/shared_via_link.png b/src/main/res/drawable-mdpi/shared_via_link.png
deleted file mode 100644
index 7426f07582eff27cb957f2e806705f73ad58f7d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10y;@VK~y-6m5?!L8ets8|DQdg_i0TI;jExU4RH+xK~V^ZT4JCn
z++1j&9lJ!5J!46eP8~Y6OTbN#NJuIw9z7AUO>q!hL@{Jgtap{(=ONtJNw^f#kT?GM
z{~qr>fCq?DiYcYYctdwR8&#=PHrws?8%0rkR;yKUxm=eXkLOb`7@RTp!G%KMMY&ww
zS5=jDI-Tmx%?;n}c3+uHCJF!_P4~f)B<&MI*ia~Ro=&H?QmNDt!!UZk-+x9aMRyt)
z;cz&7CJ4eILP!k+0+$@eO$i|@0KhIZC>D#GM%eH7UjP75N=>3D9t?*=%yC=?A*3$c
zpxf>4s;bI{LZNfJ-Tot=&%f{Y`=@5Jd0Ma6w=u@V=kt9A0JxQ)R4NIB!QiQ)C_ab7
zF^$DyCk(@IlgR}4dc7@&!_l+ZY$O_u9>?Qx@s>fURN9dwY47^_`mxz;9*@UkOS9SB
z@p`>y9LG&HO<Qrh-M=G|$cJPynVWOWyt62Z2ZRuIG#YtVS644&S$?VO`maW#u{Rox
zEP+6v&GY;f09+YUGXMacPUrQ!b0U#A1pruIU;o)^wNmrWYiny?7VTxClww(yeLT<q
z5d`5KLP!SyXti3YTCMh+Wmyu9Mvr5$*tdlS06;LtvMkGNwOZXC3<kDrHhXA<jh+7$
z0szS6a&IL`+Fe>&(wCQ)r^De8V~p>G0RSEW0Aw<m@0zADx~@N&&1M$2+uh#S*f>cf
j5?}uZFBGMeeaQb`G6NIjfv|X{00000NkvXXu0mjfAL=V7

diff --git a/src/main/res/drawable-xhdpi/shared_via_link.png b/src/main/res/drawable-xhdpi/shared_via_link.png
deleted file mode 100644
index 9ebd6230432d8f61bce20a63010fe69ec5e52def..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1436
zcmV;N1!MY&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11sO?1K~z|U-IiZyQ&$|vf2XnOc9)pt(%q7KQ~D=~DZxpjyJ=Gp
zLD>f4C=~Tk7y}vN!{)>09Bjg-b4>Kb`Dh>drs6<GMF$xO{g*beL^f;7y(YbPH@UR=
z)8>z6ZT#(Fo)FvAHMVZB^LD=H{?6xnf9IUvIRO80Bd=moM63e<4gj_Sz&s%&^{*Jn
zWHMG&RgY_$wp~$_rhGonuq?YM2!h(&+&tuPIQj`8%df<MBuSzqNuLD*fwrelpRO8b
z7zPg<IB?J9a-FnTEai-Bih*b}>K`8;KQ%r+ZhO&pgb+A%=umjqu3g7yCh9f=J~1)z
z#Y(u-=`8g0^ynPN{Yf=Mgu%hV&R8sVglbzh0#{YFdt_wfxj(P3uZP~=-g_M#9Y2`O
zW?4~`z2R{9=<x7xD*!+)m#cg9=+SNfxUwMw(P-3P4Sw+8!C+@+=cj~_;xqZq?CdO&
zB<ZxS>-7Kti9|v`#5V~cnU`9EYHPj*8~^~Co11@aZ*MPeyi_V>1^^b|CH8=-s@=7~
z0RWQ8q(j$rGwm}B^8^5LH5<@0ZRhCd=$Ey?5wSs%q!Y3%GgK1<Aprn$H5ov}tq&eN
zI2jBEtHL!+^Gr`qUqnQvBBmh{iCnmO^QM<-27>_vLAXx{!I}(AO-&sO1On}A!6zmr
zzV7eu-yMlW&LSc~#4V9X<igdfSG$&$mdf+&+qX~lcs!SAf87Q&O?$g?qQ1Vqa3y?b
zXvkhFmEhK`TmD!q)&~HkbUJOWjPdz=agWDyju5iAE(6hMv?rU*?nOk4uIn7tola-L
z<#L@TgcO&TmxWTPRE|ldQU*m)-X(+}%d*o{7ez7N-Q9hL=lO6YV@(6mXw*M5GxOEr
z;-Ucn-Y66bMmpBm*qAe$%`pIgmX?;EySlorSgqFb1u#E9-;9V27K<fnG#Wt^#kk+^
zKV!GsM^|#H8ldI%?%lhMOG`^{0YHjn**qP8`0!z)qA2gvKF{;NY}>XiS&;=30I)`*
zF}Y{Yo;gtz&sKw1H9(6@Fc{>E#Uf<0*)~GR6OQ9%={M<gx-Jw7eHe?yJ^%nnBob|N
zb8{v-&M-_70P-f2spxXKzG-c39jOKfSW${+XJ_9T8ykDB$Rv|VHzE>MRqt4>*3NV~
zO=Ap*_y;03gu~%aWLbWl#&8^`Kig=5wZN+~kjZ4MQ&Ur)uPicFt2GM%2D{z<)BgSY
zM-2u8`2Bv(>-C;)X=(Xwa&q$GjT<+1R>lZ|5cwzYstl;AdOQ#av{g=Y`0(Me9XocM
zpm#SSo?;m0TZUl<c%J`#a&q$G_3PJtE6%y(cDpavWB?KCZr{GWz49f~+uIv{1}~Ra
zLP!AsP9S1KHMq~`i@V+KbA*sQth3Q2;51EZqN3C3EOc~qoL{T9SA)}YE(pTC^};I+
zm>xfV{2CRTnwl2PX0u!ie64f7UIQtM#ge0<BuT8ID0^Quylj9FlHz$@rD7tHFor^*
zqnf6@hlus@c-#{V1}|+k9H8P=EX(po0|Nse=kxip#&O(|!{JElx^AvK=M*lA;@KA!
znVJkB;+9Y-bott~YdaC~g+Zby#=TzecTT5scq8!V3;+NuEG)1yGc)G~2M0TIx!kHU
zZ7>+<ef~Yq^P!ExR~Z2KI}@@jA5j!#cRU^!QmNEdlgU)D*=)KX2={F^+m9^EE^G$8
qs(}?|ECA3509gQ-qtB@SRr?E-SGjh_z;m1c0000<MNUMnLSTZ{pOgFm

diff --git a/src/main/res/drawable-xxhdpi/shared_via_link.png b/src/main/res/drawable-xxhdpi/shared_via_link.png
deleted file mode 100644
index 0c7d2f3b37f0617b013dc97d62ccf60af3296bc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2098
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

diff --git a/src/main/res/drawable-xxxhdpi/shared_via_link.png b/src/main/res/drawable-xxxhdpi/shared_via_link.png
deleted file mode 100644
index 194edfa6b81522f09c4f83e97dde7610c6eabc97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2991
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

diff --git a/src/main/res/drawable/shared_via_link.xml b/src/main/res/drawable/shared_via_link.xml
new file mode 100644
index 0000000000..b57c8f4432
--- /dev/null
+++ b/src/main/res/drawable/shared_via_link.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="16dp"
+        android:height="16dp"
+        android:viewportWidth="16.0"
+        android:viewportHeight="16.0">
+	<path
+        android:fillColor="#FF000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.2"
+        android:strokeMiterLimit="4"
+        android:pathData="M5.99 5.318a3.332 3.332 0 0 0 0 4.693c 0.116 0.118 0.226 0.22 0.355 0.315l1.383-1.383A1.4 1.4 0 0 1 7.33 6.66l3.352-3.352c 0.568-0.57 1.442-0.57 2.01 0s 0.57 1.442 0 2.01l-1.13 1.132c 0.34 0.725 0.464 1.518 0.377 2.304l2.094-2.095c1.288-1.29 1.288-3.406 0-4.694s-3.405-1.288-4.693 0L5.99 5.318z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="0.2"
+        android:strokeMiterLimit="4"
+        android:pathData="M10.01 10.68a3.332 3.332 0 0 0 0-4.692 3.126 3.126 0 0 0-0.355-0.314L8.272 7.057A1.4 1.4 0 0 1 8.67 9.34l-3.35 3.35c-0.57 0.57-1.444 0.57-2.013 0.002s-0.568-1.442 0-2.01L4.44 9.55a4.288 4.288 0 0 1-0.38-2.305L1.967 9.34c-1.288 1.29-1.288 3.405 0 4.693s3.405 1.29 4.693 0l3.35-3.352z"/>
+</vector>

From 1924766a66f6f949e9628bb965a005fced9a1d1a Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 5 Oct 2017 16:37:00 +0200
Subject: [PATCH 10/18] fix lint warnings for clickable items + content
 description

---
 src/main/res/layout/list_item.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 1d96360a64..9f8b370a42 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -52,6 +52,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="4dp"
+                android:contentDescription="@string/favorite_switch"
                 android:src="@drawable/ic_favorite" />
 
             <ImageView
@@ -71,6 +72,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
                 android:scaleType="fitCenter"
+                android:contentDescription="@string/downloader_download_succeeded_ticker"
                 android:layout_marginRight="4dp"/>
 
         </RelativeLayout>
@@ -150,6 +152,7 @@
                 android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:layout_marginRight="@dimen/list_item_share_right_margin"
                 android:clickable="true"
+                android:focusable="true"
                 android:src="@drawable/ic_unshared" />
 
             <ImageView
@@ -161,6 +164,7 @@
                 android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_toRightOf="@id/sharedIcon"
                 android:clickable="true"
+                android:focusable="true"
                 android:src="@drawable/ic_checkbox_blank_outline" />
 
             <ImageView
@@ -171,6 +175,7 @@
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_toRightOf="@id/custom_checkbox"
                 android:clickable="true"
+                android:focusable="true"
                 android:src="@drawable/ic_dots_vertical" />
 
         </RelativeLayout>

From afa497cdff847541b87261bf91572ba0b779e808 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 5 Oct 2017 17:24:03 +0200
Subject: [PATCH 11/18] Fix NPE for grid views (as in non-list-views)

---
 .../android/ui/adapter/FileListListAdapter.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
index db153e5272..779b71f7ef 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -340,13 +340,15 @@ public class FileListListAdapter extends BaseAdapter {
                 checkBoxV.setVisibility(View.VISIBLE);
             }
 
-            ImageView overflowIndicatorV = (ImageView) view.findViewById(R.id.overflow_menu);
-            overflowIndicatorV.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    OCFileListFragmentInterface.onOverflowIconClick(v, temp);
-                }
-            });
+            if (ViewType.LIST_ITEM.equals(viewType)) {
+                ImageView overflowIndicatorV = (ImageView) view.findViewById(R.id.overflow_menu);
+                overflowIndicatorV.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        OCFileListFragmentInterface.onOverflowIconClick(v, temp);
+                    }
+                });
+            }
 
             // this if-else is needed even though kept-in-sync icon is visible by default
             // because android reuses views in listview

From c5ac05bd559c1774844161aad30f9c44cec97368 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 5 Oct 2017 17:26:40 +0200
Subject: [PATCH 12/18] fix line formatting to 120 characters

---
 src/main/java/com/owncloud/android/files/FileMenuFilter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/src/main/java/com/owncloud/android/files/FileMenuFilter.java
index bfa9e8445d..b43ed2ffd7 100644
--- a/src/main/java/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/main/java/com/owncloud/android/files/FileMenuFilter.java
@@ -85,8 +85,7 @@ public class FileMenuFilter {
      */
     public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg, Context context,
                           boolean overflowMenu) {
-        this(1, Collections.singletonList(targetFile), account, cg, context,
-                overflowMenu);
+        this(1, Collections.singletonList(targetFile), account, cg, context, overflowMenu);
     }
 
     /**

From e558a9910a818a3a1a92c5def493ccdafce5a89a Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Thu, 5 Oct 2017 18:25:24 +0200
Subject: [PATCH 13/18] file local file listing

---
 .../com/owncloud/android/ui/adapter/LocalFileListAdapter.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index 01a6836423..beaa9f2b77 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -178,6 +178,7 @@ public class LocalFileListAdapter extends BaseAdapter implements FilterableListA
                 TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
                 lastModV.setVisibility(View.VISIBLE);
                 lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file.lastModified()));
+                view.findViewById(R.id.overflow_menu).setVisibility(View.GONE);
             }
 
             if (!file.isDirectory()) {

From fde6e8bd82ae226e8c17bb1acd5f4d26f2de1d99 Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Fri, 6 Oct 2017 20:22:36 +0530
Subject: [PATCH 14/18] Hide share and overflow icons in the selected state

---
 .../ui/adapter/FileListListAdapter.java       | 74 ++++++++++++-------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 779b71f7ef..ccb0f089e4 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -231,21 +231,6 @@ public class FileListListAdapter extends BaseAdapter {
 
         if (file != null) {
             ImageView fileIcon = (ImageView) view.findViewById(R.id.thumbnail);
-            ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
-            if (file.isSharedWithSharee() || file.isSharedWithMe()) {
-                sharedIconV.setImageResource(R.drawable.shared_via_users);
-            } else if (file.isSharedViaLink()) {
-                sharedIconV.setImageResource(R.drawable.shared_via_link);
-            } else {
-                sharedIconV.setImageResource(R.drawable.ic_unshared);
-            }
-            final OCFile temp = file;
-            sharedIconV.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    OCFileListFragmentInterface.onShareIconClick(temp);
-                }
-            });
 
             fileIcon.setTag(file.getFileId());
             TextView fileName;
@@ -323,7 +308,6 @@ public class FileListListAdapter extends BaseAdapter {
             }
 
             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
-            checkBoxV.setVisibility(View.GONE);
             view.setBackgroundColor(Color.WHITE);
 
             AbsListView parentList = (AbsListView) parent;
@@ -338,16 +322,12 @@ public class FileListListAdapter extends BaseAdapter {
                     checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
                 }
                 checkBoxV.setVisibility(View.VISIBLE);
-            }
-
-            if (ViewType.LIST_ITEM.equals(viewType)) {
-                ImageView overflowIndicatorV = (ImageView) view.findViewById(R.id.overflow_menu);
-                overflowIndicatorV.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        OCFileListFragmentInterface.onOverflowIconClick(v, temp);
-                    }
-                });
+                hideShareIcon(view);
+                hideOverflowMenuIcon(view, viewType);
+            } else {
+                checkBoxV.setVisibility(View.GONE);
+                showShareIcon(view, file);
+                showOverflowMenuIcon(view, file, viewType);
             }
 
             // this if-else is needed even though kept-in-sync icon is visible by default
@@ -423,6 +403,48 @@ public class FileListListAdapter extends BaseAdapter {
         return view;
     }
 
+    private void showShareIcon(View view, OCFile file) {
+        ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);
+        sharedIconV.setVisibility(View.VISIBLE);
+        if (file.isSharedWithSharee() || file.isSharedWithMe()) {
+            sharedIconV.setImageResource(R.drawable.shared_via_users);
+        } else if (file.isSharedViaLink()) {
+            sharedIconV.setImageResource(R.drawable.shared_via_link);
+        } else {
+            sharedIconV.setImageResource(R.drawable.ic_unshared);
+        }
+        sharedIconV.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                OCFileListFragmentInterface.onShareIconClick(file);
+            }
+        });
+    }
+
+    private void hideShareIcon(View view) {
+        view.findViewById(R.id.sharedIcon).setVisibility(View.GONE);
+    }
+
+    private void showOverflowMenuIcon(View view, OCFile file, ViewType viewType) {
+        if (ViewType.LIST_ITEM.equals(viewType)) {
+            ImageView overflowIndicatorV = (ImageView) view.findViewById(R.id.overflow_menu);
+            overflowIndicatorV.setVisibility(View.VISIBLE);
+            overflowIndicatorV.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    OCFileListFragmentInterface.onOverflowIconClick(v, file);
+                }
+            });
+        }
+    }
+
+    private void hideOverflowMenuIcon(View view, ViewType viewType) {
+        if (ViewType.LIST_ITEM.equals(viewType)) {
+            ImageView overflowIndicatorV = (ImageView) view.findViewById(R.id.overflow_menu);
+            overflowIndicatorV.setVisibility(View.GONE);
+        }
+    }
+
     @Override
     public int getViewTypeCount() {
         return 1;

From 0e352b3bb811f30715a7f8e1087d14936ac88831 Mon Sep 17 00:00:00 2001
From: Hari <rhari991@gmail.com>
Date: Fri, 6 Oct 2017 20:28:22 +0530
Subject: [PATCH 15/18] Hide share option in per-item menu

---
 src/main/java/com/owncloud/android/files/FileMenuFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/src/main/java/com/owncloud/android/files/FileMenuFilter.java
index b43ed2ffd7..1c0fa469da 100644
--- a/src/main/java/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/main/java/com/owncloud/android/files/FileMenuFilter.java
@@ -240,7 +240,8 @@ public class FileMenuFilter {
                 (capability.getFilesSharingApiEnabled().isTrue() ||
                         capability.getFilesSharingApiEnabled().isUnknown()
                 );
-        if ((!shareViaLinkAllowed && !shareWithUsersAllowed) || !isSingleSelection() || !shareApiEnabled) {
+        if ((!shareViaLinkAllowed && !shareWithUsersAllowed) ||
+                !isSingleSelection() || !shareApiEnabled || mOverflowMenu) {
             toHide.add(R.id.action_share_file);
         } else {
             toShow.add(R.id.action_share_file);

From 1bd5c65a0247e1446fb3c55741c9ce2a4ab418b2 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Wed, 18 Oct 2017 21:56:03 +0200
Subject: [PATCH 16/18] fix method call after rebase due to changed method
 signature

---
 .../com/owncloud/android/ui/fragment/OCFileListFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 0f4e3a4ebd..0eae61b37f 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -532,7 +532,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                 getActivity(),
                 true
         );
-        mf.filter(popup.getMenu());
+        mf.filter(popup.getMenu(), false);
         popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {

From be097d238b9e1ecf012de9a7a045f21a51707dc1 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Wed, 18 Oct 2017 21:56:35 +0200
Subject: [PATCH 17/18] fix boolean

---
 .../com/owncloud/android/ui/fragment/OCFileListFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 0eae61b37f..c6c85e0064 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -532,7 +532,7 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                 getActivity(),
                 true
         );
-        mf.filter(popup.getMenu(), false);
+        mf.filter(popup.getMenu(), true);
         popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {

From a2d182cf753226918c27621a8846859a1f228ace Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Wed, 18 Oct 2017 22:03:21 +0200
Subject: [PATCH 18/18] fixed size of the share icon hitbox in list view

---
 src/main/res/layout/list_item.xml | 3 +--
 src/main/res/values/dims.xml      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 9f8b370a42..2bfa727de7 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -148,9 +148,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:layout_marginRight="@dimen/list_item_share_right_margin"
+                android:padding="@dimen/standard_quarter_padding"
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_unshared" />
diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index 5d0ca3c0e7..b3aa0df748 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -47,7 +47,7 @@
     <dimen name="two_line_secondary_text_size">14sp</dimen>
     <dimen name="list_item_avatar_icon_margin">20dp</dimen>
     <dimen name="list_item_avatar_text_margin">20dp</dimen>
-    <dimen name="list_item_share_right_margin">14dp</dimen>
+    <dimen name="list_item_share_right_margin">10dp</dimen>
     <dimen name="account_action_layout_height">72dp</dimen>
     <dimen name="zero">0dp</dimen>
     <dimen name="account_item_layout_height">72dp</dimen>