Browse Source

Revert change in favourite icon

Hari 7 years ago
parent
commit
1e7bc78d87

+ 2 - 9
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);

+ 0 - 6
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);

+ 0 - 2
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);

+ 10 - 9
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"