From c0ea0871da83237d9306dc66c1f4a8a660bc905a Mon Sep 17 00:00:00 2001 From: Infi Date: Mon, 14 Oct 2024 20:31:29 +0200 Subject: [PATCH] Revert "feat: debugprep" This reverts commit 7ce3ee31 Signed-off-by: Infi --- .../main/java/chat/revolt/api/RevoltAPI.kt | 3 +- .../screens/login/LoginGreetingScreen.kt | 28 +----- .../java/chat/revolt/sheets/DebugPrepSheet.kt | 85 ------------------- 3 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 app/src/main/java/chat/revolt/sheets/DebugPrepSheet.kt diff --git a/app/src/main/java/chat/revolt/api/RevoltAPI.kt b/app/src/main/java/chat/revolt/api/RevoltAPI.kt index 33448fb5..ac72d47e 100644 --- a/app/src/main/java/chat/revolt/api/RevoltAPI.kt +++ b/app/src/main/java/chat/revolt/api/RevoltAPI.kt @@ -49,8 +49,7 @@ import java.lang.reflect.InvocationTargetException import java.net.SocketException import chat.revolt.api.schemas.Channel as ChannelSchema -// The reason this is a var is because in debug builds we have the ability to swap the base URL. -var REVOLT_BASE = "https://revolt.chat/api" +const val REVOLT_BASE = "https://revolt.chat/api" const val REVOLT_SUPPORT = "https://support.revolt.chat" const val REVOLT_MARKETING = "https://revolt.chat" const val REVOLT_FILES = "https://autumn.revolt.chat" diff --git a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt index e9943a67..d287f9d6 100644 --- a/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt +++ b/app/src/main/java/chat/revolt/screens/login/LoginGreetingScreen.kt @@ -15,18 +15,14 @@ import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.width import androidx.compose.material3.Button import androidx.compose.material3.ElevatedButton -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.Text -import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -45,26 +41,11 @@ import androidx.navigation.NavController import chat.revolt.R import chat.revolt.api.REVOLT_MARKETING import chat.revolt.components.generic.Weblink -import chat.revolt.internals.extensions.BottomSheetInsets -import chat.revolt.sheets.DebugPrepSheet -@OptIn(ExperimentalMaterial3Api::class) @Composable fun LoginGreetingScreen(navController: NavController) { val context = LocalContext.current var catTaps by remember { mutableIntStateOf(0) } - var showDebugPrep by remember { mutableStateOf(false) } - - if (showDebugPrep) { - val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) - ModalBottomSheet( - onDismissRequest = { showDebugPrep = false }, - sheetState = sheetState, - windowInsets = BottomSheetInsets - ) { - DebugPrepSheet() - } - } Column( modifier = Modifier @@ -92,10 +73,9 @@ fun LoginGreetingScreen(navController: NavController) { interactionSource = remember(::MutableInteractionSource), indication = null ) { - // FIXME: This should also check for DEBUG mode in next version - if ((catTaps >= (9 * 2))) { - showDebugPrep = true - } else if (catTaps == 9) { + if (catTaps < 9) { + catTaps++ + } else { Toast .makeText( context, @@ -103,8 +83,8 @@ fun LoginGreetingScreen(navController: NavController) { Toast.LENGTH_SHORT ) .show() + catTaps = 0 } - catTaps++ } ) diff --git a/app/src/main/java/chat/revolt/sheets/DebugPrepSheet.kt b/app/src/main/java/chat/revolt/sheets/DebugPrepSheet.kt deleted file mode 100644 index 9ceae064..00000000 --- a/app/src/main/java/chat/revolt/sheets/DebugPrepSheet.kt +++ /dev/null @@ -1,85 +0,0 @@ -package chat.revolt.sheets - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.CornerSize -import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SegmentedButton -import androidx.compose.material3.SingleChoiceSegmentedButtonRow -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import chat.revolt.api.REVOLT_BASE -import chat.revolt.components.generic.SheetEnd - -enum class DebugPrepSheetPage { - API -} - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun DebugPrepSheet(modifier: Modifier = Modifier) { - var mode by remember { mutableStateOf(DebugPrepSheetPage.API) } - - Column( - Modifier - .verticalScroll(rememberScrollState()) - .padding(horizontal = 16.dp), - verticalArrangement = Arrangement.spacedBy(8.dp) - ) { - Text("Debug Preparation", style = MaterialTheme.typography.headlineMedium) - SingleChoiceSegmentedButtonRow(Modifier.fillMaxWidth()) { - SegmentedButton( - selected = mode == DebugPrepSheetPage.API, - onClick = { mode = DebugPrepSheetPage.API }, - shape = CircleShape - ) { - Text("API") - } - } - - when (mode) { - DebugPrepSheetPage.API -> { - Text("API Base URL (not reactive)") - SingleChoiceSegmentedButtonRow(Modifier.fillMaxWidth()) { - SegmentedButton( - selected = REVOLT_BASE == "https://api.revolt.chat", - onClick = { - REVOLT_BASE = "https://api.revolt.chat" - }, - shape = CircleShape.copy( - topEnd = CornerSize(0), - bottomEnd = CornerSize(0) - ) - ) { - Text("api.") - } - SegmentedButton( - selected = REVOLT_BASE == "https://revolt.chat/api", - onClick = { - REVOLT_BASE = "https://revolt.chat/api" - }, - shape = CircleShape.copy( - topStart = CornerSize(0), - bottomStart = CornerSize(0) - ) - ) { - Text("/api") - } - } - } - } - } - SheetEnd() -} \ No newline at end of file