RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade target SDK and dependencies 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-10-17 14:54:28 +02:00
parent 19fc4abd52
commit e6c8a7b269
12 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/build.gradle
View File

@ -53,12 +53,12 @@ def buildproperty(String propertyName, String fallbackEnv = null) {
} }
android { android {
compileSdk 34 compileSdk 35
defaultConfig { defaultConfig {
applicationId "chat.revolt" applicationId "chat.revolt"
minSdk 24 minSdk 24
targetSdk 34 targetSdk 35
versionCode Integer.parseInt("001_002_003".replaceAll("_", ""), 10) versionCode Integer.parseInt("001_002_003".replaceAll("_", ""), 10)
versionName "1.2.3-beta+gp20" versionName "1.2.3-beta+gp20"
@ -188,8 +188,9 @@ dependencies {
// Jetpack Compose // Jetpack Compose
implementation "androidx.compose.ui:ui" implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util" implementation "androidx.compose.ui:ui-util"
implementation 'androidx.compose.material3:material3' implementation "androidx.compose.material3:material3:$material3_version"
implementation 'androidx.compose.material3:material3-window-size-class' 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.ui:ui-tooling-preview"
implementation "androidx.compose.runtime:runtime-livedata" implementation "androidx.compose.runtime:runtime-livedata"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1'
@ -238,7 +239,7 @@ dependencies {
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "androidx.browser:browser:1.8.0" implementation "androidx.browser:browser:1.8.0"
implementation "androidx.webkit:webkit:1.11.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 // Libraries used for legacy View-based UI
implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha13" implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha13"

5
app/src/main/java/chat/revolt/components/generic/SheetButton.kt
View File

@ -4,11 +4,13 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@Composable @Composable
@ -26,6 +28,9 @@ fun SheetButton(
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
) { ) {
ListItem( ListItem(
colors = ListItemDefaults.colors().copy(
containerColor = Color.Transparent
),
headlineContent = { headlineContent = {
CompositionLocalProvider( CompositionLocalProvider(
value = if (dangerous) { value = if (dangerous) {

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

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

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

@ -50,7 +50,6 @@ import chat.revolt.R
import chat.revolt.api.routes.microservices.autumn.FileArgs import chat.revolt.api.routes.microservices.autumn.FileArgs
import chat.revolt.components.generic.RemoteImage import chat.revolt.components.generic.RemoteImage
import chat.revolt.components.generic.SheetEnd import chat.revolt.components.generic.SheetEnd
import chat.revolt.internals.extensions.BottomSheetInsets
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.File import java.io.File

1
app/src/main/java/chat/revolt/components/screens/chat/drawer/ChannelSideDrawer.kt
View File

@ -95,7 +95,6 @@ import chat.revolt.components.generic.RemoteImage
import chat.revolt.components.generic.UserAvatar import chat.revolt.components.generic.UserAvatar
import chat.revolt.components.generic.presenceFromStatus import chat.revolt.components.generic.presenceFromStatus
import chat.revolt.components.screens.chat.ChannelIcon import chat.revolt.components.screens.chat.ChannelIcon
import chat.revolt.internals.extensions.BottomSheetInsets
import chat.revolt.screens.chat.ChatRouterDestination import chat.revolt.screens.chat.ChatRouterDestination
import chat.revolt.sheets.ChannelContextSheet import chat.revolt.sheets.ChannelContextSheet
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

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

@ -44,7 +44,6 @@ import androidx.navigation.NavController
import chat.revolt.R import chat.revolt.R
import chat.revolt.components.generic.SheetEnd import chat.revolt.components.generic.SheetEnd
import chat.revolt.components.screens.settings.AttributionItem import chat.revolt.components.screens.settings.AttributionItem
import chat.revolt.internals.extensions.BottomSheetInsets
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonArray

1
app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
View File

@ -61,7 +61,6 @@ import chat.revolt.components.chat.DisconnectedNotice
import chat.revolt.components.screens.chat.drawer.ChannelSideDrawer import chat.revolt.components.screens.chat.drawer.ChannelSideDrawer
import chat.revolt.components.screens.voice.VoiceChannelOverlay import chat.revolt.components.screens.voice.VoiceChannelOverlay
import chat.revolt.internals.Changelogs import chat.revolt.internals.Changelogs
import chat.revolt.internals.extensions.BottomSheetInsets
import chat.revolt.internals.extensions.zero import chat.revolt.internals.extensions.zero
import chat.revolt.persistence.KVStorage import chat.revolt.persistence.KVStorage
import chat.revolt.screens.chat.dialogs.safety.ReportMessageDialog import chat.revolt.screens.chat.dialogs.safety.ReportMessageDialog

1
app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
View File

@ -122,7 +122,6 @@ import chat.revolt.components.screens.chat.ReplyManager
import chat.revolt.components.screens.chat.TypingIndicator import chat.revolt.components.screens.chat.TypingIndicator
import chat.revolt.components.skeletons.MessageSkeleton import chat.revolt.components.skeletons.MessageSkeleton
import chat.revolt.components.skeletons.MessageSkeletonVariant import chat.revolt.components.skeletons.MessageSkeletonVariant
import chat.revolt.internals.extensions.BottomSheetInsets
import chat.revolt.internals.extensions.rememberChannelPermissions import chat.revolt.internals.extensions.rememberChannelPermissions
import chat.revolt.internals.extensions.zero import chat.revolt.internals.extensions.zero
import chat.revolt.sheets.ChannelInfoSheet import chat.revolt.sheets.ChannelInfoSheet

1
app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
View File

@ -68,7 +68,6 @@ import chat.revolt.api.settings.SyncedSettings
import chat.revolt.components.generic.ListHeader import chat.revolt.components.generic.ListHeader
import chat.revolt.components.screens.settings.appearance.ColourChip import chat.revolt.components.screens.settings.appearance.ColourChip
import chat.revolt.components.screens.settings.appearance.CornerRadiusPicker import chat.revolt.components.screens.settings.appearance.CornerRadiusPicker
import chat.revolt.internals.extensions.BottomSheetInsets
import chat.revolt.sheets.ColourPickerSheet import chat.revolt.sheets.ColourPickerSheet
import chat.revolt.ui.theme.OverridableColourScheme import chat.revolt.ui.theme.OverridableColourScheme
import chat.revolt.ui.theme.Theme import chat.revolt.ui.theme.Theme

1
app/src/main/java/chat/revolt/sheets/MemberListSheet.kt
View File

@ -48,7 +48,6 @@ import chat.revolt.components.generic.Presence
import chat.revolt.components.generic.SheetEnd import chat.revolt.components.generic.SheetEnd
import chat.revolt.components.generic.SheetHeaderPadding import chat.revolt.components.generic.SheetHeaderPadding
import chat.revolt.components.generic.presenceFromStatus import chat.revolt.components.generic.presenceFromStatus
import chat.revolt.internals.extensions.BottomSheetInsets
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChanged

1
build.gradle
View File

@ -10,6 +10,7 @@ buildscript {
aboutlibraries_version = '10.9.1' aboutlibraries_version = '10.9.1'
media3_version = '1.3.1' media3_version = '1.3.1'
livekit_version = '2.2.0' livekit_version = '2.2.0'
material3_version = '1.4.0-alpha02'
} }
} }