From ce033cf6fada51fb86419805b018b6ea466c76a5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 5 Mar 2018 23:49:14 +0100
Subject: [PATCH] removing some redundant constants

---
 .../clock/fragments/AlarmFragment.kt                | 13 ++++++++++++-
 .../simplemobiletools/clock/helpers/Constants.kt    |  8 --------
 .../com/simplemobiletools/clock/helpers/DBHelper.kt |  1 +
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
index e1febd78..90d08ef3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
@@ -16,6 +16,7 @@ import com.simplemobiletools.clock.models.Alarm
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.extensions.updateTextColors
 import kotlinx.android.synthetic.main.fragment_alarm.view.*
+import java.util.*
 
 class AlarmFragment : Fragment(), ToggleAlarmInterface {
     private val DEFAULT_ALARM_MINUTES = 480
@@ -66,9 +67,19 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
 
     override fun alarmToggled(id: Int, isEnabled: Boolean) {
         if (context!!.dbHelper.updateAlarmEnabledState(id, isEnabled)) {
-            alarms.firstOrNull { it.id == id }?.isEnabled = isEnabled
+            val alarm = alarms.firstOrNull { it.id == id } ?: return
+            alarm.isEnabled = isEnabled
+            if (isEnabled) {
+                getClosestTriggerTimestamp(alarm)
+            }
         } else {
             activity!!.toast(R.string.unknown_error_occurred)
         }
     }
+
+    private fun getClosestTriggerTimestamp(alarm: Alarm) {
+        val calendar = Calendar.getInstance()
+        calendar.firstDayOfWeek = Calendar.MONDAY
+        val currentDay = (calendar.get(Calendar.DAY_OF_WEEK) + 5) % 7
+    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
index 25e1e3c7..c062345d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
@@ -11,14 +11,6 @@ const val EDITED_TIME_ZONE_TITLES = "edited_time_zone_titles"
 const val TABS_COUNT = 3
 const val EDITED_TIME_ZONE_SEPARATOR = ":"
 
-const val MONDAY_BIT = 1
-const val TUESDAY_BIT = 2
-const val WEDNESDAY_BIT = 4
-const val THURSDAY_BIT = 8
-const val FRIDAY_BIT = 16
-const val SATURDAY_BIT = 32
-const val SUNDAY_BIT = 64
-
 fun getDefaultTimeZoneTitle(id: Int) = getAllTimeZones().firstOrNull { it.id == id }?.title ?: ""
 
 fun getAllTimeZones() = arrayListOf(
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt
index f694fa74..d8520ac9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/DBHelper.kt
@@ -9,6 +9,7 @@ import com.simplemobiletools.clock.extensions.createNewAlarm
 import com.simplemobiletools.clock.models.Alarm
 import com.simplemobiletools.commons.extensions.getIntValue
 import com.simplemobiletools.commons.extensions.getStringValue
+import com.simplemobiletools.commons.helpers.*
 import java.util.*
 
 class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) {