From e6c8a7b269a115785186f89f760174463048297a Mon Sep 17 00:00:00 2001 From: Infi Date: Thu, 17 Oct 2024 14:54:28 +0200 Subject: [PATCH] chore: upgrade target SDK and dependencies Signed-off-by: Infi --- app/build.gradle | 11 ++++++----- .../chat/revolt/components/generic/SheetButton.kt | 5 +++++ .../java/chat/revolt/components/generic/SheetEnd.kt | 8 +++----- .../components/screens/chat/AttachmentManager.kt | 1 - .../screens/chat/drawer/ChannelSideDrawer.kt | 1 - .../java/chat/revolt/internals/extensions/Insets.kt | 2 +- .../chat/revolt/screens/about/AttributionScreen.kt | 1 - .../java/chat/revolt/screens/chat/ChatRouterScreen.kt | 1 - .../screens/chat/views/channel/ChannelScreen.kt | 1 - .../screens/settings/AppearanceSettingsScreen.kt | 1 - .../main/java/chat/revolt/sheets/MemberListSheet.kt | 1 - build.gradle | 1 + 12 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 51382ef0..ea50448c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,12 +53,12 @@ def buildproperty(String propertyName, String fallbackEnv = null) { } android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "chat.revolt" minSdk 24 - targetSdk 34 + targetSdk 35 versionCode Integer.parseInt("001_002_003".replaceAll("_", ""), 10) versionName "1.2.3-beta+gp20" @@ -188,8 +188,9 @@ dependencies { // Jetpack Compose implementation "androidx.compose.ui:ui" implementation "androidx.compose.ui:ui-util" - implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material3:material3-window-size-class' + implementation "androidx.compose.material3:material3:$material3_version" + implementation "androidx.compose.material3:material3-window-size-class:$material3_version" + implementation "androidx.compose.material:material-icons-core:1.6.8" implementation "androidx.compose.ui:ui-tooling-preview" implementation "androidx.compose.runtime:runtime-livedata" implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1' @@ -238,7 +239,7 @@ dependencies { implementation 'androidx.documentfile:documentfile:1.0.1' implementation "androidx.browser:browser:1.8.0" implementation "androidx.webkit:webkit:1.11.0" - implementation "androidx.core:core-splashscreen:1.0.1" + implementation "androidx.core:core-splashscreen:1.2.0-alpha02" // Libraries used for legacy View-based UI implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha13" diff --git a/app/src/main/java/chat/revolt/components/generic/SheetButton.kt b/app/src/main/java/chat/revolt/components/generic/SheetButton.kt index 1809f1b9..bea0ef6b 100644 --- a/app/src/main/java/chat/revolt/components/generic/SheetButton.kt +++ b/app/src/main/java/chat/revolt/components/generic/SheetButton.kt @@ -4,11 +4,13 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp @Composable @@ -26,6 +28,9 @@ fun SheetButton( .padding(horizontal = 16.dp) ) { ListItem( + colors = ListItemDefaults.colors().copy( + containerColor = Color.Transparent + ), headlineContent = { CompositionLocalProvider( value = if (dangerous) { diff --git a/app/src/main/java/chat/revolt/components/generic/SheetEnd.kt b/app/src/main/java/chat/revolt/components/generic/SheetEnd.kt index b33b826d..d6c2957b 100644 --- a/app/src/main/java/chat/revolt/components/generic/SheetEnd.kt +++ b/app/src/main/java/chat/revolt/components/generic/SheetEnd.kt @@ -1,13 +1,11 @@ package chat.revolt.components.generic -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.navigationBars -import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @Composable fun SheetEnd(modifier: Modifier = Modifier) { - Spacer(modifier.windowInsetsPadding(WindowInsets.navigationBars)) + Box {} + // Spacer(modifier.windowInsetsPadding(WindowInsets.navigationBars)) } \ No newline at end of file diff --git a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt index 36d327aa..b5a9c916 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/AttachmentManager.kt @@ -50,7 +50,6 @@ 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 chat.revolt.internals.extensions.BottomSheetInsets import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt index 83f58442..f7b42105 100644 --- a/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt +++ b/app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt @@ -95,7 +95,6 @@ import chat.revolt.components.generic.RemoteImage import chat.revolt.components.generic.UserAvatar import chat.revolt.components.generic.presenceFromStatus import chat.revolt.components.screens.chat.ChannelIcon -import chat.revolt.internals.extensions.BottomSheetInsets import chat.revolt.screens.chat.ChatRouterDestination import chat.revolt.sheets.ChannelContextSheet import kotlinx.coroutines.launch diff --git a/app/src/main/java/chat/revolt/internals/extensions/Insets.kt b/app/src/main/java/chat/revolt/internals/extensions/Insets.kt index 7dba03b3..dc950659 100644 --- a/app/src/main/java/chat/revolt/internals/extensions/Insets.kt +++ b/app/src/main/java/chat/revolt/internals/extensions/Insets.kt @@ -11,4 +11,4 @@ import androidx.compose.runtime.NonRestartableComposable val WindowInsets.Companion.zero: WindowInsets @Composable @NonRestartableComposable - get() = WindowInsets(left = 0, right = 0, top = 0, bottom = 0) + get() = WindowInsets(left = 0, right = 0, top = 0, bottom = 0) \ No newline at end of file diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt index 961be042..9dc16164 100644 --- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt +++ b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt @@ -44,7 +44,6 @@ import androidx.navigation.NavController import chat.revolt.R import chat.revolt.components.generic.SheetEnd import chat.revolt.components.screens.settings.AttributionItem -import chat.revolt.internals.extensions.BottomSheetInsets import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt index 43c59653..acecf14a 100644 --- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt @@ -61,7 +61,6 @@ import chat.revolt.components.chat.DisconnectedNotice import chat.revolt.components.screens.chat.drawer.ChannelSideDrawer import chat.revolt.components.screens.voice.VoiceChannelOverlay import chat.revolt.internals.Changelogs -import chat.revolt.internals.extensions.BottomSheetInsets import chat.revolt.internals.extensions.zero import chat.revolt.persistence.KVStorage import chat.revolt.screens.chat.dialogs.safety.ReportMessageDialog diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt index bb82150b..6b1baede 100644 --- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt @@ -122,7 +122,6 @@ import chat.revolt.components.screens.chat.ReplyManager import chat.revolt.components.screens.chat.TypingIndicator import chat.revolt.components.skeletons.MessageSkeleton import chat.revolt.components.skeletons.MessageSkeletonVariant -import chat.revolt.internals.extensions.BottomSheetInsets import chat.revolt.internals.extensions.rememberChannelPermissions import chat.revolt.internals.extensions.zero import chat.revolt.sheets.ChannelInfoSheet diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt index fc0200d1..9b59a8b1 100644 --- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt @@ -68,7 +68,6 @@ import chat.revolt.api.settings.SyncedSettings import chat.revolt.components.generic.ListHeader import chat.revolt.components.screens.settings.appearance.ColourChip import chat.revolt.components.screens.settings.appearance.CornerRadiusPicker -import chat.revolt.internals.extensions.BottomSheetInsets import chat.revolt.sheets.ColourPickerSheet import chat.revolt.ui.theme.OverridableColourScheme import chat.revolt.ui.theme.Theme diff --git a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt index 802d6f8b..65f6a672 100644 --- a/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/MemberListSheet.kt @@ -48,7 +48,6 @@ 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 chat.revolt.internals.extensions.BottomSheetInsets import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/build.gradle b/build.gradle index bcc128be..14877479 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ buildscript { aboutlibraries_version = '10.9.1' media3_version = '1.3.1' livekit_version = '2.2.0' + material3_version = '1.4.0-alpha02' } }