ReVanced-Mirror/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager synced 2024-05-14 13:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade AGP to 8.2.0 + migrate deprecated functions (#1574)

Browse Source
This commit is contained in:
Benjamin 2023-12-26 12:37:42 -08:00 committed by GitHub
parent 439f6250f3
commit 4fdd6bbe5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -80,6 +80,7 @@ android {
buildFeatures.compose = true buildFeatures.compose = true
buildFeatures.aidl = true buildFeatures.aidl = true
buildFeatures.buildConfig=true
composeOptions.kotlinCompilerExtensionVersion = "1.5.3" composeOptions.kotlinCompilerExtensionVersion = "1.5.3"
} }

4
app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt
View File

@ -3,7 +3,7 @@ package app.revanced.manager.ui.component
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.* import androidx.compose.material3.*
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@ -38,7 +38,7 @@ fun AppTopBar(
onBackClick: (() -> Unit)? = null, onBackClick: (() -> Unit)? = null,
backIcon: @Composable (() -> Unit) = @Composable { backIcon: @Composable (() -> Unit) = @Composable {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, contentDescription = stringResource( imageVector = Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(
R.string.back R.string.back
) )
) )

4
app/src/main/java/app/revanced/manager/ui/component/AutoUpdatesDialog.kt
View File

@ -10,7 +10,7 @@ import androidx.compose.material.icons.outlined.Source
import androidx.compose.material.icons.outlined.Update import androidx.compose.material.icons.outlined.Update
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Checkbox import androidx.compose.material3.Checkbox
import androidx.compose.material3.Divider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -69,7 +69,7 @@ fun AutoUpdatesDialog(onSubmit: (Boolean, Boolean) -> Unit) {
checked = managerEnabled, checked = managerEnabled,
onCheckedChange = { managerEnabled = it } onCheckedChange = { managerEnabled = it }
) )
Divider() HorizontalDivider()
AutoUpdatesItem( AutoUpdatesItem(
headline = R.string.auto_updates_dialog_patches, headline = R.string.auto_updates_dialog_patches,
icon = Icons.Outlined.Source, icon = Icons.Outlined.Source,

4
app/src/main/java/app/revanced/manager/ui/component/LoadingIndicator.kt
View File

@ -26,8 +26,8 @@ fun LoadingIndicator(
progress?.let { progress?.let {
CircularProgressIndicator( CircularProgressIndicator(
progress = progress, progress = { progress },
modifier = Modifier.padding(vertical = 16.dp).then(modifier) modifier = Modifier.padding(vertical = 16.dp).then(modifier),
) )
} ?: } ?:
CircularProgressIndicator( CircularProgressIndicator(

5
app/src/main/java/app/revanced/manager/ui/component/bundle/BaseBundleDialog.kt
View File

@ -9,10 +9,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.ArrowRight import androidx.compose.material.icons.automirrored.outlined.ArrowRight
import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch import androidx.compose.material3.Switch
import androidx.compose.material3.Text import androidx.compose.material3.Text
@ -170,7 +169,7 @@ fun BaseBundleDialog(
) { ) {
if (patchesClickable) if (patchesClickable)
Icon( Icon(
Icons.Outlined.ArrowRight, Icons.AutoMirrored.Outlined.ArrowRight,
stringResource(R.string.patches) stringResource(R.string.patches)
) )
} }

4
app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
View File

@ -2,7 +2,7 @@ package app.revanced.manager.ui.component.bundle
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.outlined.DeleteOutline import androidx.compose.material.icons.outlined.DeleteOutline
import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material.icons.outlined.Refresh
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -71,7 +71,7 @@ fun BundleInformationDialog(
onBackClick = onDismissRequest, onBackClick = onDismissRequest,
onBackIcon = { onBackIcon = {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.back) contentDescription = stringResource(R.string.back)
) )
}, },

10
app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt
View File

@ -5,13 +5,11 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.outlined.Close
import androidx.compose.material.icons.outlined.Lightbulb import androidx.compose.material.icons.outlined.Lightbulb
import androidx.compose.material3.Divider
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
@ -54,7 +52,7 @@ fun BundlePatchesDialog(
onBackClick = onDismissRequest, onBackClick = onDismissRequest,
onBackIcon = { onBackIcon = {
Icon( Icon(
imageVector = Icons.Default.ArrowBack, imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.back) contentDescription = stringResource(R.string.back)
) )
}, },
@ -98,7 +96,7 @@ fun BundlePatchesDialog(
} }
} }
) )
Divider() HorizontalDivider()
} }
} }
} }

9
app/src/main/java/app/revanced/manager/ui/component/patches/PathSelectorDialog.kt
View File

