From a25cc92cfc7dbd717be875eb323bd7e04ed2960b Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Tue, 27 Oct 2020 12:40:43 +0330
Subject: [PATCH 1/7] Swipe to delete implementation

---
 .../com/sloupycom/shaper/database/LocalDao.kt |  8 +++---
 .../model/adapter/SwipeToDeleteCallBack.kt    | 23 +++++++++++++++
 .../shaper/model/adapter/TaskAdapter.kt       | 20 ++++++++++++-
 .../com/sloupycom/shaper/view/MainActivity.kt | 28 +++++++++++++++++--
 .../shaper/viewmodel/MainActivityViewModel.kt | 14 ++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 6 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/sloupycom/shaper/model/adapter/SwipeToDeleteCallBack.kt

diff --git a/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt b/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt
index fa85db5..e1b3840 100644
--- a/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt
+++ b/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt
@@ -1,10 +1,7 @@
 package com.sloupycom.shaper.database
 
 import androidx.lifecycle.LiveData
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Update
+import androidx.room.*
 import com.sloupycom.shaper.model.Task
 
 @Dao
@@ -16,6 +13,9 @@ interface LocalDao {
     @Update
     suspend fun update(task: Task)
 
+    @Delete
+    suspend fun delete(task: Task)
+
     @Query ("SELECT * FROM task_table")
     fun getAllTasks(): LiveData<MutableList<Task>>?
 
diff --git a/app/src/main/java/com/sloupycom/shaper/model/adapter/SwipeToDeleteCallBack.kt b/app/src/main/java/com/sloupycom/shaper/model/adapter/SwipeToDeleteCallBack.kt
new file mode 100644
index 0000000..c0dd225
--- /dev/null
+++ b/app/src/main/java/com/sloupycom/shaper/model/adapter/SwipeToDeleteCallBack.kt
@@ -0,0 +1,23 @@
+package com.sloupycom.shaper.model.adapter
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+
+class SwipeToDeleteCallBack(private val adapter: TaskAdapter): ItemTouchHelper.SimpleCallback(
+    0,
+    ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+) {
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        return true
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        //Delete item on swipe
+        adapter.deleteItem(viewHolder.adapterPosition)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sloupycom/shaper/model/adapter/TaskAdapter.kt b/app/src/main/java/com/sloupycom/shaper/model/adapter/TaskAdapter.kt
index fe34113..91a62fe 100644
--- a/app/src/main/java/com/sloupycom/shaper/model/adapter/TaskAdapter.kt
+++ b/app/src/main/java/com/sloupycom/shaper/model/adapter/TaskAdapter.kt
@@ -20,8 +20,10 @@ class TaskAdapter(
 
     private val mUtil: Util = Util()
     private var listener: TaskStateListener? = null
+    private var recentDeletedItemPostition: Int? = null
+    private var recentDeletedItem: Task? = null
 
-    var data: List<Task> = mutableListOf()
+    var data: MutableList<Task> = mutableListOf()
         set(value) {
         field = value
         notifyDataSetChanged()
@@ -94,7 +96,23 @@ class TaskAdapter(
         this.listener = listener
     }
 
+    fun deleteItem(position: Int) {
+        recentDeletedItem = data[position]
+        recentDeletedItemPostition = position
+        listener?.onTaskItemDeleted(recentDeletedItem!!)
+        data.drop(recentDeletedItemPostition!!)
+        notifyItemRemoved(recentDeletedItemPostition!!)
+    }
+
+    fun undoRemove() {
+        listener?.onTaskItemDeleteUndo(recentDeletedItem!!)
+        data.add(recentDeletedItemPostition!!, recentDeletedItem!!)
+        notifyItemInserted(recentDeletedItemPostition!!)
+    }
+
     interface TaskStateListener {
         fun onTaskStateChanged(task: Task)
+        fun onTaskItemDeleted(task: Task)
+        fun onTaskItemDeleteUndo(task: Task)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt b/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt
index 4d04628..f3026fd 100644
--- a/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt
+++ b/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt
@@ -4,12 +4,15 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.snackbar.Snackbar
 import com.shahryar.daybar.DayBar
 import com.shahryar.daybar.DayBarChip
 import com.sloupycom.shaper.R
 import com.sloupycom.shaper.databinding.ActivityMainBinding
 import com.sloupycom.shaper.model.Task
+import com.sloupycom.shaper.model.adapter.SwipeToDeleteCallBack
 import com.sloupycom.shaper.model.adapter.TaskAdapter
 import com.sloupycom.shaper.utils.Util
 import com.sloupycom.shaper.viewmodel.MainActivityViewModel
@@ -37,19 +40,30 @@ class MainActivity : AppCompatActivity(), DayBar.OnDayChangedListener {
 
         mBinding?.viewModel?.busyDays?.observe(this, {
             dayBar.setIndicationByDay(Util().getDayListFromDateIndex(it))
+            //TODO: issue -> Indication is not removed when busyDay is removed
         })
 
     }
 
     private fun setupRecyclerView() {
-
-//        adapter.setHasStableIds(true)
         recyclerView_todayDue.adapter = adapter
 
+        //Setup on item swipe listener
+        ItemTouchHelper(SwipeToDeleteCallBack(adapter)).attachToRecyclerView(recyclerView_todayDue)
+
         adapter.setOnTaskStateListener(object : TaskAdapter.TaskStateListener {
             override fun onTaskStateChanged(task: Task) {
                 mBinding?.viewModel?.onTaskStateChanged(task)
             }
+
+            override fun onTaskItemDeleted(task: Task) {
+                mBinding?.viewModel?.deleteTaskItem(task)
+                showItemDeletedSnackBar()
+            }
+
+            override fun onTaskItemDeleteUndo(task: Task) {
+                mBinding?.viewModel?.undoDeleteTaskItem(task)
+            }
         })
 
         //Observe liveData in order to update recyclerView
@@ -92,6 +106,16 @@ class MainActivity : AppCompatActivity(), DayBar.OnDayChangedListener {
         }
     }
 
+    private fun showItemDeletedSnackBar() {
+        Snackbar.make(floatingActionButton, getText(R.string.delete_task), Snackbar.LENGTH_SHORT)
+            .setAnchorView(floatingActionButton)
+            .setBackgroundTint(getColor(R.color.colorSecondary))
+            .setTextColor(getColor(R.color.colorOnSecondary))
+            .setAction(getString(R.string.undo)) { adapter.undoRemove() }
+            .setActionTextColor(getColor(R.color.colorOnSecondary))
+            .show()
+    }
+
     /**
      * Called when selected day from DayBar changes
      */
diff --git a/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt b/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt
index 4c48d28..15441d0 100644
--- a/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt
@@ -3,10 +3,12 @@ package com.sloupycom.shaper.viewmodel
 import android.app.Application
 import androidx.databinding.ObservableField
 import androidx.lifecycle.*
+import com.google.android.material.snackbar.Snackbar
 import com.sloupycom.shaper.database.Local
 import com.sloupycom.shaper.model.Task
 import com.sloupycom.shaper.utils.Util
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import java.util.*
 
 
@@ -60,4 +62,16 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
         }
 
     }
+
+    fun deleteTaskItem(task: Task) {
+        viewModelScope.launch {
+            mLocal.localDao.delete(task)
+        }
+    }
+
+    fun undoDeleteTaskItem(task: Task) {
+        viewModelScope.launch {
+            mLocal.localDao.insert(task)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e11130..7bc3d60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,4 +34,6 @@
     <string name="on_task_added">New task added successfully.</string>
     <string name="separator">Separator</string>
     <string name="question_mark">Question mark</string>
+    <string name="delete_task">Task removed successfully.</string>
+    <string name="undo">Undo</string>
 </resources>
\ No newline at end of file

From f3891527d68d410e543997b58887e5145fbd6ca3 Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Tue, 27 Oct 2020 12:51:51 +0330
Subject: [PATCH 2/7] Version in support dialog

---
 app/src/main/res/layout/dialog_support.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/res/layout/dialog_support.xml b/app/src/main/res/layout/dialog_support.xml
index ccdd29b..4c5f592 100644
--- a/app/src/main/res/layout/dialog_support.xml
+++ b/app/src/main/res/layout/dialog_support.xml
@@ -29,4 +29,14 @@
         android:gravity="center"
         android:text="@string/support_repo"/>
 
+    <TextView
+        android:id="@+id/textView_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextOverLine"
+        android:alpha="0.6"
+        android:layout_marginTop="20dp"
+        android:gravity="bottom"
+        android:text="v1.2.0-alpha"/>
+
 </LinearLayout>
\ No newline at end of file

From db11006ba0775d9ec95c529eab477b5ea8dd7aa8 Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Fri, 30 Oct 2020 21:27:58 +0330
Subject: [PATCH 3/7] DateIndex format changes

---
 .idea/gradle.xml                                   |  1 +
 app/build.gradle                                   |  4 ++--
 .../java/com/sloupycom/shaper/database/LocalDao.kt |  4 ++--
 .../main/java/com/sloupycom/shaper/utils/Util.kt   |  9 ++++-----
 .../sloupycom/shaper/viewmodel/AddTaskViewModel.kt | 14 +++++++-------
 .../shaper/viewmodel/MainActivityViewModel.kt      |  2 +-
 app/src/main/res/layout/dialog_support.xml         |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bb..b617266 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
+        <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
diff --git a/app/build.gradle b/app/build.gradle
index d38fa4e..a4cb56a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.sloupycom.shaper"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.2.1-alpha"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt b/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt
index e1b3840..2c6d270 100644
--- a/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt
+++ b/app/src/main/java/com/sloupycom/shaper/database/LocalDao.kt
@@ -28,8 +28,8 @@ interface LocalDao {
     @Query ("DELETE FROM task_table WHERE next_due < :dateIndex AND state = 'DONE'")
     suspend fun removeOldDoneTasks(dateIndex: String)
 
-    @Query("SELECT DISTINCT next_due FROM task_table")
-    fun getBusyDaysOfWeek(): LiveData<List<String>>?
+    @Query("SELECT DISTINCT next_due FROM task_table WHERE next_due <= :dayUntil")
+    fun getBusyDaysOfWeek(dayUntil: String): LiveData<List<String>>?
 
     @Query ("SELECT * FROM task_table WHERE next_due <= :todayDateIndex")
     suspend fun getReminderTasks(todayDateIndex: String): List<Task>
diff --git a/app/src/main/java/com/sloupycom/shaper/utils/Util.kt b/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
index 0a5ba3f..270443b 100644
--- a/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
+++ b/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
@@ -129,9 +129,9 @@ class Util @Inject constructor(){
 
     fun getDateIndex(date: Calendar): String {
 
-        val year = SimpleDateFormat("yyyy").format(date.time).toInt()
-        val month = SimpleDateFormat("MM").format(date.time).toInt()
-        val day = SimpleDateFormat("dd").format(date.time).toInt()
+        val year = SimpleDateFormat("yyyy").format(date.time)
+        val month = SimpleDateFormat("MM").format(date.time)
+        val day = SimpleDateFormat("dd").format(date.time)
 
         return "$year$month$day"
     }
@@ -149,10 +149,9 @@ class Util @Inject constructor(){
         var days = mutableListOf<Int>()
         if (list != null) {
             for (date in list) {
-                days.add(date.substring(5, 8).toInt())
+                days.add(date.substring(6, 8).toInt())
             }
         }
-
         return days
     }
 
diff --git a/app/src/main/java/com/sloupycom/shaper/viewmodel/AddTaskViewModel.kt b/app/src/main/java/com/sloupycom/shaper/viewmodel/AddTaskViewModel.kt
index c6dabea..2218bb8 100644
--- a/app/src/main/java/com/sloupycom/shaper/viewmodel/AddTaskViewModel.kt
+++ b/app/src/main/java/com/sloupycom/shaper/viewmodel/AddTaskViewModel.kt
@@ -22,7 +22,7 @@ class AddTaskViewModel(private val activity: Activity): AndroidViewModel(activit
     private val mCalendar: Calendar = Calendar.getInstance()
     private val mUtil = Util()
 
-    private var mDateIndex: List<Int>? = null
+    private var mDateIndex: List<String>? = null
     private var onTaskAddedListener: OnTaskAddedListener? = null
     val textDate: ObservableField<String> = ObservableField("")
     var textTitle: String? = null
@@ -43,9 +43,9 @@ class AddTaskViewModel(private val activity: Activity): AndroidViewModel(activit
         val creationDate = mUtil.getDate("EEE MMM dd yyyy", mCalendar.time)
         if (mDateIndex == null) {
             mDateIndex = listOf(
-                SimpleDateFormat("dd").format(mCalendar.time).toInt(),
-                SimpleDateFormat("MM").format(mCalendar.time).toInt(),
-                SimpleDateFormat("yyyy").format(mCalendar.time).toInt()
+                SimpleDateFormat("dd").format(mCalendar.time),
+                SimpleDateFormat("MM").format(mCalendar.time),
+                SimpleDateFormat("yyyy").format(mCalendar.time)
             )
         }
         val nextDue = "${mDateIndex!![2]}${mDateIndex!![1]}${mDateIndex!![0]}"
@@ -76,9 +76,9 @@ class AddTaskViewModel(private val activity: Activity): AndroidViewModel(activit
             date.set(year, month, dayOfMonth)
             textDate.set(SimpleDateFormat("EEEE, MMM dd").format(date.time))
             this.mDateIndex = listOf(
-                SimpleDateFormat("dd").format(date.time).toInt(),
-                SimpleDateFormat("MM").format(date.time).toInt(),
-                SimpleDateFormat("yyyy").format(date.time).toInt())
+                SimpleDateFormat("dd").format(date.time),
+                SimpleDateFormat("MM").format(date.time),
+                SimpleDateFormat("yyyy").format(date.time))
         }
     }
 
diff --git a/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt b/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt
index 15441d0..e042afc 100644
--- a/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/com/sloupycom/shaper/viewmodel/MainActivityViewModel.kt
@@ -30,7 +30,7 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
     val liveDataMerger: MediatorLiveData<MutableList<Task>> = MediatorLiveData<MutableList<Task>>()
 
     var textDate: ObservableField<String> = ObservableField(mUtil.getDate("EEEE, MMM dd"))
-    var busyDays: LiveData<List<String>>? = mLocal.localDao.getBusyDaysOfWeek()
+    var busyDays: LiveData<List<String>>? = mLocal.localDao.getBusyDaysOfWeek(weekIndex[6])
     private lateinit var lastLiveData: LiveData<*>
 
     init {
diff --git a/app/src/main/res/layout/dialog_support.xml b/app/src/main/res/layout/dialog_support.xml
index 4c5f592..a5e341e 100644
--- a/app/src/main/res/layout/dialog_support.xml
+++ b/app/src/main/res/layout/dialog_support.xml
@@ -37,6 +37,6 @@
         android:alpha="0.6"
         android:layout_marginTop="20dp"
         android:gravity="bottom"
-        android:text="v1.2.0-alpha"/>
+        android:text="v1.2.1-alpha"/>
 
 </LinearLayout>
\ No newline at end of file

From 0777d6e9c19ee29e01161404411343f72ad7645c Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Sun, 6 Dec 2020 11:39:22 +0330
Subject: [PATCH 4/7] busyDayIndex bug fixes

---
 .../java/com/sloupycom/shaper/utils/Util.kt   | 20 ++++++++++++++++---
 .../com/sloupycom/shaper/view/MainActivity.kt |  2 +-
 .../com/sloupycom/shaper/utils/UtilTest.kt    |  6 ------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/sloupycom/shaper/utils/Util.kt b/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
index 270443b..aac8c56 100644
--- a/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
+++ b/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
@@ -27,6 +27,17 @@ class Util @Inject constructor(){
         )
     }
 
+    /**
+     * Get date in a string, format: "ddMMyyyy"
+     */
+    @SuppressLint("SimpleDateFormat")
+    fun getTodayDateIndexString(): String {
+        val dd = SimpleDateFormat("dd").format(mCalendar.time).toInt()
+        val MM = SimpleDateFormat("MM").format(mCalendar.time).toInt()
+        val yyyy = SimpleDateFormat("yyyy").format(mCalendar.time).toInt()
+        return "$yyyy$MM$dd"
+    }
+
     /**
      * Get date in a string by custom format
      */
@@ -145,11 +156,14 @@ class Util @Inject constructor(){
         return weekIndex
     }
 
-    fun getDayListFromDateIndex(list: List<String>?): List<Int> {
-        var days = mutableListOf<Int>()
+    fun getBusyWeekDaysFromDateIndex(list: List<String>?): List<Int> {
+        val days = mutableListOf<Int>()
+        val todayIndex = getTodayDateIndexString()
         if (list != null) {
+            days.add(todayIndex.substring(6).toInt())
             for (date in list) {
-                days.add(date.substring(6, 8).toInt())
+                if (date.substring(0, 6) == todayIndex.substring(0, 6))
+                    days.add(date.substring(6).toInt())
             }
         }
         return days
diff --git a/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt b/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt
index f3026fd..c4a1d02 100644
--- a/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt
+++ b/app/src/main/java/com/sloupycom/shaper/view/MainActivity.kt
@@ -39,7 +39,7 @@ class MainActivity : AppCompatActivity(), DayBar.OnDayChangedListener {
         setupRecyclerView()
 
         mBinding?.viewModel?.busyDays?.observe(this, {
-            dayBar.setIndicationByDay(Util().getDayListFromDateIndex(it))
+            dayBar.setIndicationByDay(Util().getBusyWeekDaysFromDateIndex(it))
             //TODO: issue -> Indication is not removed when busyDay is removed
         })
 
diff --git a/app/src/test/java/com/sloupycom/shaper/utils/UtilTest.kt b/app/src/test/java/com/sloupycom/shaper/utils/UtilTest.kt
index 7340990..e2efba9 100644
--- a/app/src/test/java/com/sloupycom/shaper/utils/UtilTest.kt
+++ b/app/src/test/java/com/sloupycom/shaper/utils/UtilTest.kt
@@ -21,11 +21,5 @@ class UtilTest {
         assertEquals(expect, actual)
     }
 
-    @Test
-    fun util_getDayListFromDateIndex() {
-        val actual = Util().getDayListFromDateIndex(listOf("20201021", "20201001", "20201010", "20201013"))
-        val expect = mutableListOf("21", "1", "10", "13")
 
-        assertEquals(expect, actual)
-    }
 }
\ No newline at end of file

From 6902625699ccc4fe62d7d64278a11466499a68ed Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Sun, 6 Dec 2020 11:43:19 +0330
Subject: [PATCH 5/7] V1.2.2-alpha

---
 app/build.gradle                                     | 2 +-
 app/src/main/java/com/sloupycom/shaper/utils/Util.kt | 2 +-
 app/src/main/res/layout/dialog_support.xml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a4cb56a..33fca82 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 2
-        versionName "1.2.1-alpha"
+        versionName "1.2.2-alpha"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/sloupycom/shaper/utils/Util.kt b/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
index aac8c56..23005a4 100644
--- a/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
+++ b/app/src/main/java/com/sloupycom/shaper/utils/Util.kt
@@ -159,7 +159,7 @@ class Util @Inject constructor(){
     fun getBusyWeekDaysFromDateIndex(list: List<String>?): List<Int> {
         val days = mutableListOf<Int>()
         val todayIndex = getTodayDateIndexString()
-        if (list != null) {
+        if (list != null && list.isNotEmpty()) {
             days.add(todayIndex.substring(6).toInt())
             for (date in list) {
                 if (date.substring(0, 6) == todayIndex.substring(0, 6))
diff --git a/app/src/main/res/layout/dialog_support.xml b/app/src/main/res/layout/dialog_support.xml
index a5e341e..d088360 100644
--- a/app/src/main/res/layout/dialog_support.xml
+++ b/app/src/main/res/layout/dialog_support.xml
@@ -37,6 +37,6 @@
         android:alpha="0.6"
         android:layout_marginTop="20dp"
         android:gravity="bottom"
-        android:text="v1.2.1-alpha"/>
+        android:text="v1.2.2-alpha"/>
 
 </LinearLayout>
\ No newline at end of file

From b5961e83b0c989af7d754b253d1b87168a7b897c Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Wed, 6 Jan 2021 11:41:03 +0330
Subject: [PATCH 6/7] show reminder notif only if size not zero

---
 .../main/java/com/sloupycom/shaper/utils/ReminderBroadCast.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/sloupycom/shaper/utils/ReminderBroadCast.kt b/app/src/main/java/com/sloupycom/shaper/utils/ReminderBroadCast.kt
index ba3d779..f5b49db 100644
--- a/app/src/main/java/com/sloupycom/shaper/utils/ReminderBroadCast.kt
+++ b/app/src/main/java/com/sloupycom/shaper/utils/ReminderBroadCast.kt
@@ -37,12 +37,12 @@ class ReminderBroadCast: BroadcastReceiver() {
 
             job.join()
             var notif = ""
-            if (data != null) {
+            if (data != null && data!!.isNotEmpty()) {
                 for (task in data!!) {
                     notif += " · ${task.title}"
                 }
+                createNotification(notif)
             }
-            createNotification(notif)
             Log.d(Constant.TAG, "ALARM: notification created with data size: ${data?.size}")
         }
     }

From 220222d2571e688bff36c3a565c59de86f975d37 Mon Sep 17 00:00:00 2001
From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com>
Date: Wed, 6 Jan 2021 12:30:08 +0330
Subject: [PATCH 7/7] update version to 1.2.2

---
 app/build.gradle                           | 2 +-
 app/src/main/res/layout/dialog_support.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 33fca82..5fdef89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 2
-        versionName "1.2.2-alpha"
+        versionName "1.2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/res/layout/dialog_support.xml b/app/src/main/res/layout/dialog_support.xml
index d088360..3dbac93 100644
--- a/app/src/main/res/layout/dialog_support.xml
+++ b/app/src/main/res/layout/dialog_support.xml
@@ -37,6 +37,6 @@
         android:alpha="0.6"
         android:layout_marginTop="20dp"
         android:gravity="bottom"
-        android:text="v1.2.2-alpha"/>
+        android:text="v1.2.2"/>
 
 </LinearLayout>
\ No newline at end of file