Add template card theming

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

app/src/main/java/com/owncloud/android/ui/adapter/RichDocumentsTemplateAdapter.java

@@ -36,7 +36,7 @@ import com.owncloud.android.datamodel.Template;
 import com.owncloud.android.ui.dialog.ChooseRichDocumentsTemplateDialogFragment;
 import com.owncloud.android.utils.NextcloudServer;
 import com.owncloud.android.utils.glide.CustomGlideStreamLoader;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,8 +56,7 @@ public class RichDocumentsTemplateAdapter extends RecyclerView.Adapter<RichDocum
     private CurrentAccountProvider currentAccountProvider;
     private ClientFactory clientFactory;
     private Template selectedTemplate;
-    private final int colorSelected;
-    private final int colorUnselected;
+    private ViewThemeUtils viewThemeUtils;
 
     public RichDocumentsTemplateAdapter(
         ChooseRichDocumentsTemplateDialogFragment.Type type,
@@ -65,15 +64,14 @@ public class RichDocumentsTemplateAdapter extends RecyclerView.Adapter<RichDocum
         Context context,
         CurrentAccountProvider currentAccountProvider,
         ClientFactory clientFactory,
-        ThemeColorUtils themeColorUtils
+        ViewThemeUtils viewThemeUtils
                                        ) {
         this.clickListener = clickListener;
         this.type = type;
         this.context = context;
         this.currentAccountProvider = currentAccountProvider;
         this.clientFactory = clientFactory;
-        colorSelected = themeColorUtils.primaryColor(context, true);
-        colorUnselected = context.getResources().getColor(R.color.grey_200);
+        this.viewThemeUtils = viewThemeUtils;
     }
 
     @NonNull
@@ -118,6 +116,7 @@ public class RichDocumentsTemplateAdapter extends RecyclerView.Adapter<RichDocum
         public ViewHolder(@NonNull TemplateButtonBinding binding) {
             super(binding.getRoot());
             this.binding = binding;
+            viewThemeUtils.files.themeTemplateCardView(this.binding.templateContainer);
             itemView.setOnClickListener(this);
         }
 
@@ -158,12 +157,7 @@ public class RichDocumentsTemplateAdapter extends RecyclerView.Adapter<RichDocum
                 .into(binding.template);
 
             binding.templateName.setText(template.getName());
-
-            if (template == selectedTemplate) {
-                binding.templateContainer.setStrokeColor(colorSelected);
-            } else {
-                binding.templateContainer.setStrokeColor(colorUnselected);
-            }
+            binding.templateContainer.setChecked(template == selectedTemplate);
         }
     }
 

app/src/main/java/com/owncloud/android/ui/adapter/TemplateAdapter.java

@@ -33,13 +33,11 @@ import android.view.ViewGroup;
 import com.bumptech.glide.Glide;
 import com.nextcloud.client.account.CurrentAccountProvider;
 import com.nextcloud.client.network.ClientFactory;
-import com.owncloud.android.R;
 import com.owncloud.android.databinding.TemplateButtonBinding;
 import com.owncloud.android.lib.common.Template;
 import com.owncloud.android.lib.common.TemplateList;
 import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.glide.CustomGlideStreamLoader;
-import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 
 import java.util.ArrayList;
@@ -59,8 +57,6 @@ public class TemplateAdapter extends RecyclerView.Adapter<TemplateAdapter.ViewHo
     private ClientFactory clientFactory;
     private String mimetype;
     private Template selectedTemplate;
-    private final int colorSelected;
-    private final int colorUnselected;
     private final ViewThemeUtils viewThemeUtils;
 
     public TemplateAdapter(
@@ -69,7 +65,6 @@ public class TemplateAdapter extends RecyclerView.Adapter<TemplateAdapter.ViewHo
         Context context,
         CurrentAccountProvider currentAccountProvider,
         ClientFactory clientFactory,
-        ThemeColorUtils themeColorUtils,
         ViewThemeUtils viewThemeUtils
                           ) {
         this.mimetype = mimetype;
@@ -77,8 +72,6 @@ public class TemplateAdapter extends RecyclerView.Adapter<TemplateAdapter.ViewHo
         this.context = context;
         this.currentAccountProvider = currentAccountProvider;
         this.clientFactory = clientFactory;
-        colorSelected = themeColorUtils.primaryColor(context, true);
-        colorUnselected = context.getResources().getColor(R.color.grey_200);
         this.viewThemeUtils = viewThemeUtils;
     }
 
@@ -123,6 +116,7 @@ public class TemplateAdapter extends RecyclerView.Adapter<TemplateAdapter.ViewHo
         public ViewHolder(@NonNull TemplateButtonBinding binding) {
             super(binding.getRoot());
             this.binding = binding;
+            viewThemeUtils.files.themeTemplateCardView(this.binding.templateContainer);
             itemView.setOnClickListener(this);
         }
 
@@ -148,12 +142,7 @@ public class TemplateAdapter extends RecyclerView.Adapter<TemplateAdapter.ViewHo
                 .into(binding.template);
 
             binding.templateName.setText(template.getTitle());
-
-            if (template == selectedTemplate) {
-                binding.templateContainer.setStrokeColor(colorSelected);
-            } else {
-                binding.templateContainer.setStrokeColor(colorUnselected);
-            }
+            binding.templateContainer.setChecked(template == selectedTemplate);
         }
     }
 

app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java

@@ -175,7 +175,7 @@ public class ChooseRichDocumentsTemplateDialogFragment extends DialogFragment im
                                                    getContext(),
                                                    currentAccount,
                                                    clientFactory,
-                                                   themeColorUtils);
+                                                   viewThemeUtils);
         binding.list.setAdapter(adapter);
 
         binding.filename.addTextChangedListener(new TextWatcher() {

app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt

@@ -166,7 +166,6 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
             context,
             currentAccount,
             clientFactory,
-            themeColorUtils,
             viewThemeUtils
         )
         binding.list.adapter = adapter