Fix bottom padding occasionally clipping useful stuff.

CraftWorksMC · May 23, 2024 · d0f9959 · d0f9959
1 parent d9aee3a
commit d0f9959
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/com/craftworks/music/ui/elements/BottomSpacer.kt b/app/src/main/java/com/craftworks/music/ui/elements/BottomSpacer.kt
@@ -23,7 +23,7 @@ fun BottomSpacer(){
             SongHelper.currentSong.duration == 0 &&
             SongHelper.currentSong.imageUrl == Uri.EMPTY) {
             if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT)
-                12.dp + 80.dp
+                12.dp + 80.dp + WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
             else
                 0.dp
         }
@@ -42,7 +42,7 @@ fun bottomSpacerHeightDp(): Dp {
         SongHelper.currentSong.duration == 0 &&
         SongHelper.currentSong.imageUrl == Uri.EMPTY) {
         if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT)
-            12.dp + 80.dp
+            12.dp + 80.dp + WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
         else
             0.dp
     }

diff --git a/app/src/main/java/com/craftworks/music/ui/elements/dialogs/ProviderDialogs.kt b/app/src/main/java/com/craftworks/music/ui/elements/dialogs/ProviderDialogs.kt
@@ -245,7 +245,9 @@ fun CreateMediaProviderDialog(setShowDialog: (Boolean) -> Unit, context: Context
                                         username = username.trim()
                                         password = password.trim()
                                         if (url.startsWith("https")){
-                                            url = url.removeSuffix("/").trim() + ":443"
+                                            url = url.removeSuffix("/").trim()
+                                            if (!url.endsWith("443"))
+                                                url += ":443"
                                         }
                                         //saveManager(context).saveSettings()
                                         if (checkNavidromeURL(url, username, password)) {