From 1db111b747805a9a4e78b66b626b85da2c187a08 Mon Sep 17 00:00:00 2001 From: Matte23 Date: Mon, 23 Sep 2019 19:27:41 +0200 Subject: [PATCH] Add back button into NewReminderFragment --- .../circolapp/fragments/NewReminderFragment.kt | 10 ++++++++++ app/src/main/res/layout/dialog_reminder.xml | 14 ++++++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 25 insertions(+) diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt index dc42976..a0dbf20 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/NewReminderFragment.kt @@ -69,6 +69,7 @@ class NewReminderFragment : DialogFragment() { dialog_time_picker.setIs24HourView(true) dialog_ok_button.setOnClickListener { next() } + dialog_back_button.setOnClickListener { back() } dialog_cancel_button.setOnClickListener { dismiss() } } @@ -76,6 +77,7 @@ class NewReminderFragment : DialogFragment() { if (dateNotChosen) { dialog_date_picker.visibility = View.GONE dialog_time_picker.visibility = View.VISIBLE + dialog_back_button.visibility = View.VISIBLE dialog_ok_button.text = getString(R.string.dialog_ok) dateNotChosen = false } else { @@ -128,4 +130,12 @@ class NewReminderFragment : DialogFragment() { }.start() } } + + private fun back() { + dialog_date_picker.visibility = View.VISIBLE + dialog_time_picker.visibility = View.GONE + dialog_back_button.visibility = View.GONE + dialog_ok_button.text = getString(R.string.dialog_next) + dateNotChosen = true + } } \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_reminder.xml b/app/src/main/res/layout/dialog_reminder.xml index 623a39d..64c925b 100644 --- a/app/src/main/res/layout/dialog_reminder.xml +++ b/app/src/main/res/layout/dialog_reminder.xml @@ -37,6 +37,20 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/dialog_time_picker" /> + + OK Next + Back Cancel Show third party licenses