@ -6,11 +6,10 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
import androidx.compose.material.icons.automirrored.outlined.InsertDriveFile
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.outlined.ArrowBack
import androidx.compose.material.icons.outlined.DocumentScanner
import androidx.compose.material.icons.outlined.Folder import androidx.compose.material.icons.outlined.Folder
import androidx.compose.material.icons.outlined.InsertDriveFile
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
@ -86,7 +85,7 @@ fun PathSelectorDialog(root: Path, onSelect: (Path?) -> Unit) {
item(key = "parent") { item(key = "parent") {
PathItem( PathItem(
onClick = { currentDirectory = currentDirectory.parent }, onClick = { currentDirectory = currentDirectory.parent },
icon = Icons.Outlined.ArrowBack, icon = Icons.AutoMirrored.Outlined.ArrowBack,
name = stringResource(R.string.path_selector_parent_dir) name = stringResource(R.string.path_selector_parent_dir)
) )
} }
@ -113,7 +112,7 @@ fun PathSelectorDialog(root: Path, onSelect: (Path?) -> Unit) {
items(files, key = { it.absolutePathString() }) { items(files, key = { it.absolutePathString() }) {
PathItem( PathItem(
onClick = { onSelect(it) }, onClick = { onSelect(it) },
icon = Icons.Outlined.InsertDriveFile, icon = Icons.AutoMirrored.Outlined.InsertDriveFile,
name = it.name name = it.name
) )
} }

6
app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
View File

@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.filled.Storage
import androidx.compose.material.icons.outlined.Search import androidx.compose.material.icons.outlined.Search
import androidx.compose.material3.* import androidx.compose.material3.*
@ -82,7 +82,7 @@ fun AppSelectorScreen(
leadingIcon = { leadingIcon = {
IconButton({ search = false }) { IconButton({ search = false }) {
Icon( Icon(
Icons.Default.ArrowBack, Icons.AutoMirrored.Filled.ArrowBack,
stringResource(R.string.back) stringResource(R.string.back)
) )
} }
@ -185,7 +185,7 @@ fun AppSelectorScreen(
Text(stringResource(R.string.select_from_storage_description)) Text(stringResource(R.string.select_from_storage_description))
} }
) )
Divider() HorizontalDivider()
} }
if (appList.isNotEmpty()) { if (appList.isNotEmpty()) {

8
app/src/main/java/app/revanced/manager/ui/screen/InstalledAppInfoScreen.kt
View File

@ -10,10 +10,10 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowRight import androidx.compose.material.icons.automirrored.filled.ArrowRight
import androidx.compose.material.icons.automirrored.outlined.OpenInNew
import androidx.compose.material.icons.outlined.Circle import androidx.compose.material.icons.outlined.Circle
import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.OpenInNew
import androidx.compose.material.icons.outlined.SettingsBackupRestore import androidx.compose.material.icons.outlined.SettingsBackupRestore
import androidx.compose.material.icons.outlined.Update import androidx.compose.material.icons.outlined.Update
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
@ -98,7 +98,7 @@ fun InstalledAppInfoScreen(
.clip(RoundedCornerShape(24.dp)) .clip(RoundedCornerShape(24.dp))
) { ) {
SegmentedButton( SegmentedButton(
icon = Icons.Outlined.OpenInNew, icon = Icons.AutoMirrored.Outlined.OpenInNew,
text = stringResource(R.string.open_app), text = stringResource(R.string.open_app),
onClick = viewModel::launch onClick = viewModel::launch
) )
@ -154,7 +154,7 @@ fun InstalledAppInfoScreen(
it it
) )
}, },
trailingContent = { Icon(Icons.Filled.ArrowRight, contentDescription = stringResource(R.string.view_applied_patches)) } trailingContent = { Icon(Icons.AutoMirrored.Filled.ArrowRight, contentDescription = stringResource(R.string.view_applied_patches)) }
) )
SettingsListItem( SettingsListItem(

6
app/src/main/java/app/revanced/manager/ui/screen/InstallerScreen.kt
View File

@ -281,15 +281,15 @@ fun StepIcon(status: State, downloadProgress: Pair<Float, Float>? = null, size:
State.WAITING -> State.WAITING ->
downloadProgress?.let { (downloaded, total) -> downloadProgress?.let { (downloaded, total) ->
CircularProgressIndicator( CircularProgressIndicator(
progress = downloaded / total, progress = { downloaded / total },
strokeWidth = strokeWidth,
modifier = stringResource(R.string.step_running).let { description -> modifier = stringResource(R.string.step_running).let { description ->
Modifier Modifier
.size(size) .size(size)
.semantics { .semantics {
contentDescription = description contentDescription = description
} }
} },
strokeWidth = strokeWidth,
) )
} ?: CircularProgressIndicator( } ?: CircularProgressIndicator(
strokeWidth = strokeWidth, strokeWidth = strokeWidth,

8
app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
View File

@ -14,9 +14,9 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.outlined.HelpOutline
import androidx.compose.material.icons.outlined.FilterList import androidx.compose.material.icons.outlined.FilterList
import androidx.compose.material.icons.outlined.HelpOutline
import androidx.compose.material.icons.outlined.Restore import androidx.compose.material.icons.outlined.Restore
import androidx.compose.material.icons.outlined.Save import androidx.compose.material.icons.outlined.Save
import androidx.compose.material.icons.outlined.Search import androidx.compose.material.icons.outlined.Search
@ -225,7 +225,7 @@ fun PatchesSelectorScreen(
leadingIcon = { leadingIcon = {
IconButton(onClick = { search = null }) { IconButton(onClick = { search = null }) {
Icon( Icon(
Icons.Default.ArrowBack, Icons.AutoMirrored.Filled.ArrowBack,
stringResource(R.string.back) stringResource(R.string.back)
) )
} }
@ -502,7 +502,7 @@ fun ListHeader(
{ {
IconButton(onClick = it) { IconButton(onClick = it) {
Icon( Icon(
Icons.Outlined.HelpOutline, Icons.AutoMirrored.Outlined.HelpOutline,
stringResource(R.string.help) stringResource(R.string.help)
) )
} }

4
app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
View File

@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.ArrowRight import androidx.compose.material.icons.automirrored.outlined.ArrowRight
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
@ -223,7 +223,7 @@ private fun PageItem(@StringRes title: Int, description: String, onClick: () ->
) )
}, },
trailingContent = { trailingContent = {
Icon(Icons.Outlined.ArrowRight, null) Icon(Icons.AutoMirrored.Outlined.ArrowRight, null)
} }
) )
} }

4
app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt
View File

@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material3.Divider
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
@ -87,7 +87,7 @@ fun ChangelogItem(
publishDate = changelog.publishDate.relativeTime(LocalContext.current) publishDate = changelog.publishDate.relativeTime(LocalContext.current)
) )
if (changelog != lastChangelog) { if (changelog != lastChangelog) {
Divider( HorizontalDivider(
modifier = Modifier.padding(top = 32.dp), modifier = Modifier.padding(top = 32.dp),
color = MaterialTheme.colorScheme.outlineVariant color = MaterialTheme.colorScheme.outlineVariant
) )

8
app/src/main/java/app/revanced/manager/ui/screen/settings/update/UpdateScreen.kt
View File

@ -16,8 +16,8 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Update import androidx.compose.material.icons.outlined.Update
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.Divider
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -81,7 +81,7 @@ fun UpdateScreen(
DownloadData(vm.downloadProgress, vm.downloadedSize, vm.totalSize) DownloadData(vm.downloadProgress, vm.downloadedSize, vm.totalSize)
) )
vm.changelog?.let { changelog -> vm.changelog?.let { changelog ->
Divider() HorizontalDivider()
Changelog(changelog) Changelog(changelog)
} ?: Spacer(modifier = Modifier.weight(1f)) } ?: Spacer(modifier = Modifier.weight(1f))
Buttons(vm.state, vm::downloadUpdate, vm::installUpdate, onBackClick) Buttons(vm.state, vm::downloadUpdate, vm::installUpdate, onBackClick)
@ -147,8 +147,8 @@ private fun Header(state: State, changelog: Changelog?, downloadData: DownloadDa
} }
} else if (state == State.DOWNLOADING) { } else if (state == State.DOWNLOADING) {
LinearProgressIndicator( LinearProgressIndicator(
progress = downloadData.downloadProgress, progress = { downloadData.downloadProgress },
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth(),
) )
Text( Text(
text = text =

1
gradle.properties
View File

@ -21,5 +21,4 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies, # resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library # thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false android.nonFinalResIds=false

2
gradle/libs.versions.toml
View File

@ -19,7 +19,7 @@ reimagined-navigation = "1.5.0"
ktor = "2.3.3" ktor = "2.3.3"
markdown-renderer = "0.8.0" markdown-renderer = "0.8.0"
fading-edges = "1.0.4" fading-edges = "1.0.4"
androidGradlePlugin = "8.1.2" androidGradlePlugin = "8.2.0"
kotlinGradlePlugin = "1.9.10" kotlinGradlePlugin = "1.9.10"
devToolsGradlePlugin = "1.9.10-1.0.13" devToolsGradlePlugin = "1.9.10-1.0.13"
aboutLibrariesGradlePlugin = "10.8.3" aboutLibrariesGradlePlugin = "10.8.3"