From 2f4a4f3b74ef343189e1f01211a6162bb6ed5968 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 31 Aug 2022 19:46:36 +0200
Subject: [PATCH] adding menu at ReminderActivity too

---
 .../clock/activities/ReminderActivity.kt      |   5 +
 app/src/main/res/layout/activity_reminder.xml | 211 ++++++++++--------
 2 files changed, 121 insertions(+), 95 deletions(-)

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 117a2d88..eeb5df91 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
@@ -75,6 +75,11 @@ class ReminderActivity : SimpleActivity() {
         setupEffects()
     }
 
+    override fun onResume() {
+        super.onResume()
+        setupToolbar(reminder_toolbar)
+    }
+
     private fun setupButtons() {
         if (isAlarmReminder) {
             setupAlarmButtons()
diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index 76df940e..51999a68 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -1,108 +1,129 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/reminder_holder"
+    android:id="@+id/reminder_coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/reminder_title"
-        android:layout_width="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.AppBarLayout
+        android:id="@+id/reminder_app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.simplemobiletools.commons.views.MyTextView
-        android:id="@+id/reminder_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/activity_margin"
-        android:textSize="@dimen/reminder_activity_text_size"
-        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.MaterialToolbar
+            android:id="@+id/reminder_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/app_launcher_name"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
 
-    <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" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <ImageView
-        android:id="@+id/reminder_draggable_background"
-        android:layout_width="@dimen/reminder_background_min_size"
-        android:layout_height="@dimen/reminder_background_min_size"
-        android:layout_marginBottom="@dimen/activity_margin"
-        android:alpha="0.2"
-        android:padding="@dimen/medium_margin"
-        android:src="@drawable/pulsing_background"
-        app:layout_constraintBottom_toBottomOf="parent"
-        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" />
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/reminder_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <ImageView
-        android:id="@+id/reminder_draggable"
-        android:layout_width="@dimen/reminder_background_min_size"
-        android:layout_height="@dimen/reminder_background_min_size"
-        android:layout_marginBottom="@dimen/activity_margin"
-        android:padding="@dimen/activity_margin"
-        android:src="@drawable/ic_alarm_vector"
-        app:layout_constraintBottom_toBottomOf="parent"
-        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" />
+        <com.simplemobiletools.commons.views.MyTextView
+            android:id="@+id/reminder_title"
+            android:layout_width="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" />
 
-    <ImageView
-        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/reminder_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/activity_margin"
+            android:textSize="@dimen/reminder_activity_text_size"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/reminder_title"
+            tools:text="14:00" />
 
-    <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_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" />
 
-    <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" />
+        <ImageView
+            android:id="@+id/reminder_draggable_background"
+            android:layout_width="@dimen/reminder_background_min_size"
+            android:layout_height="@dimen/reminder_background_min_size"
+            android:layout_marginBottom="@dimen/activity_margin"
+            android:alpha="0.2"
+            android:padding="@dimen/medium_margin"
+            android:src="@drawable/pulsing_background"
+            app:layout_constraintBottom_toBottomOf="parent"
+            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" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <ImageView
+            android:id="@+id/reminder_draggable"
+            android:layout_width="@dimen/reminder_background_min_size"
+            android:layout_height="@dimen/reminder_background_min_size"
+            android:layout_marginBottom="@dimen/activity_margin"
+            android:padding="@dimen/activity_margin"
+            android:src="@drawable/ic_alarm_vector"
+            app:layout_constraintBottom_toBottomOf="parent"
+            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_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/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>