"set up custom folder" as element in xml and not in adapter

src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java

@@ -55,12 +55,11 @@ import com.owncloud.android.ui.adapter.FolderSyncAdapter;
 import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
 import com.owncloud.android.ui.dialog.SyncedFolderPreferencesDialogFragment;
 import com.owncloud.android.ui.dialog.parcel.SyncedFolderParcelable;
-import com.owncloud.android.ui.events.CustomFolderEvent;
 import com.owncloud.android.ui.events.InitiateSyncedFolder;
 import com.owncloud.android.utils.AnalyticsUtils;
 import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.FilesSyncHelper;
+import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.ThemeUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -209,10 +208,6 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
                 mHandler.post(new TimerTask() {
                     @Override
                     public void run() {
-                        // strange hack to make everything work as expected
-                        if (syncFolderItems.size() > 0) {
-                            syncFolderItems.add(0, syncFolderItems.get(0));
-                        }
                         mAdapter.setSyncFolderItems(syncFolderItems);
                         setListShown(true);
                     }
@@ -621,20 +616,17 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
         }
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(CustomFolderEvent event) {
-        Log.d(TAG, "Show custom folder magic here");
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    public void onMessageEvent(InitiateSyncedFolder event) {
+        FilesSyncHelper.insertAllDBEntriesForSyncedFolder(event.getSyncedFolder());
+    }
+
+    public void onAddCustomFolderClick(View view) {
+        Log.d(TAG, "Show custom folder dialog");
         SyncedFolderDisplayItem emptyCustomFolder = new SyncedFolderDisplayItem(
                 SyncedFolder.UNPERSISTED_ID, null, null, true, false,
                 false, AccountUtils.getCurrentOwnCloudAccount(this).name,
                 FileUploader.LOCAL_BEHAVIOUR_FORGET, false, null, MediaFolder.CUSTOM);
         onSyncFolderSettingsClick(0, emptyCustomFolder);
-    };
-
-    @Subscribe(threadMode = ThreadMode.BACKGROUND)
-    public void onMessageEvent(InitiateSyncedFolder event) {
-        FilesSyncHelper.insertAllDBEntriesForSyncedFolder(event.getSyncedFolder());
-    };
-
-
+    }
 }

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

