fenix
/
Simple-Clock
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reworking the Reminder activity screen a bit

This commit is contained in:
tibbi 2018-07-08 12:50:56 +02:00
parent cf05ba6565
commit 5552ac2c65
6 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
View File

@ -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()
}

BIN
app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 874 B

BIN
app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

35
app/src/main/res/layout/activity_reminder.xml
View File

@ -35,26 +35,37 @@
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_big"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/reminder_stop"
app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/reminder_stop"/>
app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>
<ImageView
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:padding="@dimen/normal_margin"
android:src="@drawable/ic_alarm"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/reminder_stop"
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:layout_width="@dimen/stopwatch_button_size"
android:layout_height="@dimen/stopwatch_button_size"
android:layout_marginBottom="@dimen/big_margin"
android:layout_width="@dimen/stopwatch_button_small_size"
android:layout_height="@dimen/stopwatch_button_small_size"
android:padding="@dimen/normal_margin"
android:src="@drawable/ic_stop"
app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/ic_dismiss_alarm_big"
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>
</android.support.constraint.ConstraintLayout>