feat: experimentally retire SheetEnd

Signed-off-by: Infi <infi@infi.sh>

app/src/main/java/chat/revolt/components/generic/SheetEnd.kt

@@ -1,11 +1,2 @@
 package chat.revolt.components.generic
 
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-
-@Composable
-fun SheetEnd(modifier: Modifier = Modifier) {
-    Box {}
-    // Spacer(modifier.windowInsetsPadding(WindowInsets.navigationBars))
-}

app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt

@@ -49,7 +49,6 @@ import androidx.compose.ui.unit.dp
 import chat.revolt.R
 import chat.revolt.api.routes.microservices.autumn.FileArgs
 import chat.revolt.components.generic.RemoteImage
-import chat.revolt.components.generic.SheetEnd
 import kotlinx.coroutines.launch
 import java.io.File
 
@@ -104,7 +103,6 @@ fun FilePreviewSheet(
             }
         }
     }
-    SheetEnd()
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt

@@ -42,7 +42,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import chat.revolt.R
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.screens.settings.AttributionItem
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
@@ -150,7 +149,7 @@ fun AttributionScreen(navController: NavController) {
                     }
                 }
             }
-            SheetEnd()
+
         }
     }
 

app/src/main/java/chat/revolt/sheets/AddServerSheet.kt

@@ -31,7 +31,6 @@ import chat.revolt.activities.InviteActivity
 import chat.revolt.api.REVOLT_APP
 import chat.revolt.components.generic.FormTextField
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.generic.SheetHeaderPadding
 
 @Composable
@@ -98,7 +97,7 @@ fun AddServerSheet() {
         )
     }
 
-    SheetEnd()
+
 }
 
 @Composable

app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt

@@ -20,7 +20,7 @@ import androidx.compose.ui.unit.dp
 import chat.revolt.R
 import chat.revolt.api.RevoltAPI
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
+
 import chat.revolt.internals.Platform
 import kotlinx.coroutines.launch
 
@@ -96,5 +96,5 @@ fun ChannelContextSheet(channelId: String, onHideSheet: suspend () -> Unit) {
         }
     )
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt

@@ -39,7 +39,6 @@ import chat.revolt.api.schemas.ChannelType
 import chat.revolt.callbacks.Action
 import chat.revolt.callbacks.ActionChannel
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.screens.chat.ChannelSheetHeader
 import chat.revolt.internals.extensions.rememberChannelPermissions
 import chat.revolt.screens.chat.dialogs.InviteDialog
@@ -232,5 +231,5 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
         )
     }
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/ColourPickerSheet.kt

@@ -55,7 +55,6 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import chat.revolt.R
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.internals.TailwindColourScheme
 
 enum class ColourPickerMode {
@@ -623,5 +622,5 @@ fun ColumnScope.ColourPickerSheet(
         }
     }
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt

@@ -38,7 +38,6 @@ import chat.revolt.api.schemas.Emoji
 import chat.revolt.api.schemas.Server
 import chat.revolt.components.generic.RemoteImage
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.internals.Platform
 import kotlinx.coroutines.launch
 
@@ -127,5 +126,5 @@ fun EmoteInfoSheet(id: String, onDismiss: () -> Unit) {
         }
     )
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt

@@ -28,7 +28,6 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import chat.revolt.R
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.internals.Platform
 import kotlinx.coroutines.launch
 
@@ -134,5 +133,5 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
         }
     )
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt

@@ -20,7 +20,6 @@ import chat.revolt.R
 import chat.revolt.api.RevoltAPI
 import chat.revolt.api.routes.channel.removeMember
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.internals.Platform
 import kotlinx.coroutines.launch
 
@@ -100,7 +99,7 @@ fun ColumnScope.GroupDMMemberContextSheet(
         }
     )
 
-    SheetEnd()
+
 }
 
 @Composable
@@ -150,5 +149,5 @@ fun ColumnScope.ServerMemberContextSheet(
         }
     )
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/MemberListSheet.kt