@@ -1,22 +1,22 @@
 /**
  *   Nextcloud Android client application
  *
- *   @author Andy Scherzinger
- *   Copyright (C) 2016 Andy Scherzinger
- *   Copyright (C) 2016 Nextcloud
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- *   License as published by the Free Software Foundation; either
- *   version 3 of the License, or any later version.
- *
- *   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 AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- *   You should have received a copy of the GNU Affero General Public
- *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * @author Andy Scherzinger
+ * Copyright (C) 2016 Andy Scherzinger
+ * Copyright (C) 2016 Nextcloud
+ * <p>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ * <p>
+ * 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 AFFERO GENERAL PUBLIC LICENSE for more details.
+ * <p>
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.ui.adapter;
@@ -37,12 +37,9 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.MediaFolder;
 import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import com.owncloud.android.ui.events.CustomFolderEvent;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -98,10 +95,6 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
 
     @Override
     public int getItemCount(int section) {
-        if (section == 0) {
-            return 0;
-        }
-
         if (mSyncFolderItems.get(section).getFilePaths() != null) {
             return mSyncFolderItems.get(section).getFilePaths().size();
         } else {
@@ -111,57 +104,51 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
 
     @Override
     public void onBindHeaderViewHolder(final MainViewHolder holder, final int section) {
-        if (section != 0) {
-            holder.mainHeaderContainer.setVisibility(View.VISIBLE);
-            holder.customFolderHeaderContainer.setVisibility(View.GONE);
+        holder.mainHeaderContainer.setVisibility(View.VISIBLE);
+        holder.customFolderHeaderContainer.setVisibility(View.GONE);
 
-            holder.title.setText(mSyncFolderItems.get(section).getFolderName());
+        holder.title.setText(mSyncFolderItems.get(section).getFolderName());
 
-            if (MediaFolder.VIDEO == mSyncFolderItems.get(section).getType()) {
-                holder.type.setImageResource(R.drawable.ic_video_18dp);
-            } else if (MediaFolder.IMAGE == mSyncFolderItems.get(section).getType()) {
-                holder.type.setImageResource(R.drawable.ic_image_18dp);
-            } else {
-                holder.type.setImageResource(R.drawable.ic_folder_star_18dp);
-            }
+        if (MediaFolder.VIDEO == mSyncFolderItems.get(section).getType()) {
+            holder.type.setImageResource(R.drawable.ic_video_18dp);
+        } else if (MediaFolder.IMAGE == mSyncFolderItems.get(section).getType()) {
+            holder.type.setImageResource(R.drawable.ic_image_18dp);
+        } else {
+            holder.type.setImageResource(R.drawable.ic_folder_star_18dp);
+        }
 
-            holder.syncStatusButton.setVisibility(View.VISIBLE);
-            holder.syncStatusButton.setTag(section);
-            holder.syncStatusButton.setOnClickListener(v -> {
-                mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
-                setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
-                mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
-            });
+        holder.syncStatusButton.setVisibility(View.VISIBLE);
+        holder.syncStatusButton.setTag(section);
+        holder.syncStatusButton.setOnClickListener(v -> {
+            mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
             setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
-
-            holder.syncStatusButton.setVisibility(View.VISIBLE);
-            holder.syncStatusButton.setTag(section);
-            holder.syncStatusButton.setOnClickListener(v -> {
-                mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
-                setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
-                mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
-            });
+            mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
+        });
+        setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
+
+        holder.syncStatusButton.setVisibility(View.VISIBLE);
+        holder.syncStatusButton.setTag(section);
+        holder.syncStatusButton.setOnClickListener(v -> {
+            mSyncFolderItems.get(section).setEnabled(!mSyncFolderItems.get(section).isEnabled());
             setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
+            mListener.onSyncStatusToggleClick(section, mSyncFolderItems.get(section));
+        });
+        setSyncButtonActiveIcon(holder.syncStatusButton, mSyncFolderItems.get(section).isEnabled());
 
-            if (mLight) {
-                holder.menuButton.setVisibility(View.GONE);
-            } else {
-                holder.menuButton.setVisibility(View.VISIBLE);
-                holder.menuButton.setTag(section);
-                holder.menuButton.setOnClickListener(v -> mListener.onSyncFolderSettingsClick(section,
-                        mSyncFolderItems.get(section)));
-            }
+        if (mLight) {
+            holder.menuButton.setVisibility(View.GONE);
         } else {
-            holder.mainHeaderContainer.setVisibility(View.GONE);
-            holder.customFolderHeaderContainer.setVisibility(View.VISIBLE);
-            holder.customFolderHeaderContainer.setOnClickListener(v -> EventBus.getDefault().post(new CustomFolderEvent()));
+            holder.menuButton.setVisibility(View.VISIBLE);
+            holder.menuButton.setTag(section);
+            holder.menuButton.setOnClickListener(v -> mListener.onSyncFolderSettingsClick(section,
+                    mSyncFolderItems.get(section)));
         }
     }
 
+
     @Override
     public void onBindViewHolder(MainViewHolder holder, int section, int relativePosition, int absolutePosition) {
-
-        if (section != 0 && mSyncFolderItems.get(section).getFilePaths() != null) {
+        if (mSyncFolderItems.get(section).getFilePaths() != null) {
             File file = new File(mSyncFolderItems.get(section).getFilePaths().get(relativePosition));
 
             ThumbnailsCacheManager.MediaThumbnailGenerationTask task =
@@ -190,14 +177,6 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
                 holder.counterBar.setVisibility(View.GONE);
                 holder.thumbnailDarkener.setVisibility(View.GONE);
             }
-
-            //holder.itemView.setTag(String.format(Locale.getDefault(), "%d:%d:%d", adjustedSection, relativePos, absolutePos));
-            //holder.itemView.setOnClickListener(this);
-        } else {
-            holder.itemView.setTag(relativePosition % mGridWidth);
-            holder.counterValue.setText(Long.toString(0));
-            holder.counterBar.setVisibility(View.VISIBLE);
-            holder.thumbnailDarkener.setVisibility(View.VISIBLE);
         }
     }
 
@@ -243,7 +222,7 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
     }
 
     private void setSyncButtonActiveIcon(ImageButton syncStatusButton, boolean enabled) {
-        if(enabled) {
+        if (enabled) {
             syncStatusButton.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_cloud_sync_on,
                     ThemeUtils.primaryColor()));
         } else {

src/main/java/com/owncloud/android/ui/events/CustomFolderEvent.java

@@ -1,23 +0,0 @@
-/**
- * Nextcloud Android client application
- *
- * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.owncloud.android.ui.events;
-
-public class CustomFolderEvent {
-}

src/main/res/layout/folder_sync_layout.xml

@@ -67,6 +67,18 @@
                     android:textSize="26sp"/>
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/add_custom_folder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:paddingTop="@dimen/alternate_half_padding"
+                android:paddingBottom="@dimen/alternate_half_padding"
+                android:text="@string/autoupload_custom_folder"
+                android:drawableStart="@drawable/ic_folder_star_18dp"
+                android:drawableLeft="@drawable/ic_folder_star_18dp"
+                android:onClick="onAddCustomFolderClick"/>
+
             <TextView
                 android:id="@android:id/empty"
                 android:layout_width="wrap_content"

src/main/res/values/strings.xml

@@ -683,7 +683,7 @@
     <string name="file_not_found">File not found!</string>
 
     <!-- Auto upload -->
-    <string name="autoupload_custom_folder">Setup a custom folder</string>
+    <string name="autoupload_custom_folder">Set up a custom folder</string>
     <string name="autoupload_create_new_custom_folder">Create new custom folder setup</string>
     <string name="folder_sync_folders">Configure folders</string>