chore: refactor

Author: farfromrefug

package.json

@@ -12,6 +12,7 @@
         "setup": "ts-patch install",
         "prepare": "npm run setup",
         "publish": "npm run setup && npm run build.all && lerna publish --create-release=github --force-publish",
+        "publish-major": "npm run setup && npm run build.all && lerna publish major --create-release=github--force-publish",
         "publish-alpha": "npm run setup && npm run build.all && lerna publish --create-release=github --canary --no-git-reset --dist-tag alpha --no-git-tag-version --no-push  --force-publish",
         "build": "lerna run build",
         "build.angular": "lerna run build.angular",

src/bottom-navigation/index.android.ts

@@ -401,11 +401,9 @@ export class BottomNavigation extends TabNavigationBase {
 
         // _onAttachedToWindow called from OS again after it was detach
         // still happens with androidx.fragment:1.3.2
-        const activity = Application.android.foregroundActivity;
-        if (
-            (this._manager && this._manager.isDestroyed()) ||
-            (activity instanceof androidx.fragment.app.FragmentActivity && !activity.getLifecycle().getCurrentState().isAtLeast(androidx.lifecycle.Lifecycle.State.CREATED))
-        ) {
+        const activity = Application.android.foregroundActivity || Application.android.startActivity;
+        const lifecycle = activity?.getLifecycle?.().getCurrentState() || androidx.lifecycle.Lifecycle.State.CREATED;
+        if ((this._manager && this._manager.isDestroyed()) || (activity instanceof androidx.fragment.app.FragmentActivity && !lifecycle.isAtLeast(androidx.lifecycle.Lifecycle.State.CREATED))) {
             return;
         }
 

src/tabs/tabs.android.ts

@@ -512,11 +512,9 @@ export class Tabs extends TabsBase {
 
         // _onAttachedToWindow called from OS again after it was detach
         // still happens with androidx.fragment:1.3.2
-        const activity = Application.android.foregroundActivity;
-        if (
-            (this._manager && this._manager.isDestroyed()) ||
-            (activity instanceof androidx.fragment.app.FragmentActivity && !activity.getLifecycle().getCurrentState().isAtLeast(androidx.lifecycle.Lifecycle.State.CREATED))
-        ) {
+        const activity = Application.android.foregroundActivity || Application.android.startActivity;
+        const lifecycle = activity?.getLifecycle?.().getCurrentState() || androidx.lifecycle.Lifecycle.State.CREATED;
+        if ((this._manager && this._manager.isDestroyed()) || (activity instanceof androidx.fragment.app.FragmentActivity && !lifecycle.isAtLeast(androidx.lifecycle.Lifecycle.State.CREATED))) {
             return;
         }