From 9352fa0221e7011bfd05b7669d1dbda5fc9073c2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 8 Jul 2018 15:03:20 +0200
Subject: [PATCH] allow dragging the center item at the ReminderActivity

---
 .../clock/activities/ReminderActivity.kt      |  23 ++++++++++++++++--
 .../main/res/drawable-hdpi/ic_alarm_big.png   | Bin 0 -> 895 bytes
 .../main/res/drawable-xhdpi/ic_alarm_big.png  | Bin 0 -> 1112 bytes
 .../main/res/drawable-xxhdpi/ic_alarm_big.png | Bin 0 -> 1616 bytes
 .../res/drawable-xxxhdpi/ic_alarm_big.png     | Bin 0 -> 2238 bytes
 app/src/main/res/layout/activity_reminder.xml |  11 ++++-----
 6 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_alarm_big.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_alarm_big.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_alarm_big.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png

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 deaf3fda..f6dab6b9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
@@ -6,6 +6,7 @@ import android.media.MediaPlayer
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
+import android.view.MotionEvent
 import android.view.animation.AnimationUtils
 import com.simplemobiletools.clock.R
 import com.simplemobiletools.clock.extensions.*
@@ -16,7 +17,6 @@ import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.MINUTE_SECONDS
 import kotlinx.android.synthetic.main.activity_reminder.*
 