@@ -45,7 +45,6 @@ import chat.revolt.api.schemas.User
 import chat.revolt.components.chat.MemberListItem
 import chat.revolt.components.generic.CountableListHeader
 import chat.revolt.components.generic.Presence
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.generic.SheetHeaderPadding
 import chat.revolt.components.generic.presenceFromStatus
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -282,7 +281,7 @@ fun MemberListSheet(
                     }
                 )
             }
-            SheetEnd()
+
         }
     }
 
@@ -295,7 +294,7 @@ fun MemberListSheet(
             ) {
                 CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
             }
-            SheetEnd()
+
             return@Column
         }
 
@@ -365,5 +364,5 @@ fun MemberListSheet(
             }
         }
     }
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt

@@ -47,7 +47,6 @@ import chat.revolt.api.routes.channel.react
 import chat.revolt.callbacks.UiCallbacks
 import chat.revolt.components.chat.Message
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.internals.Platform
 import kotlinx.coroutines.launch
 
@@ -236,7 +235,7 @@ fun MessageContextSheet(
                 )
             }
 
-            SheetEnd()
+
         }
     }
 
@@ -475,6 +474,6 @@ fun MessageContextSheet(
             )
         }
 
-        SheetEnd()
+
     }
 }

app/src/main/java/chat/revolt/sheets/ReactSheet.kt

@@ -3,7 +3,6 @@ package chat.revolt.sheets
 import androidx.compose.runtime.Composable
 import chat.revolt.api.RevoltAPI
 import chat.revolt.components.emoji.EmojiPicker
-import chat.revolt.components.generic.SheetEnd
 
 @Composable
 fun ReactSheet(messageId: String, onSelect: (String?) -> Unit) {
@@ -17,5 +16,5 @@ fun ReactSheet(messageId: String, onSelect: (String?) -> Unit) {
     EmojiPicker {
         onSelect(it.removeSurrounding(":"))
     }
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt

@@ -53,7 +53,6 @@ import chat.revolt.api.schemas.User
 import chat.revolt.api.settings.LoadedSettings
 import chat.revolt.components.chat.MemberListItem
 import chat.revolt.components.generic.RemoteImage
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.internals.text.MessageProcessor
 import chat.revolt.persistence.KVStorage
 import kotlinx.coroutines.launch
@@ -325,7 +324,7 @@ fun ReactionInfoSheet(messageId: String, emoji: String, onDismiss: () -> Unit) {
         }
 
         item("bottom") {
-            SheetEnd()
+
         }
     }
 }

app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt

@@ -35,7 +35,6 @@ import chat.revolt.R
 import chat.revolt.api.RevoltAPI
 import chat.revolt.api.routes.server.leaveOrDeleteServer
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.markdown.RichMarkdown
 import chat.revolt.components.screens.settings.ServerOverview
 import chat.revolt.internals.Platform
@@ -252,5 +251,5 @@ fun ServerContextSheet(
         )
     }
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/StatusSheet.kt

@@ -20,7 +20,6 @@ import chat.revolt.R
 import chat.revolt.api.RevoltAPI
 import chat.revolt.api.routes.user.patchSelf
 import chat.revolt.components.generic.SheetButton
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.generic.asApiName
 import chat.revolt.components.generic.presenceFromStatus
 import chat.revolt.components.screens.settings.UserOverview
@@ -73,5 +72,5 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
         }
     )
 
-    SheetEnd()
+
 }

app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt

@@ -44,7 +44,6 @@ import chat.revolt.components.chat.RoleListEntry
 import chat.revolt.components.chat.UserBadgeList
 import chat.revolt.components.chat.UserBadgeRow
 import chat.revolt.components.generic.NonIdealState
-import chat.revolt.components.generic.SheetEnd
 import chat.revolt.components.generic.UserAvatar
 import chat.revolt.components.markdown.RichMarkdown
 import chat.revolt.components.screens.settings.RawUserOverview
@@ -333,5 +332,5 @@ fun UserInfoSheet(
             UserButtons(user, dismissSheet)
         }
     }
-    SheetEnd()
+
 }