chore: upgrade target SDK and dependencies
Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
parent
19fc4abd52
commit
e6c8a7b269
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
}
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue