From ea822630582990fa19c0b8c280d1fbe5fe6f1c1a Mon Sep 17 00:00:00 2001 From: Vishal Date: Mon, 29 Aug 2022 19:39:48 +0530 Subject: [PATCH 1/3] pause/resume current activity --- assets/src/ba_data/python/bastd/ui/continues.py | 7 +++++++ assets/src/ba_data/python/bastd/ui/creditslist.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/ui/continues.py b/assets/src/ba_data/python/bastd/ui/continues.py index 861c860e..e8a04d85 100644 --- a/assets/src/ba_data/python/bastd/ui/continues.py +++ b/assets/src/ba_data/python/bastd/ui/continues.py @@ -133,8 +133,15 @@ class ContinuesWindow(ba.Window): ba.WeakCall(self._tick), repeat=True, timetype=ba.TimeType.REAL) + + # If there is foreground activity, suspend it. + ba.app.pause() self._tick() + def __del__(self) -> None: + # If there is suspended foreground activity, resume it. + ba.app.resume() + def _tick(self) -> None: # if our target activity is gone or has ended, go away activity = self._activity() diff --git a/assets/src/ba_data/python/bastd/ui/creditslist.py b/assets/src/ba_data/python/bastd/ui/creditslist.py index c266fc56..9176066c 100644 --- a/assets/src/ba_data/python/bastd/ui/creditslist.py +++ b/assets/src/ba_data/python/bastd/ui/creditslist.py @@ -236,7 +236,7 @@ class CreditsListWindow(ba.Window): '${NAME}', 'the Khronos Group') + '\n' '\n' ' ' - ' www.froemling.net\n') + ' www.ballistica.net\n') txt = credits_text lines = txt.splitlines() From 5db00cf6127de64005a557041b04518ed4f880bc Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 31 Aug 2022 12:01:33 +0530 Subject: [PATCH 2/3] V2 accounts can now see Achievements button in Accounts Window --- assets/src/ba_data/python/bastd/ui/account/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/bastd/ui/account/settings.py b/assets/src/ba_data/python/bastd/ui/account/settings.py index cdfb1c7a..e40f7282 100644 --- a/assets/src/ba_data/python/bastd/ui/account/settings.py +++ b/assets/src/ba_data/python/bastd/ui/account/settings.py @@ -232,7 +232,7 @@ class AccountSettingsWindow(ba.Window): show_achievements_button = ( self._signed_in - and account_type in ('Google Play', 'Alibaba', 'Local', 'OUYA')) + and account_type in ('Google Play', 'Alibaba', 'Local', 'OUYA', "V2")) achievements_button_space = 60.0 show_achievements_text = (self._signed_in From fe8def9627142ca28c84533d489e1cc814f5a750 Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 31 Aug 2022 12:23:28 +0530 Subject: [PATCH 3/3] Fixing Pylint --- assets/src/ba_data/python/bastd/ui/account/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/ui/account/settings.py b/assets/src/ba_data/python/bastd/ui/account/settings.py index e40f7282..66bd5ce4 100644 --- a/assets/src/ba_data/python/bastd/ui/account/settings.py +++ b/assets/src/ba_data/python/bastd/ui/account/settings.py @@ -231,8 +231,8 @@ class AccountSettingsWindow(ba.Window): linked_accounts_text_space = 60.0 show_achievements_button = ( - self._signed_in - and account_type in ('Google Play', 'Alibaba', 'Local', 'OUYA', "V2")) + self._signed_in and account_type + in ('Google Play', 'Alibaba', 'Local', 'OUYA', 'V2')) achievements_button_space = 60.0 show_achievements_text = (self._signed_in