From 0babf17c6354c5f2e075a9e736ff882965d3efb5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 8 Dec 2018 20:45:30 +0100
Subject: [PATCH] adding some cross and check icons to checklist items

---
 app/build.gradle                               |  2 +-
 .../notes/pro/adapters/ChecklistAdapter.kt     | 14 ++++++++++++++
 app/src/main/res/layout/item_checklist.xml     | 18 +++++++++++++++---
 app/src/main/res/values/dimens.xml             |  3 +++
 build.gradle                                   |  2 +-
 5 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0f4dc2e4..0b7c2c6a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.5.14'
+    implementation 'com.simplemobiletools:commons:5.5.15'
 
     kapt 'androidx.room:room-compiler:2.0.0'
     implementation 'androidx.room:room-runtime:2.0.0'
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt
index b74dde78..cff0de39 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt
@@ -1,11 +1,13 @@
 package com.simplemobiletools.notes.pro.adapters
 
 import android.graphics.Paint
+import android.graphics.drawable.Drawable
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
+import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.notes.pro.R
@@ -16,8 +18,12 @@ import java.util.*
 class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList<ChecklistItem>, val listener: RefreshRecyclerViewListener?,
                        recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
 
+    private lateinit var crossDrawable: Drawable
+    private lateinit var checkDrawable: Drawable
+
     init {
         setupDragListener(true)
+        initDrawables()
     }
 
     override fun getActionMenuId() = R.menu.cab_delete_only
@@ -46,6 +52,12 @@ class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList<Checkl
 
     override fun getItemCount() = items.size
 
+    fun initDrawables() {
+        val res = activity.resources
+        crossDrawable = res.getColoredDrawableWithColor(R.drawable.ic_cross_big, res.getColor(R.color.theme_dark_red_primary_color))
+        checkDrawable = res.getColoredDrawableWithColor(R.drawable.ic_check_big, res.getColor(R.color.md_green_700))
+    }
+
     private fun setupView(view: View, checklistItem: ChecklistItem) {
         val isSelected = selectedKeys.contains(checklistItem.id)
         view.apply {
@@ -61,6 +73,8 @@ class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList<Checkl
                     alpha = 1f
                 }
             }
+
+            checklist_image.setImageDrawable(if (checklistItem.isDone) checkDrawable else crossDrawable)
             checklist_holder.isSelected = isSelected
         }
     }
diff --git a/app/src/main/res/layout/item_checklist.xml b/app/src/main/res/layout/item_checklist.xml
index 7c365c76..995a2817 100644
--- a/app/src/main/res/layout/item_checklist.xml
+++ b/app/src/main/res/layout/item_checklist.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/checklist_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="@drawable/selector"
-    android:padding="@dimen/activity_margin">
+    android:foreground="@drawable/selector">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/checklist_title"
@@ -18,6 +18,18 @@
         android:layout_marginLeft="@dimen/medium_margin"
         android:layout_marginTop="@dimen/medium_margin"
         android:layout_marginRight="@dimen/medium_margin"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:layout_toLeftOf="@+id/checklist_image"
+        android:paddingLeft="@dimen/activity_margin"
+        android:textSize="@dimen/bigger_text_size"
+        tools:text="Butter"/>
+
+    <ImageView
+        android:id="@+id/checklist_image"
+        android:layout_width="@dimen/checklist_image_size"
+        android:layout_height="@dimen/checklist_image_size"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:padding="@dimen/normal_margin"
+        android:src="@drawable/ic_cross_big"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..25bc7b5d
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="checklist_image_size">64dp</dimen>
+</resources>
diff --git a/build.gradle b/build.gradle
index 1cfbb3a2..d93366c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.11'
 
     repositories {
         google()