sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 04:39:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tutorial step not being dismissable. Fixes #918

Browse source
This commit is contained in:
Phillip Thelen 2018-08-29 18:01:57 +02:00
parent bb8b795cfa
commit f7557491c0
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
View file

@ -45,6 +45,7 @@ class TaskReceiver : BroadcastReceiver() {
private fun createNotification(context: Context, taskTitle: String) {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra("notificationIdentifier", "task_reminder")
val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), intent, 0)
val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -750,6 +750,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
private fun displayTutorialStep(step: TutorialStep, text: String, canBeDeferred: Boolean) {
removeActiveTutorialView()
val view = TutorialView(this, step, this)
this.activeTutorialView = view
view.setTutorialText(text)
@ -765,6 +766,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
private fun displayTutorialStep(step: TutorialStep, texts: List<String>, canBeDeferred: Boolean) {
removeActiveTutorialView()
val view = TutorialView(this, step, this)
this.activeTutorialView = view
view.setTutorialTexts(texts)