jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-22 05:20:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved mitigation for Kivy textfield focus bug

Browse Source
This commit is contained in:
Mark Qvist 2022-10-19 22:59:42 +02:00
parent 645c2790a9
commit 7039c0330f
1 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
sbapp/main.py
View File

@ -246,38 +246,50 @@ class SidebandApp(MDApp):
mActivity.startActivity(shareIntent) mActivity.startActivity(shareIntent)
def on_pause(self): def on_pause(self):
RNS.log("App pausing...", RNS.LOG_DEBUG) if self.sideband:
self.sideband.setstate("app.running", True) if self.sideband.getstate("flag.focusfix_pause"):
self.sideband.setstate("app.foreground", False) self.sideband.setstate("flag.focusfix_pause", False)
self.app_state = SidebandApp.PAUSED return True
self.sideband.should_persist_data() else:
if self.conversations_view != None: RNS.log("App pausing...", RNS.LOG_DEBUG)
self.root.ids.conversations_scrollview.effect_cls = ScrollEffect self.sideband.setstate("app.running", True)
# TODO: Check if we actually need this now that the bouncy self.sideband.setstate("app.foreground", False)
# scrolling bug has been eliminated self.app_state = SidebandApp.PAUSED
# self.sideband.setstate("wants.viewupdate.conversations", True) self.sideband.should_persist_data()
self.root.ids.conversations_scrollview.scroll = 1 if self.conversations_view != None:
self.root.ids.conversations_scrollview.effect_cls = ScrollEffect
# TODO: Check if we actually need this now that the bouncy
# scrolling bug has been eliminated
# self.sideband.setstate("wants.viewupdate.conversations", True)
self.root.ids.conversations_scrollview.scroll = 1
RNS.log("App paused", RNS.LOG_DEBUG) RNS.log("App paused", RNS.LOG_DEBUG)
return True return True
else:
return True
def on_resume(self): def on_resume(self):
RNS.log("App resuming...", RNS.LOG_DEBUG) if self.sideband:
self.sideband.setstate("app.running", True) if self.sideband.getstate("flag.focusfix_resume"):
self.sideband.setstate("app.foreground", True) self.sideband.setstate("flag.focusfix_resume", False)
self.sideband.setstate("wants.clear_notifications", True) return True
self.app_state = SidebandApp.ACTIVE else:
if self.conversations_view != None: RNS.log("App resuming...", RNS.LOG_DEBUG)
self.root.ids.conversations_scrollview.effect_cls = ScrollEffect self.sideband.setstate("app.running", True)
# TODO: Check if we actually need this now that the bouncy self.sideband.setstate("app.foreground", True)
# scrolling bug has been eliminated self.sideband.setstate("wants.clear_notifications", True)
# self.sideband.setstate("wants.viewupdate.conversations", True) self.app_state = SidebandApp.ACTIVE
self.root.ids.conversations_scrollview.scroll = 1 if self.conversations_view != None:
self.root.ids.conversations_scrollview.effect_cls = ScrollEffect
else: # TODO: Check if we actually need this now that the bouncy
RNS.log("Conversations view did not exist", RNS.LOG_DEBUG) # scrolling bug has been eliminated
# self.sideband.setstate("wants.viewupdate.conversations", True)
self.root.ids.conversations_scrollview.scroll = 1
else:
RNS.log("Conversations view did not exist", RNS.LOG_DEBUG)
RNS.log("App resumed...", RNS.LOG_DEBUG) RNS.log("App resumed", RNS.LOG_DEBUG)
def on_stop(self): def on_stop(self):
RNS.log("App stopping...", RNS.LOG_DEBUG) RNS.log("App stopping...", RNS.LOG_DEBUG)
@ -383,7 +395,7 @@ class SidebandApp(MDApp):
# the software keyboard on Android. Without this the back # the software keyboard on Android. Without this the back
# button/gesture does not work after the soft-keyboard has # button/gesture does not work after the soft-keyboard has
# appeared for the first time. # appeared for the first time.
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.is_android():
BIND_CLASSES = ["kivymd.uix.textfield.textfield.MDTextField",] BIND_CLASSES = ["kivymd.uix.textfield.textfield.MDTextField",]
for e in self.root.ids: for e in self.root.ids:
@ -392,11 +404,6 @@ class SidebandApp(MDApp):
if ts in BIND_CLASSES: if ts in BIND_CLASSES:
te.bind(focus=self.android_focus_fix) te.bind(focus=self.android_focus_fix)
# RNS.log("Bound "+str(e)+" / "+ts)
# else:
# RNS.log("Did not bind "+str(e)+" / "+ts)
# RNS.log(str(e))
self.root.ids.screen_manager.app = self self.root.ids.screen_manager.app = self
self.root.ids.app_version_info.text = "Sideband v"+__version__+" "+__variant__ self.root.ids.app_version_info.text = "Sideband v"+__version__+" "+__variant__
@ -408,6 +415,8 @@ class SidebandApp(MDApp):
if not val: if not val:
@run_on_ui_thread @run_on_ui_thread
def fix_back_button(): def fix_back_button():
self.sideband.setstate("flag.focusfix_pause", True)
self.sideband.setstate("flag.focusfix_resume", True)
activity = autoclass('org.kivy.android.PythonActivity').mActivity activity = autoclass('org.kivy.android.PythonActivity').mActivity
activity.onWindowFocusChanged(False) activity.onWindowFocusChanged(False)
activity.onWindowFocusChanged(True) activity.onWindowFocusChanged(True)