fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

flattening the reminder activity

Browse Source
This commit is contained in:
tibbi
2022-12-25 22:26:20 +01:00
parent 1d1a887073
commit 2542d6fa59
2 changed files with 119 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,10 @@ import com.simplemobiletools.clock.helpers.ALARM_ID
import com.simplemobiletools.clock.helpers.getPassedSeconds import com.simplemobiletools.clock.helpers.getPassedSeconds
import com.simplemobiletools.clock.models.Alarm import com.simplemobiletools.clock.models.Alarm
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.MINUTE_SECONDS
import com.simplemobiletools.commons.helpers.SILENT
import com.simplemobiletools.commons.helpers.isOreoMr1Plus
import com.simplemobiletools.commons.helpers.isOreoPlus
import kotlinx.android.synthetic.main.activity_reminder.* import kotlinx.android.synthetic.main.activity_reminder.*
class ReminderActivity : SimpleActivity() { class ReminderActivity : SimpleActivity() {
@ -40,10 +43,12 @@ class ReminderActivity : SimpleActivity() {
private var dragDownX = 0f private var dragDownX = 0f
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_reminder) setContentView(R.layout.activity_reminder)
showOverLockscreen() showOverLockscreen()
updateTextColors(reminder_holder as ViewGroup) updateTextColors(reminder_holder as ViewGroup)
updateStatusbarColor(getProperBackgroundColor())
val id = intent.getIntExtra(ALARM_ID, -1) val id = intent.getIntExtra(ALARM_ID, -1)
isAlarmReminder = id != -1 isAlarmReminder = id != -1
@ -73,11 +78,6 @@ class ReminderActivity : SimpleActivity() {
setupEffects() setupEffects()
} }
override fun onResume() {
super.onResume()
setupToolbar(reminder_toolbar)
}
private fun setupButtons() { private fun setupButtons() {
if (isAlarmReminder) { if (isAlarmReminder) {
setupAlarmButtons() setupAlarmButtons()

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

@ -1,149 +1,128 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/reminder_coordinator" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/reminder_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/reminder_app_bar_layout" android:id="@+id/reminder_title"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:textSize="@dimen/reminder_activity_title_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/time_expired" />
<com.google.android.material.appbar.MaterialToolbar <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/reminder_toolbar" android:id="@+id/reminder_text"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
android:background="@color/color_primary" android:paddingTop="@dimen/activity_margin"
app:title="@string/app_launcher_name" android:textSize="@dimen/reminder_activity_text_size"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/reminder_title"
tools:text="14:00" />
</com.google.android.material.appbar.AppBarLayout> <ImageView
android:id="@+id/reminder_snooze"
android:layout_width="@dimen/reminder_background_min_size"
android:layout_height="@dimen/reminder_background_min_size"
android:clickable="false"
android:padding="@dimen/activity_margin"
android:src="@drawable/ic_snooze_vector"
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_draggable" />
<androidx.constraintlayout.widget.ConstraintLayout xmlns:tools="http://schemas.android.com/tools" <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/reminder_holder" android:id="@+id/snooze_label"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> android:text="@string/snooze"
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/reminder_snooze" />
<com.simplemobiletools.commons.views.MyTextView <ImageView
android:id="@+id/reminder_title" android:id="@+id/reminder_draggable_background"
android:layout_width="wrap_content" android:layout_width="@dimen/reminder_background_min_size"
android:layout_height="wrap_content" android:layout_height="@dimen/reminder_background_min_size"
android:layout_marginTop="100dp" android:layout_marginBottom="@dimen/activity_margin"
android:textSize="@dimen/reminder_activity_title_size" android:alpha="0.2"
app:layout_constraintEnd_toEndOf="parent" android:padding="@dimen/medium_margin"
app:layout_constraintHorizontal_bias="0.5" android:src="@drawable/pulsing_background"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
tools:text="@string/time_expired" /> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
<com.simplemobiletools.commons.views.MyTextView <ImageView
android:id="@+id/reminder_text" android:id="@+id/reminder_draggable"
android:layout_width="wrap_content" android:layout_width="@dimen/reminder_background_min_size"
android:layout_height="wrap_content" android:layout_height="@dimen/reminder_background_min_size"
android:paddingTop="@dimen/activity_margin" android:layout_marginBottom="@dimen/activity_margin"
android:textSize="@dimen/reminder_activity_text_size" android:padding="@dimen/activity_margin"
app:layout_constraintEnd_toEndOf="parent" android:src="@drawable/ic_alarm_vector"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/reminder_title" app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
tools:text="14:00" /> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
<ImageView <ImageView
android:id="@+id/reminder_snooze" android:id="@+id/reminder_dismiss"
android:layout_width="@dimen/reminder_background_min_size" android:layout_width="@dimen/reminder_background_min_size"
android:layout_height="@dimen/reminder_background_min_size" android:layout_height="@dimen/reminder_background_min_size"
android:clickable="false" android:clickable="false"
android:padding="@dimen/activity_margin" android:padding="@dimen/activity_margin"
android:src="@drawable/ic_snooze_vector" android:src="@drawable/ic_alarm_off_vector"
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable" app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" 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" /> app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/snooze_label" android:id="@+id/dismiss_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/snooze" android:text="@string/dismiss"
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
app:layout_constraintTop_toBottomOf="@+id/reminder_snooze" /> app:layout_constraintTop_toBottomOf="@+id/reminder_dismiss" />
<ImageView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/reminder_draggable_background" android:id="@+id/reminder_guide"
android:layout_width="@dimen/reminder_background_min_size" android:layout_width="wrap_content"
android:layout_height="@dimen/reminder_background_min_size" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_margin" android:alpha="0"
android:alpha="0.2" android:text="@string/swipe_right_to_dismiss"
android:padding="@dimen/medium_margin" app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/pulsing_background" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss" app:layout_constraintTop_toBottomOf="@+id/reminder_draggable" />
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
<ImageView <ImageView
android:id="@+id/reminder_draggable" android:id="@+id/reminder_stop"
android:layout_width="@dimen/reminder_background_min_size" android:layout_width="@dimen/stopwatch_button_size"
android:layout_height="@dimen/reminder_background_min_size" android:layout_height="@dimen/stopwatch_button_size"
android:layout_marginBottom="@dimen/activity_margin" android:layout_marginBottom="@dimen/big_margin"
android:padding="@dimen/activity_margin" android:padding="@dimen/normal_margin"
android:src="@drawable/ic_alarm_vector" android:src="@drawable/ic_stop_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/reminder_snooze" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
<ImageView </androidx.constraintlayout.widget.ConstraintLayout>
android:id="@+id/reminder_dismiss"
android:layout_width="@dimen/reminder_background_min_size"
android:layout_height="@dimen/reminder_background_min_size"
android:clickable="false"
android:padding="@dimen/activity_margin"
android:src="@drawable/ic_alarm_off_vector"
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dismiss_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dismiss"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
app:layout_constraintTop_toBottomOf="@+id/reminder_dismiss" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/reminder_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0"
android:text="@string/swipe_right_to_dismiss"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/reminder_draggable" />
<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:padding="@dimen/normal_margin"
android:src="@drawable/ic_stop_vector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>