From 3c5fe3b9354e5b8c2d376e6fc054ce6b57471c09 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 14 Mar 2018 19:21:03 +0100
Subject: [PATCH] add a Snooze button to Reminder activity

---
 app/build.gradle                              |  2 +-
 .../clock/activities/ReminderActivity.kt      | 14 +++++--
 app/src/main/res/layout/activity_reminder.xml | 38 +++++++++++++++----
 .../main/res/layout/fragment_stopwatch.xml    |  1 -
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 71c9c539..aa0db456 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.15.17'
+    implementation 'com.simplemobiletools:commons:3.15.18'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.shawnlin:number-picker:2.4.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
index 81ac9613..b658f03f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
@@ -7,9 +7,7 @@ import com.simplemobiletools.clock.R
 import com.simplemobiletools.clock.extensions.*
 import com.simplemobiletools.clock.helpers.ALARM_ID
 import com.simplemobiletools.clock.models.Alarm
-import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
-import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
-import com.simplemobiletools.commons.extensions.updateTextColors
+import com.simplemobiletools.commons.extensions.*
 import kotlinx.android.synthetic.main.activity_reminder.*
 
 class ReminderActivity : SimpleActivity() {
@@ -36,6 +34,12 @@ class ReminderActivity : SimpleActivity() {
             finish()
         }
 
+        reminder_snooze.beVisibleIf(isAlarmReminder)
+        reminder_snooze.applyColorFilter(config.textColor)
+        reminder_snooze.setOnClickListener {
+            snoozeClicked()
+        }
+
         Handler().postDelayed({
             if (isAlarmReminder) {
                 showAlarmNotification(alarm!!, true)
@@ -64,4 +68,8 @@ class ReminderActivity : SimpleActivity() {
         }
         hideNotificationHandler.removeCallbacksAndMessages(null)
     }
+
+    private fun snoozeClicked() {
+
+    }
 }
diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index dded5957..16309eb4 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/reminder_holder"
     android:layout_width="match_parent"
@@ -10,29 +11,50 @@
         android:id="@+id/reminder_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="100dp"
         android:textSize="@dimen/extra_big_text_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Timer expired"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/reminder_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/reminder_title"
-        android:layout_centerHorizontal="true"
         android:paddingTop="@dimen/activity_margin"
         android:textSize="@dimen/big_text_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/reminder_title"
         tools:text="14:00"/>
 
+    <ImageView
+        android:id="@+id/reminder_snooze"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="@dimen/stopwatch_button_small_size"
+        android:layout_height="@dimen/stopwatch_button_small_size"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@+id/reminder_stop"
+        android:padding="@dimen/normal_margin"
+        android:src="@drawable/ic_snooze"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/reminder_stop"
+        app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/reminder_stop"/>
+
     <ImageView
         android:id="@+id/reminder_stop"
         android:layout_width="@dimen/stopwatch_button_size"
         android:layout_height="@dimen/stopwatch_button_size"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/big_margin"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_stop"/>
+        android:src="@drawable/ic_stop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"/>
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml
index ff3113db..62dc453c 100644
--- a/app/src/main/res/layout/fragment_stopwatch.xml
+++ b/app/src/main/res/layout/fragment_stopwatch.xml
@@ -105,7 +105,6 @@
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/stopwatch_button_small_size"
-        android:layout_alignParentBottom="true"
         android:gravity="center"
         android:letterSpacing="0.1"
         android:paddingLeft="@dimen/activity_margin"