More fixes

Author: levinli303

app/src/main/java/space/celestia/mobilecelestia/browser/BrowserFragment.kt

@@ -104,7 +104,9 @@ fun Browser(linkClicked: (String) -> Unit, openSubsystem: (Selection) -> Unit, a
                 }, navigationIcon = {
                     if (backStack.count() > 1) {
                         IconButton(onClick = dropUnlessResumed {
-                            backStack.removeLastOrNull()
+                            if (backStack.count() > 1) {
+                                backStack.removeLastOrNull()
+                            }
                         }) {
                             Icon(
                                 painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/browser/SubsystemBrowserFragment.kt

@@ -89,7 +89,9 @@ fun SubsystemBrowser(selection: Selection, linkClicked: (String) -> Unit, openSu
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/control/CameraControlContainerFragment.kt

@@ -70,7 +70,9 @@ private fun CameraControlContainer(observerModeLearnMoreClicked: (String, Boolea
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/eventfinder/EventFinderContainerFragment.kt

@@ -81,7 +81,9 @@ private fun EventFinder() {
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/favorite/FavoriteFragment.kt

@@ -86,7 +86,9 @@ private fun FavoriteContainer(shareRequested: (MutableFavoriteBaseItem) -> Unit,
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/resource/AddonFragment.kt

@@ -78,7 +78,9 @@ fun SingleAddonScreen(item: ResourceItem, requestRunScript: (File) -> Unit, requ
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/resource/AddonManagerFragment.kt

@@ -87,7 +87,9 @@ fun AddonManagerScreen(requestRunScript: (File) -> Unit, requestShareAddon: (Str
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/resource/WebBrowserFragment.kt

@@ -79,7 +79,9 @@ fun WebScreen(uri: Uri, requestRunScript: (File) -> Unit, requestShareAddon: (St
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/settings/SettingsFragment.kt

@@ -101,7 +101,9 @@ fun Settings(linkClicked: (String, Boolean) -> Unit, providePreferredDisplay: ()
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),

app/src/main/java/space/celestia/mobilecelestia/settings/TimeSettingsFragment.kt

@@ -61,7 +61,9 @@ fun TimeSettingsContainer() {
             }, navigationIcon = {
                 if (backStack.count() > 1) {
                     IconButton(onClick = dropUnlessResumed {
-                        backStack.removeLastOrNull()
+                        if (backStack.count() > 1) {
+                            backStack.removeLastOrNull()
+                        }
                     }) {
                         Icon(
                             painter = painterResource(R.drawable.ic_action_arrow_back),