Card layout for folders

app/src/main/java/eu/faircode/email/AdapterFolder.java

@@ -37,12 +37,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -73,8 +75,12 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     private LifecycleOwner owner;
     private LayoutInflater inflater;
 
+    private boolean cards;
+    private boolean circular;
     private boolean subscriptions;
     private boolean debug;
+
+    private int dp3;
     private int dp12;
     private float textSize;
     private int colorUnread;
@@ -87,8 +93,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     private NumberFormat NF = NumberFormat.getNumberInstance();
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+        private CardView card;
         private View view;
-        private View vwColor;
+        private CardView vwColor;
+
         private ImageView ivState;
         private ImageView ivReadOnly;
 
@@ -117,8 +125,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         ViewHolder(View itemView) {
             super(itemView);
 
+            card = itemView.findViewById(R.id.card);
             view = itemView.findViewById(R.id.clItem);
             vwColor = itemView.findViewById(R.id.vwColor);
+
             ivState = itemView.findViewById(R.id.ivState);
             ivReadOnly = itemView.findViewById(R.id.ivReadOnly);
 
@@ -141,6 +151,22 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
             tvKeywords = itemView.findViewById(R.id.tvKeywords);
             tvError = itemView.findViewById(R.id.tvError);
+
+            if (listener == null) {
+                if (!cards) {
+                    FrameLayout.LayoutParams lparam = (FrameLayout.LayoutParams) card.getLayoutParams();
+                    lparam.setMargins(0, 0, 0, 0);
+                    card.setLayoutParams(lparam);
+
+                    card.setRadius(0);
+                    card.setElevation(0);
+                    card.setCardBackgroundColor(Color.TRANSPARENT);
+
+                    view.setPadding(0, 0, 0, 0);
+                }
+
+                vwColor.setRadius(circular ? dp3 / 2f : 0f);
+            }
         }
 
         private void wire() {
@@ -657,9 +683,12 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         if (zoom == 0)
             zoom = 1;
 
+        this.circular = prefs.getBoolean("circular", true);
+        this.cards = prefs.getBoolean("cards", true);
         this.subscriptions = prefs.getBoolean("subscriptions", false);
         this.debug = prefs.getBoolean("debug", false);
 
+        this.dp3 = Helper.dp2pixels(context, 12);
         this.dp12 = Helper.dp2pixels(context, 12);
         this.textSize = Helper.getTextSize(context, zoom);
         this.colorUnread = Helper.resolveColor(context, R.attr.colorUnread);

app/src/main/java/eu/faircode/email/FragmentFolders.java

@@ -66,6 +66,8 @@ public class FragmentFolders extends FragmentBase {
     private FloatingActionButton fab;
     private FloatingActionButton fabError;
 
+    private boolean cards;
+
     private long account;
     private boolean show_hidden = false;
     private String searching = null;
@@ -82,6 +84,9 @@ public class FragmentFolders extends FragmentBase {
         // Get arguments
         Bundle args = getArguments();
         account = args.getLong("account", -1);
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        cards = prefs.getBoolean("cards", true);
     }
 
     @Override
@@ -137,6 +142,7 @@ public class FragmentFolders extends FragmentBase {
         LinearLayoutManager llm = new LinearLayoutManager(getContext());
         rvFolder.setLayoutManager(llm);
 
+        if (!cards) {
             DividerItemDecoration itemDecorator = new DividerItemDecoration(getContext(), llm.getOrientation()) {
                 @Override
                 public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
@@ -148,6 +154,7 @@ public class FragmentFolders extends FragmentBase {
             };
             itemDecorator.setDrawable(getContext().getDrawable(R.drawable.divider));
             rvFolder.addItemDecoration(itemDecorator);
+        }
 
         adapter = new AdapterFolder(this, account, show_hidden, null);
         rvFolder.setAdapter(adapter);

app/src/main/res/layout/item_folder.xml

@@ -4,18 +4,30 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <androidx.cardview.widget.CardView
+        android:id="@+id/card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="6dp"
+        app:cardBackgroundColor="?attr/colorCardBackground"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="6dp">
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/activatableItemBackground"
-        android:foreground="?attr/selectableItemBackground">
+            android:foreground="?attr/selectableItemBackground"
+            android:padding="6dp">
 
-        <View
+            <androidx.cardview.widget.CardView
                 android:id="@+id/vwColor"
                 android:layout_width="6dp"
                 android:layout_height="0dp"
-            android:background="?attr/colorAccent"
+                app:cardBackgroundColor="?attr/colorAccent"
+                app:cardCornerRadius="1.5dp"
+                app:cardElevation="0dp"
                 app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -245,4 +257,5 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvError" />
         </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>

app/src/main/res/layout/item_folder_unselectable.xml

@@ -4,16 +4,28 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <androidx.cardview.widget.CardView
+        android:id="@+id/card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="6dp"
+        app:cardBackgroundColor="?attr/colorCardBackground"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="6dp">
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
             android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="6dp">
 
-        <View
+            <androidx.cardview.widget.CardView
                 android:id="@+id/vwColor"
                 android:layout_width="6dp"
                 android:layout_height="0dp"
-            android:background="?attr/colorAccent"
+                app:cardBackgroundColor="?attr/colorAccent"
+                app:cardCornerRadius="1.5dp"
+                app:cardElevation="0dp"
                 app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -77,4 +89,5 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvName" />
         </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>