From 5552ac2c6587c516fb62cebc8ac4c940f2166c80 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 8 Jul 2018 12:50:56 +0200 Subject: [PATCH] reworking the Reminder activity screen a bit --- .../clock/activities/ReminderActivity.kt | 6 ++- .../drawable-hdpi/ic_dismiss_alarm_big.png | Bin 0 -> 874 bytes .../drawable-xhdpi/ic_dismiss_alarm_big.png | Bin 0 -> 1098 bytes .../drawable-xxhdpi/ic_dismiss_alarm_big.png | Bin 0 -> 1632 bytes .../drawable-xxxhdpi/ic_dismiss_alarm_big.png | Bin 0 -> 2131 bytes app/src/main/res/layout/activity_reminder.xml | 35 ++++++++++++------ 6 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_dismiss_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 6f66fb31..3a878930 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt @@ -11,7 +11,10 @@ import com.simplemobiletools.clock.extensions.* import com.simplemobiletools.clock.helpers.ALARM_ID import com.simplemobiletools.clock.helpers.getPassedSeconds import com.simplemobiletools.clock.models.Alarm -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.applyColorFilter +import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.showPickSecondsDialog +import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.helpers.MINUTE_SECONDS import kotlinx.android.synthetic.main.activity_reminder.* @@ -49,7 +52,6 @@ class ReminderActivity : SimpleActivity() { reminder_title.text = label reminder_text.text = if (isAlarmReminder) getFormattedTime(getPassedSeconds(), false, false) else getString(R.string.time_expired) - reminder_stop.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, getAdjustedPrimaryColor()) reminder_stop.setOnClickListener { finish() } diff --git a/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png new file mode 100644 index 0000000000000000000000000000000000000000..28988eb4204591084d5a4ef16c19a93cae0d1199 GIT binary patch literal 874 zcmV-w1C{)VP){J9RX6sx${eO}eqEHKI=j?g_4 zHQb`uHI~cDeMmB_IH!yA^;6Dpx9OGMd8kDaJf}gFrh_jjl}nRKmPKyXBqGAbrby6N zmr|(>O@h+7G^u2p?1(fR`bsdxDzPLxSwu$eFa=EavIkw`I`?|oU`u*U;|L8rC-Gg$ zL1~YayV1u*xi&>VXQL&jOsl!pIK@8IAi{F41XFa3((GZ5y(2Uz$_-4pvNUjoxy3n+ zA|mW*hV`R7&C>1DDAzK_!uTbL5A&o}lbEihW<|NaIdV;mme@X)#WNCzL_}1aJ5b{F$fmIZV36e_ zs>*#1C}?g5*B$ejuC2>?_@gQKK+7Z>|)UyciXk;-G@J=LUa?K)xR{+DZC*1Ww3awFqGYabo}3dU`b0Tame@T?(lSrZ9ujLsIo6lhHlq5RZ6r2` za;#cBL+8vjj-@zAlCedty~KGDIdh*copZKC`zX&mz?~7*=R63Q9a+2&7#&f4&UnB( zk;SzVD_5J-LE@6gVpEB$BXZ;h7Udd5;#k1ik;QT*OT$~+9Jw|{xerq=ZTJ~%xrn?2 z^3jOubM|yxoarXGKA&I&%3_+I-ea`hrVJUXj1`@neS?(YO ziGn*c&z^>zWG>a`_Od{N8BW(IO0t8mB~|50?A9^gGxoEZPU@xqvzqgLuGl0WRGaIp zpGv%-l{((3Hdn_b=E-A{<4PO~cr7ZUv&Utd>lzIsDay^Wc~njthkM9aOPcRhr)gjE z$io~P#&4mQqg~<>XFJLsHc>yy(7+n;zkj?R0Dw@}6W1%F AdH?_b literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png new file mode 100644 index 0000000000000000000000000000000000000000..4703ce91ba04783363e11f6eef11445a030d6ca5 GIT binary patch literal 1098 zcmV-Q1hxB#P)40*5ZktG+qP}nwrx9iv2EMQdK9jW*3KIY{!_hEz2|hDc%JLRTc*1GPjzEW zrcee zu{I?-Jj3Mj#ngO7hoe%G-c%qKWC*TLnN5Cp8`lwCBn@Y61!4z^B>lv)^1-$gD<*x! zqE#NDLrEILW)YIgu>^Z^2~YAVE#w$Y1Ml!Sw{j{gD1rIuNm7YpeUnNPPhu+`cW z&)sax6wdzn3gzyk)+gxzsFcL!e21@LoWYds`SY6QUfL4 zTepnsXEK*Hwu`aI7BPY$*p0v7rQ9}dfE9%0NC{;{q z;d6!H09+?37(16G?JNg#u~q1UbR(v~s+p5YmQ)qC#`O#H{{2bM;c8%}zd4CH7=i0+ zX8gO8_93YU3n&na(FF05ZX;;P!ne} zmr^h-`_Ky$C&_RYU1{Y@u4SjTqmRj%gC$v)(|MC3U3oI*?!6=9$f7?R+t8>ZrHM&PR#dsDA6Y(;@K?=iKqV@kH;e)?0% z5bj}PrC<{Z_7^}T)UYC_b1RSYJ`Lmm$nz<;a3D)jql(ys7kzT#>(;H?uQ}+I^q^(e QV*mgE07*qoM6N<$g8s1uasU7T literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png new file mode 100644 index 0000000000000000000000000000000000000000..fadca3b59c8927f9eb25e336484cc3529cdfb734 GIT binary patch literal 1632 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 + app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/> + + + app:layout_constraintStart_toEndOf="@+id/reminder_draggable" + app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>