-
 class ReminderActivity : SimpleActivity() {
     private val INCREASE_VOLUME_DELAY = 3000L
 
@@ -26,6 +26,7 @@ class ReminderActivity : SimpleActivity() {
     private var alarm: Alarm? = null
     private var mediaPlayer: MediaPlayer? = null
     private var lastVolumeValue = 0.1f
+    private var dragDownX = 0f
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -64,8 +65,26 @@ class ReminderActivity : SimpleActivity() {
     private fun setupButtons() {
         reminder_draggable_background.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulsing_animation))
         reminder_draggable_background.applyColorFilter(getAdjustedPrimaryColor())
+        var minDragX = 0f
+        var maxDragX = 0f
 
-        reminder_stop.setOnClickListener {
+        reminder_dismiss.onGlobalLayout {
+            minDragX = reminder_snooze.left.toFloat()
+            maxDragX = reminder_dismiss.left.toFloat()
+        }
+
+        reminder_draggable.setOnTouchListener { v, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> dragDownX = event.x
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> dragDownX = 0f
+                MotionEvent.ACTION_MOVE -> {
+                    reminder_draggable.x = Math.min(maxDragX, Math.max(minDragX, event.rawX - dragDownX))
+                }
+            }
+            true
+        }
+
+        reminder_dismiss.setOnClickListener {
             finish()
         }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_alarm_big.png b/app/src/main/res/drawable-hdpi/ic_alarm_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..21ed21a47502e90d5e73c80fb3374e4a326c7c28
GIT binary patch
literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0009<Nkl<ZcmeI#
z1CZcI7{&27SP$3c*|u%lwr$(CeOEZ!w!OCP;eXNfRWj(Lv(_)=;6<;iTgxn2xR6fD
zfKFVfIYDDy0sf|m0#U%<z$-LXHnis#oY%=w0CIQ_=NH;59P2ZJ$oUGu`9wyrw!&~I
zWkf!sQ~@aEGa}R2UunqY7UJ$FPmbupi9F8;%wV49IC{tt`P@(3P2|XrB0eNi!O@zH
zm3f#!_zd7dR?uu5O(l`HDey%tM=v6y*+etZg8Qi=O(pkHqM6u|u|)o*tLkE1CJ_14
zHH_mJN2oCzr<v%=zeL8emaiqwYc!Q8=2L3x%^N(yP29p0yg?so`<P;h0^Y{_O+o$r
z9}B>>E}Wl;8_vzFt6Erxn;A~rPZUVxa6JHHy<-rYGLbzs6D7o>rg1&Z<Us+~F^za!
zk!E6lCbFsgD0T(l2O{6nSt;nu*F?T{g`q_0xCm3tjpQi+d0bC*@Tg;0i89P3s)em^
zx~dK?!IaTMA^0BiAvu}Ca(Ex}ozk&8W(dVnSeT)NA(&m2hEFhuOW|RL!!e&I8EvS>
z`Bf$`%<v0NHEooH6EFwNao7Qv6O@D(aVlvt$6-yW#CbtU=#TTEls(MwAx?k!(Fk+>
zT!meaX_QoFbJ|>mosL;aK5T&5Z?3}j!)zcQHpA?c8n(K;*a@?_d{`TERBG5bPWDY`
zI1012eCU9=L>?^1FwD=aAtesT9puM!oJZtEA$L-RQ^ma$sTLl_nXV*!gEK^lScC5|
z!#PxOVkpkHO2W;UHI;~*_{@vXW0Tc2F*hj*TVrliDq8Ru)i^`Rt5fN1((ZQ*&J@}y
z02}Z(00(O}+A#%ZEICTX&6pPyggnmV4LRZk%*{$eE6OmtD<gKrl+jY@xCAqa<&*(E
zn1s0~^tJqe`G*b)L>vCbd{3^zupDKWF>I#*Y|W^Q6FI{XRAZ`nm=-A&c$oO{2Pqp4
zpq$7=&ZWq+fIOFpM9SD-*<s5%Q^uPd!a8)ODNX6jIvma$loL0G4K-)z!hdA(7hN>x
zXv|eiC&V<appoVlU3iH!FVIo*3T-)-XBkFqgL#IdX{-5x6*!TraNBV#rzPAnGXNMB
VWTSTZ5TO77002ovPDHLkV1kVgp;G_=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_alarm_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..b45924d4eb9018306d8a8b8995031d2ce57d7028
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000CZNkl<ZcmeI%
zQ@E=~6vpwjS=+X4+qP}n?p^KnShuxp+c?}RkIm>`C3&Ck+fUM&+0*tQzw6*lGFVy5
z=1?^?Y)g}M0ZnXc@o*wJ23Qv`fE*`U4AgNue>>X(aUp-ZojU6p=H^*SGHhu9*q$6E
z&oZ}#V<|pEU?j_!Cst()AfK_6g<(T}A!!EtnkNn+OVTfFX#UuXDI|?%i@+T^mZT}{
z<-ZK`Bz?;Ysl~ntSJREh`G6LtGnp3N<q5iRC7W0RD>IO!92c4^>gh$=^UP~S%)^27
zV>s0erw<1*j}<XLuaee_dY3r!^Ac&dm9{JMat#x3HI8daAA|<(A?+pRx9V7q?@5}$
zapjjho#FTz&Kad|f>X$n^gYX2Wo*XqN(-6I_<>MAuvx_gKAg?05?&%{U}+(95Yy<2
zX&h8u;6q7z*(zZXh9b|Geqk<0q`=qQ%V8{LMJ&Og+{;%K5V_3$!h*bt3}q3kjFlP7
z-|j3g<Xh>ijT>0H%1XSRHd1t#(ZId@Z7eHWb!<b1EXP?9-AMb8eW`OeJoe>7(z=;x
zfis<L?4NO@Y8M_PX(A_kRSG9Fk)#K8f^&rV;aHNsXBG3rDtu4Uu@;79m;lH(ENTH*
zly3l;z%mwsrvPcuZc3u$W~+e3XaVFY^T$4b{KkqVj)8;~`3=OojG>;PNJjU!Um#&q
zGRRQs%?Bp~a*0`JAmL&_PVy`4TaZCCL<!WuK%~Xou@fMBn*;<B_6B4pb46d|bCbY8
z!skd|bH#Y%)Tn_@MaG#MHbyecA2rYd%s@6aaoi1Wn#Bktyyduih2F?b(F5Ix^fDK`
zgB%n+&_T#M=7Kh4?dXBlLfXv*qmjj;2U-jnZ7wJv^F$9c50W<*WRPZ$KzEq~nvsmT
zU@YQLk|B?<yhFJrW6cHa$XZ^3U@A9PZ%MHx(qS%m%X8cBPa6Uq)rxlxc06{4Uf{V<
z=i&yYA@CmSnTc={(#!wqc-tJY5>FtI;~^HRe(Z8_*yZYsy%>hT7|x|W)$GY6FIWG4
zcDi|>nX8$Cz<21!GfodEKT_B0$L5LUc?6lrGFHaN9xF)LF<rv?Vpj&K=TV`A-66Ed
z|C)xN>Bi+uVxXQ&1A~wj^T8<yTxvmBnvJZCOA$EPe9%ZMqM<@Cwj_hJ(rA9z-}SGw
zc>I;##r*NSTeCr&n+;FT+U*$O1d@J;(y%(t!qGjXr6-kJdV#2;A88*rHa+*@L(=-i
z7;!#8XKh^1a#b#m>u9I52P_V*L!`i0+?{BgFUg_Y$Cnfkxx(V%&{(5|XxNg0g!+L^
zEj}7Ji{beCjWemYxP<w*o(Z@b&$Y~B|2F33AO<*$I1dUB6M#B4<!ZX|L~#f_MMGdV
ewVIlmnbz;1>C}?9xWrum0000<MNUMnLSTZ5929T>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_alarm_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..602a74063ad8b0a5c4244d0fa9469f131025617f
GIT binary patch
literal 1616
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
O0000<MNUMnLSTZZcJuK7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png b/app/src/main/res/drawable-xxxhdpi/ic_alarm_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..e918305ba092c40e2d95a761f82324aeb2f5b997
GIT binary patch
literal 2238
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
M07*qoM6N<$g1a_53IG5A

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index 697aff56..95f1eb7a 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -32,7 +32,6 @@
 
     <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:padding="@dimen/normal_margin"
@@ -52,7 +51,7 @@
         android:padding="@dimen/normal_margin"
         android:src="@drawable/pulsing_background"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
+        app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
         app:layout_constraintTop_toBottomOf="@+id/reminder_text"/>
@@ -61,17 +60,17 @@
         android:id="@+id/reminder_draggable"
         android:layout_width="@dimen/stopwatch_button_small_size"
         android:layout_height="@dimen/stopwatch_button_small_size"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="@dimen/activity_margin"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_alarm"
+        android:src="@drawable/ic_alarm_big"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
+        app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
         app:layout_constraintTop_toBottomOf="@+id/reminder_text"/>
 
     <ImageView
-        android:id="@+id/reminder_stop"
+        android:id="@+id/reminder_dismiss"
         android:layout_width="@dimen/stopwatch_button_small_size"
         android:layout_height="@dimen/stopwatch_button_small_size"
         android:padding="@dimen/normal_margin"