List item

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

@@ -52,15 +52,12 @@ import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.resources.files.RemoteFile;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
-import com.owncloud.android.ui.events.FavoriteEvent;
 import com.owncloud.android.ui.fragment.ExtendedListFragment;
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -235,25 +232,6 @@ public class FileListListAdapter extends BaseAdapter {
                     fileSizeV.setVisibility(View.VISIBLE);
                     fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
 
-                    final OCFile finalFile = file;
-                    view.findViewById(R.id.favorite_action).setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            EventBus.getDefault().post(new FavoriteEvent(finalFile.getRemotePath(),
-                                    !finalFile.getIsFavorite(), finalFile.getRemoteId()));
-                        }
-                    });
-
-                    if (file.getIsFavorite()) {
-                        if (!view.findViewById(R.id.favorite_action).isSelected()) {
-                            view.findViewById(R.id.favorite_action).setSelected(true);
-                        }
-                    } else {
-                        if (view.findViewById(R.id.favorite_action).isSelected()) {
-                            view.findViewById(R.id.favorite_action).setSelected(false);
-                        }
-                    }
-
 
                 case GRID_ITEM:
                     // filename
@@ -323,6 +301,12 @@ public class FileListListAdapter extends BaseAdapter {
 
             // For all Views
 
+            if (file.getIsFavorite()) {
+                view.findViewById(R.id.favorite_action).setVisibility(View.VISIBLE);
+            } else {
+                view.findViewById(R.id.favorite_action).setVisibility(View.GONE);
+            }
+
             ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
             checkBoxV.setVisibility(View.GONE);
             view.setBackgroundColor(Color.WHITE);

src/main/res/layout/list_item.xml

@@ -30,46 +30,54 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-        <ImageButton
-            android:id="@+id/favorite_action"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:layout_gravity="center_vertical"
-            android:background="@drawable/favorite_button_selector"
-            />
 
-        <FrameLayout
-            android:layout_width="60dp"
+        <RelativeLayout
+            android:layout_width="72dp"
             android:layout_height="@dimen/standard_list_item_size"
             android:paddingBottom="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_padding"
             android:paddingRight="4dp">
 
             <ImageView
-                android:id="@+id/localFileIndicator"
-                android:layout_width="@dimen/file_icon_size"
-                android:layout_height="@dimen/file_icon_size"
-                android:layout_gravity="top|right"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
-                android:src="@drawable/ic_synced" />
+                android:id="@+id/favorite_action"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="top|end"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="4dp"
+                android:src="@drawable/ic_favorite"
+                />
 
             <ImageView
                 android:id="@+id/thumbnail"
                 android:layout_width="32dp"
                 android:layout_height="@dimen/file_icon_size"
-                android:layout_gravity="left|center_vertical"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="8dp"
                 android:src="@drawable/ic_menu_archive" />
 
+
             <ImageView
                 android:id="@+id/keptOfflineIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
+                android:layout_height="12dp"
+                android:layout_width="12dp"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="20dp"
                 android:src="@drawable/ic_available_offline" />
-        </FrameLayout>
+
+            <ImageView
+                android:id="@+id/localFileIndicator"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:src="@drawable/ic_synced"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:scaleType="fitCenter"
+                android:layout_marginRight="4dp"/>
+
+        </RelativeLayout>
 
         <LinearLayout
             android:layout_width="@dimen/zero"