Skip to content

Commit d4e5e9c

Browse files
committed
fix go_back_in_history
1 parent 7376195 commit d4e5e9c

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

eventsapp/uix/screens/screenfeedback.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,8 @@ def on_pre_leave(self):
7777

7878
def on_leave(self):
7979
self.manager.transition.direction = 'left'
80+
self.ids.sldr.value = 0
81+
self.ids.root.talk = ''
82+
self.ids.ti_description.text = ''
83+
self.ids.ti_name.text = ''
84+
self.ids.ti_ticketid.text = ''

eventsapp/utils/__init__.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from kivy.app import App
44
from kivy.utils import platform
5+
from kivy.uix.screenmanager import ScreenManagerException
56
if platform == 'android':
67
from jnius import autoclass, cast
78
JS = autoclass('java.lang.String')
@@ -112,21 +113,14 @@ def go_back_in_history():
112113
app = App.get_running_app()
113114
from utils import pause_app
114115
try:
115-
scr = app._navigation_higherarchy.pop()
116-
if scr.name == 'ScreenSchedule':
117-
# we are at top of Nav higherarchy
116+
if not len(app._navigation_higherarchy):
118117
pause_app()
119118
return
120-
121-
# we are not at root of Nav higherarchy
122-
scr = app._navigation_higherarchy[-1]
119+
scr = app._navigation_higherarchy.pop()
123120
load_screen(
124121
scr.name,
125122
manager=scr.manager,
126123
store_back=False)
127-
except IndexError:
124+
except ScreenManagerException:
128125
# check if current screen is schedule screen?
129-
if app.navigation_manager.current == 'ScreenSchedule':
130-
pause_app()
131-
return
132-
load_screen('ScreenSchedule')
126+
pause_app()

0 commit comments

Comments
 (0)