Skip to content

Commit 8e691b9

Browse files
Add popup to logout (#197)
Text copied from iOS, with the change of books -> downloads
1 parent 33ebbd9 commit 8e691b9

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/ekirjasto/EKirjastoAccountFragment.kt

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.view.View.VISIBLE
88
import android.widget.Button
99
//import android.widget.ProgressBar
1010
import android.widget.TextView
11+
import androidx.appcompat.app.AlertDialog
1112
//import androidx.appcompat.widget.SwitchCompat
1213
//import androidx.constraintlayout.widget.ConstraintLayout
1314
import androidx.core.os.bundleOf
@@ -147,9 +148,9 @@ class EKirjastoAccountFragment : Fragment(R.layout.account_ekirjasto){
147148
override fun onStart() {
148149
super.onStart()
149150
this.configureToolbar()
150-
this.buttonLogout.setOnClickListener(){
151+
this.buttonLogout.setOnClickListener {
151152
this.logger.debug("Logout clicked")
152-
this.viewModel.tryLogout()
153+
this.confirmLogout()
153154
}
154155
this.buttonLoginSuomiFi.setOnClickListener {
155156
this.logger.debug("Login with Suomi.Fi clicked")
@@ -463,6 +464,26 @@ class EKirjastoAccountFragment : Fragment(R.layout.account_ekirjasto){
463464
this.subscriptions.clear()
464465
}
465466

467+
/**
468+
* Show a popup that informs user of logout and asks confirmation.
469+
*/
470+
private fun confirmLogout() {
471+
val builder: AlertDialog.Builder = AlertDialog.Builder(this.requireContext())
472+
builder
473+
.setTitle(R.string.logoutConfirmTitle)
474+
.setMessage(R.string.logoutConfirmMessage)
475+
.setPositiveButton(R.string.logoutConfirmConfirm) { dialog, which ->
476+
//Trigger logout
477+
this.viewModel.tryLogout()
478+
}
479+
.setNeutralButton(R.string.logoutConfirmCancel) { dialog, which ->
480+
//do nothing
481+
}
482+
483+
val dialog: AlertDialog = builder.create()
484+
dialog.show()
485+
}
486+
466487
private fun isPasskeySupported(): Boolean {
467488
return android.os.Build.VERSION.SDK_INT >= 28
468489
}

simplified-ui-accounts/src/main/res/values/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,8 @@
109109
<string name="emailNotValid">Enter a Valid Email Address.</string>
110110
<string name="errorFromServer">Something went wrong. Sign out and back in and try again.</string>
111111
<string name="errorInCreation">Could not finish request. Check internet connection and try again.</string>
112-
112+
<string name="logoutConfirmTitle">Sign out</string>
113+
<string name="logoutConfirmMessage">If you sign out, your downloads and any saved bookmarks will be removed.</string>
114+
<string name="logoutConfirmConfirm">Sign out</string>
115+
<string name="logoutConfirmCancel">Cancel</string>
113116
</resources>

0 commit comments

Comments
 (0)