Skip to content

Commit 2542d6f

Browse files
tibbitibbi
committed
flattening the reminder activity
1 parent 1d1a887 commit 2542d6f

File tree

2 files changed

+119
-140
lines changed

2 files changed

+119
-140
lines changed

‎app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ import com.simplemobiletools.clock.helpers.ALARM_ID
2121
import com.simplemobiletools.clock.helpers.getPassedSeconds
2222
import com.simplemobiletools.clock.models.Alarm
2323
import com.simplemobiletools.commons.extensions.*
24-
import com.simplemobiletools.commons.helpers.*
24+
import com.simplemobiletools.commons.helpers.MINUTE_SECONDS
25+
import com.simplemobiletools.commons.helpers.SILENT
26+
import com.simplemobiletools.commons.helpers.isOreoMr1Plus
27+
import com.simplemobiletools.commons.helpers.isOreoPlus
2528
import kotlinx.android.synthetic.main.activity_reminder.*
2629

2730
class ReminderActivity : SimpleActivity() {
@@ -40,10 +43,12 @@ class ReminderActivity : SimpleActivity() {
4043
private var dragDownX = 0f
4144

4245
override fun onCreate(savedInstanceState: Bundle?) {
46+
isMaterialActivity = true
4347
super.onCreate(savedInstanceState)
4448
setContentView(R.layout.activity_reminder)
4549
showOverLockscreen()
4650
updateTextColors(reminder_holder as ViewGroup)
51+
updateStatusbarColor(getProperBackgroundColor())
4752

4853
val id = intent.getIntExtra(ALARM_ID, -1)
4954
isAlarmReminder = id != -1
@@ -73,11 +78,6 @@ class ReminderActivity : SimpleActivity() {
7378
setupEffects()
7479
}
7580

76-
override fun onResume() {
77-
super.onResume()
78-
setupToolbar(reminder_toolbar)
79-
}
80-
8181
private fun setupButtons() {
8282
if (isAlarmReminder) {
8383
setupAlarmButtons()

‎app/src/main/res/layout/activity_reminder.xml‎

Lines changed: 113 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,128 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/reminder_coordinator"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:id="@+id/reminder_holder"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent">
78

8-
<com.google.android.material.appbar.AppBarLayout
9-
android:id="@+id/reminder_app_bar_layout"
10-
android:layout_width="match_parent"
11-
android:layout_height="wrap_content">
9+
<com.simplemobiletools.commons.views.MyTextView
10+
android:id="@+id/reminder_title"
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:layout_marginTop="100dp"
14+
android:textSize="@dimen/reminder_activity_title_size"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintHorizontal_bias="0.5"
17+
app:layout_constraintStart_toStartOf="parent"
18+
app:layout_constraintTop_toTopOf="parent"
19+
tools:text="@string/time_expired" />
1220

13-
<com.google.android.material.appbar.MaterialToolbar
14-
android:id="@+id/reminder_toolbar"
15-
android:layout_width="match_parent"
16-
android:layout_height="?attr/actionBarSize"
17-
android:background="@color/color_primary"
18-
app:title="@string/app_launcher_name"
19-
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
21+
<com.simplemobiletools.commons.views.MyTextView
22+
android:id="@+id/reminder_text"
23+
android:layout_width="wrap_content"
24+
android:layout_height="wrap_content"
25+
android:paddingTop="@dimen/activity_margin"
26+
android:textSize="@dimen/reminder_activity_text_size"
27+
app:layout_constraintEnd_toEndOf="parent"
28+
app:layout_constraintStart_toStartOf="parent"
29+
app:layout_constraintTop_toBottomOf="@+id/reminder_title"
30+
tools:text="14:00" />
2031

21-
</com.google.android.material.appbar.AppBarLayout>
32+
<ImageView
33+
android:id="@+id/reminder_snooze"
34+
android:layout_width="@dimen/reminder_background_min_size"
35+
android:layout_height="@dimen/reminder_background_min_size"
36+
android:clickable="false"
37+
android:padding="@dimen/activity_margin"
38+
android:src="@drawable/ic_snooze_vector"
39+
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
40+
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
41+
app:layout_constraintHorizontal_bias="0.5"
42+
app:layout_constraintStart_toStartOf="parent"
43+
app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
2244

23-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:tools="http://schemas.android.com/tools"
24-
android:id="@+id/reminder_holder"
25-
android:layout_width="match_parent"
26-
android:layout_height="match_parent"
27-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
45+
<com.simplemobiletools.commons.views.MyTextView
46+
android:id="@+id/snooze_label"
47+
android:layout_width="wrap_content"
48+
android:layout_height="wrap_content"
49+
android:text="@string/snooze"
50+
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
51+
app:layout_constraintHorizontal_bias="0.5"
52+
app:layout_constraintStart_toStartOf="parent"
53+
app:layout_constraintTop_toBottomOf="@+id/reminder_snooze" />
2854

29-
<com.simplemobiletools.commons.views.MyTextView
30-
android:id="@+id/reminder_title"
31-
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
33-
android:layout_marginTop="100dp"
34-
android:textSize="@dimen/reminder_activity_title_size"
35-
app:layout_constraintEnd_toEndOf="parent"
36-
app:layout_constraintHorizontal_bias="0.5"
37-
app:layout_constraintStart_toStartOf="parent"
38-
app:layout_constraintTop_toTopOf="parent"
39-
tools:text="@string/time_expired" />
55+
<ImageView
56+
android:id="@+id/reminder_draggable_background"
57+
android:layout_width="@dimen/reminder_background_min_size"
58+
android:layout_height="@dimen/reminder_background_min_size"
59+
android:layout_marginBottom="@dimen/activity_margin"
60+
android:alpha="0.2"
61+
android:padding="@dimen/medium_margin"
62+
android:src="@drawable/pulsing_background"
63+
app:layout_constraintBottom_toBottomOf="parent"
64+
app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
65+
app:layout_constraintHorizontal_bias="0.5"
66+
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
67+
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
4068

41-
<com.simplemobiletools.commons.views.MyTextView
42-
android:id="@+id/reminder_text"
43-
android:layout_width="wrap_content"
44-
android:layout_height="wrap_content"
45-
android:paddingTop="@dimen/activity_margin"
46-
android:textSize="@dimen/reminder_activity_text_size"
47-
app:layout_constraintEnd_toEndOf="parent"
48-
app:layout_constraintStart_toStartOf="parent"
49-
app:layout_constraintTop_toBottomOf="@+id/reminder_title"
50-
tools:text="14:00" />
69+
<ImageView
70+
android:id="@+id/reminder_draggable"
71+
android:layout_width="@dimen/reminder_background_min_size"
72+
android:layout_height="@dimen/reminder_background_min_size"
73+
android:layout_marginBottom="@dimen/activity_margin"
74+
android:padding="@dimen/activity_margin"
75+
android:src="@drawable/ic_alarm_vector"
76+
app:layout_constraintBottom_toBottomOf="parent"
77+
app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
78+
app:layout_constraintHorizontal_bias="0.5"
79+
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
80+
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
5181

52-
<ImageView
53-
android:id="@+id/reminder_snooze"
54-
android:layout_width="@dimen/reminder_background_min_size"
55-
android:layout_height="@dimen/reminder_background_min_size"
56-
android:clickable="false"
57-
android:padding="@dimen/activity_margin"
58-
android:src="@drawable/ic_snooze_vector"
59-
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
60-
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
61-
app:layout_constraintHorizontal_bias="0.5"
62-
app:layout_constraintStart_toStartOf="parent"
63-
app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
82+
<ImageView
83+
android:id="@+id/reminder_dismiss"
84+
android:layout_width="@dimen/reminder_background_min_size"
85+
android:layout_height="@dimen/reminder_background_min_size"
86+
android:clickable="false"
87+
android:padding="@dimen/activity_margin"
88+
android:src="@drawable/ic_alarm_off_vector"
89+
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
90+
app:layout_constraintEnd_toEndOf="parent"
91+
app:layout_constraintHorizontal_bias="0.5"
92+
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
93+
app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
6494

65-
<com.simplemobiletools.commons.views.MyTextView
66-
android:id="@+id/snooze_label"
67-
android:layout_width="wrap_content"
68-
android:layout_height="wrap_content"
69-
android:text="@string/snooze"
70-
app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
71-
app:layout_constraintHorizontal_bias="0.5"
72-
app:layout_constraintStart_toStartOf="parent"
73-
app:layout_constraintTop_toBottomOf="@+id/reminder_snooze" />
95+
<com.simplemobiletools.commons.views.MyTextView
96+
android:id="@+id/dismiss_label"
97+
android:layout_width="wrap_content"
98+
android:layout_height="wrap_content"
99+
android:text="@string/dismiss"
100+
app:layout_constraintEnd_toEndOf="parent"
101+
app:layout_constraintHorizontal_bias="0.5"
102+
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
103+
app:layout_constraintTop_toBottomOf="@+id/reminder_dismiss" />
74104

75-
<ImageView
76-
android:id="@+id/reminder_draggable_background"
77-
android:layout_width="@dimen/reminder_background_min_size"
78-
android:layout_height="@dimen/reminder_background_min_size"
79-
android:layout_marginBottom="@dimen/activity_margin"
80-
android:alpha="0.2"
81-
android:padding="@dimen/medium_margin"
82-
android:src="@drawable/pulsing_background"
83-
app:layout_constraintBottom_toBottomOf="parent"
84-
app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
85-
app:layout_constraintHorizontal_bias="0.5"
86-
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
87-
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
105+
<com.simplemobiletools.commons.views.MyTextView
106+
android:id="@+id/reminder_guide"
107+
android:layout_width="wrap_content"
108+
android:layout_height="wrap_content"
109+
android:alpha="0"
110+
android:text="@string/swipe_right_to_dismiss"
111+
app:layout_constraintBottom_toBottomOf="parent"
112+
app:layout_constraintEnd_toEndOf="parent"
113+
app:layout_constraintStart_toStartOf="parent"
114+
app:layout_constraintTop_toBottomOf="@+id/reminder_draggable" />
88115

89-
<ImageView
90-
android:id="@+id/reminder_draggable"
91-
android:layout_width="@dimen/reminder_background_min_size"
92-
android:layout_height="@dimen/reminder_background_min_size"
93-
android:layout_marginBottom="@dimen/activity_margin"
94-
android:padding="@dimen/activity_margin"
95-
android:src="@drawable/ic_alarm_vector"
96-
app:layout_constraintBottom_toBottomOf="parent"
97-
app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
98-
app:layout_constraintHorizontal_bias="0.5"
99-
app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
100-
app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
116+
<ImageView
117+
android:id="@+id/reminder_stop"
118+
android:layout_width="@dimen/stopwatch_button_size"
119+
android:layout_height="@dimen/stopwatch_button_size"
120+
android:layout_marginBottom="@dimen/big_margin"
121+
android:padding="@dimen/normal_margin"
122+
android:src="@drawable/ic_stop_vector"
123+
app:layout_constraintBottom_toBottomOf="parent"
124+
app:layout_constraintEnd_toEndOf="parent"
125+
app:layout_constraintHorizontal_bias="0.5"
126+
app:layout_constraintStart_toStartOf="parent" />
101127

102-
<ImageView
103-
android:id="@+id/reminder_dismiss"
104-
android:layout_width="@dimen/reminder_background_min_size"
105-
android:layout_height="@dimen/reminder_background_min_size"
106-
android:clickable="false"
107-
android:padding="@dimen/activity_margin"
108-
android:src="@drawable/ic_alarm_off_vector"
109-
app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
110-
app:layout_constraintEnd_toEndOf="parent"
111-
app:layout_constraintHorizontal_bias="0.5"
112-
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
113-
app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
114-
115-
<com.simplemobiletools.commons.views.MyTextView
116-
android:id="@+id/dismiss_label"
117-
android:layout_width="wrap_content"
118-
android:layout_height="wrap_content"
119-
android:text="@string/dismiss"
120-
app:layout_constraintEnd_toEndOf="parent"
121-
app:layout_constraintHorizontal_bias="0.5"
122-
app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
123-
app:layout_constraintTop_toBottomOf="@+id/reminder_dismiss" />
124-
125-
<com.simplemobiletools.commons.views.MyTextView
126-
android:id="@+id/reminder_guide"
127-
android:layout_width="wrap_content"
128-
android:layout_height="wrap_content"
129-
android:alpha="0"
130-
android:text="@string/swipe_right_to_dismiss"
131-
app:layout_constraintBottom_toBottomOf="parent"
132-
app:layout_constraintEnd_toEndOf="parent"
133-
app:layout_constraintStart_toStartOf="parent"
134-
app:layout_constraintTop_toBottomOf="@+id/reminder_draggable" />
135-
136-
<ImageView
137-
android:id="@+id/reminder_stop"
138-
android:layout_width="@dimen/stopwatch_button_size"
139-
android:layout_height="@dimen/stopwatch_button_size"
140-
android:layout_marginBottom="@dimen/big_margin"
141-
android:padding="@dimen/normal_margin"
142-
android:src="@drawable/ic_stop_vector"
143-
app:layout_constraintBottom_toBottomOf="parent"
144-
app:layout_constraintEnd_toEndOf="parent"
145-
app:layout_constraintHorizontal_bias="0.5"
146-
app:layout_constraintStart_toStartOf="parent" />
147-
148-
</androidx.constraintlayout.widget.ConstraintLayout>
149-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
128+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)