isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dismiss current dialog onPause

Browse Source 
Fixes #1545
This commit is contained in:
Alinson S. Xavier
2022-10-22 16:18:55 -05:00
parent 4de67bd27a
commit 2ba5f5fb98
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
View File

@@ -40,6 +40,7 @@ import org.isoron.uhabits.inject.ActivityContextModule
import org.isoron.uhabits.inject.DaggerHabitsActivityComponent import org.isoron.uhabits.inject.DaggerHabitsActivityComponent
import org.isoron.uhabits.inject.HabitsActivityComponent import org.isoron.uhabits.inject.HabitsActivityComponent
import org.isoron.uhabits.inject.HabitsApplicationComponent import org.isoron.uhabits.inject.HabitsApplicationComponent
import org.isoron.uhabits.utils.dismissCurrentDialog
import org.isoron.uhabits.utils.restartWithFade import org.isoron.uhabits.utils.restartWithFade
class ListHabitsActivity : AppCompatActivity(), Preferences.Listener { class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
@@ -91,6 +92,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
midnightTimer.onPause() midnightTimer.onPause()
screen.onDetached() screen.onDetached()
adapter.cancelRefresh() adapter.cancelRefresh()
dismissCurrentDialog()
super.onPause() super.onPause()
} }

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
View File

@@ -51,6 +51,7 @@ import org.isoron.uhabits.core.ui.views.OnDateClickedListener
import org.isoron.uhabits.intents.IntentFactory import org.isoron.uhabits.intents.IntentFactory
import org.isoron.uhabits.utils.currentTheme import org.isoron.uhabits.utils.currentTheme
import org.isoron.uhabits.utils.dismissCurrentAndShow import org.isoron.uhabits.utils.dismissCurrentAndShow
import org.isoron.uhabits.utils.dismissCurrentDialog
import org.isoron.uhabits.utils.showMessage import org.isoron.uhabits.utils.showMessage
import org.isoron.uhabits.utils.showSendFileScreen import org.isoron.uhabits.utils.showSendFileScreen
import org.isoron.uhabits.widgets.WidgetUpdater import org.isoron.uhabits.widgets.WidgetUpdater
@@ -129,6 +130,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
} }
override fun onPause() { override fun onPause() {
dismissCurrentDialog()
commandRunner.removeListener(this) commandRunner.removeListener(this)
super.onPause() super.onPause()
} }

4
uhabits-android/src/main/java/org/isoron/uhabits/utils/DialogUtils.kt
View File

@@ -7,6 +7,10 @@ import java.lang.ref.WeakReference
var currentDialog: WeakReference<Dialog> = WeakReference(null) var currentDialog: WeakReference<Dialog> = WeakReference(null)
fun dismissCurrentDialog() {
currentDialog.get()?.dismiss()
}
fun Dialog.dismissCurrentAndShow() { fun Dialog.dismissCurrentAndShow() {
currentDialog.get()?.dismiss() currentDialog.get()?.dismiss()
currentDialog = WeakReference(this) currentDialog = WeakReference(this)