From 300cacc6e55dc2c6d2ef003ad9e2d56b8e82fe14 Mon Sep 17 00:00:00 2001 From: AbronStudio Date: Tue, 5 Aug 2025 12:09:36 +0330 Subject: [PATCH] Refactor: Clean up Discover screen components and ServerDataRepository - Removed unused imports and variables in `DiscoverServersList.kt`, `ServerInviteHandler.kt`, and `ServerInviteDialog.kt` to improve code cleanliness. - Deleted the unused `getServerCategories` function from `ServerDataRepository.kt`. --- .../googlesheets/ServerDataRepository.kt | 21 +------------------ .../chat/discover/DiscoverServersList.kt | 3 --- .../chat/discover/ServerInviteDialog.kt | 4 ---- .../chat/discover/ServerInviteHandler.kt | 1 - 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt b/app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt index 88b939c7..eebcdccc 100644 --- a/app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt +++ b/app/src/main/java/chat/revolt/api/routes/googlesheets/ServerDataRepository.kt @@ -29,26 +29,7 @@ class ServerDataRepository { } emit(servers) }.flowOn(Dispatchers.IO) - - /** - * Fetches server categories from Google Sheets and returns as a Flow - * @param sheetUrl The URL of the published Google Sheet (CSV or JSON) - * @return Flow of ServerCategory list - */ - fun getServerCategories(sheetUrl: String): Flow> = flow { - val categories = GoogleSheetsService.fetchSheetData( - sheetUrl = sheetUrl - ) { rowData -> - ServerCategory( - id = rowData["id"] ?: "", - name = rowData["name"] ?: "", - description = rowData["description"] ?: "", - iconName = rowData["iconName"] ?: "", - sortOrder = rowData["sortOrder"]?.toIntOrNull() ?: 0 - ) - } - emit(categories) - }.flowOn(Dispatchers.IO) + } /** diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt b/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt index de0435ba..eb25bf81 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/discover/DiscoverServersList.kt @@ -21,9 +21,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt b/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt index 20a9edd1..7128f1d6 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteDialog.kt @@ -1,15 +1,11 @@ package chat.revolt.composables.screens.chat.discover -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt b/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt index 8956ca49..af047601 100644 --- a/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt +++ b/app/src/main/java/chat/revolt/composables/screens/chat/discover/ServerInviteHandler.kt @@ -22,7 +22,6 @@ fun ServerInviteHandler( onDismiss: () -> Unit = {}, onJoinSuccess: () -> Unit = {} ) { - val context = LocalContext.current val scope = rememberCoroutineScope() var isLoading by remember { mutableStateOf(true) } var showDialog by remember { mutableStateOf(true) }