mirror of
https://github.com/Matte23/circolapp.git
synced 2025-12-06 07:29:10 +00:00
Add back button into NewReminderFragment
This commit is contained in:
@@ -69,6 +69,7 @@ class NewReminderFragment : DialogFragment() {
|
|||||||
dialog_time_picker.setIs24HourView(true)
|
dialog_time_picker.setIs24HourView(true)
|
||||||
|
|
||||||
dialog_ok_button.setOnClickListener { next() }
|
dialog_ok_button.setOnClickListener { next() }
|
||||||
|
dialog_back_button.setOnClickListener { back() }
|
||||||
dialog_cancel_button.setOnClickListener { dismiss() }
|
dialog_cancel_button.setOnClickListener { dismiss() }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,6 +77,7 @@ class NewReminderFragment : DialogFragment() {
|
|||||||
if (dateNotChosen) {
|
if (dateNotChosen) {
|
||||||
dialog_date_picker.visibility = View.GONE
|
dialog_date_picker.visibility = View.GONE
|
||||||
dialog_time_picker.visibility = View.VISIBLE
|
dialog_time_picker.visibility = View.VISIBLE
|
||||||
|
dialog_back_button.visibility = View.VISIBLE
|
||||||
dialog_ok_button.text = getString(R.string.dialog_ok)
|
dialog_ok_button.text = getString(R.string.dialog_ok)
|
||||||
dateNotChosen = false
|
dateNotChosen = false
|
||||||
} else {
|
} else {
|
||||||
@@ -128,4 +130,12 @@ class NewReminderFragment : DialogFragment() {
|
|||||||
}.start()
|
}.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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -37,6 +37,20 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/dialog_time_picker" />
|
app:layout_constraintTop_toBottomOf="@+id/dialog_time_picker" />
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/dialog_back_button"
|
||||||
|
style="@style/Widget.MaterialComponents.Button.TextButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginBottom="4dp"
|
||||||
|
android:text="@string/dialog_back"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/dialog_ok_button"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/dialog_time_picker"
|
||||||
|
app:layout_constraintVertical_bias="0.0" />
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/dialog_ok_button"
|
android:id="@+id/dialog_ok_button"
|
||||||
style="@style/Widget.MaterialComponents.Button.TextButton"
|
style="@style/Widget.MaterialComponents.Button.TextButton"
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
<string name="dialog_ok">OK</string>
|
<string name="dialog_ok">OK</string>
|
||||||
<string name="dialog_next">Next</string>
|
<string name="dialog_next">Next</string>
|
||||||
|
<string name="dialog_back">Back</string>
|
||||||
<string name="dialog_cancel">Cancel</string>
|
<string name="dialog_cancel">Cancel</string>
|
||||||
<string name="dialog_licenses">Show third party licenses</string>
|
<string name="dialog_licenses">Show third party licenses</string>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user