mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2026-01-18 08:43:56 +00:00
Compare commits
13 Commits
v1.26.0-de
...
v1.26.0-de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a314ba209d | ||
|
|
12d92ba811 | ||
|
|
ffd08c737c | ||
|
|
e1b768c467 | ||
|
|
df6ecd27dd | ||
|
|
2571cb8c11 | ||
|
|
c327857823 | ||
|
|
03160ccef1 | ||
|
|
08cec674bb | ||
|
|
95fb97ec31 | ||
|
|
4753873866 | ||
|
|
ca322f2da8 | ||
|
|
d758964742 |
@@ -1,3 +1,50 @@
|
|||||||
|
# app [1.26.0-dev.8](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.7...v1.26.0-dev.8) (2025-10-06)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Offcenter loading indicator in AppSelector ([12d92ba](https://github.com/ReVanced/revanced-manager/commit/12d92ba8110f5d1ac78aeecfa575444b5c53f561))
|
||||||
|
|
||||||
|
# app [1.26.0-dev.7](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.6...v1.26.0-dev.7) (2025-10-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Improve consistency between pre-release toggles ([e1b768c](https://github.com/ReVanced/revanced-manager/commit/e1b768c4679ecae8bff8007bdab56ff6544b12b6))
|
||||||
|
|
||||||
|
# app [1.26.0-dev.6](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.5...v1.26.0-dev.6) (2025-10-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Broken version comparison ([c327857](https://github.com/ReVanced/revanced-manager/commit/c3278578237dcddd9e7ab79ee80a02fdeef9604d))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Open contributor's GitHub profile when clicked ([#2775](https://github.com/ReVanced/revanced-manager/issues/2775)) ([2571cb8](https://github.com/ReVanced/revanced-manager/commit/2571cb8c1108e9c1ed84950f17692c09d66e0556))
|
||||||
|
|
||||||
|
# app [1.26.0-dev.5](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.4...v1.26.0-dev.5) (2025-10-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Toggle to use pre-release versions of ReVanced Patches ([08cec67](https://github.com/ReVanced/revanced-manager/commit/08cec674bbbe5297090ac5ee6039569975fbe9e7))
|
||||||
|
|
||||||
|
# app [1.26.0-dev.4](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.3...v1.26.0-dev.4) (2025-10-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add newlines to debug logs ([4753873](https://github.com/ReVanced/revanced-manager/commit/4753873866b575e2dcb160020df63f63862c8f33))
|
||||||
|
|
||||||
|
# app [1.26.0-dev.3](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.2...v1.26.0-dev.3) (2025-10-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Toggle to use pre-release versions of ReVanced Manager ([#2773](https://github.com/ReVanced/revanced-manager/issues/2773)) ([d758964](https://github.com/ReVanced/revanced-manager/commit/d7589647426b3d3438161a2f0b59bf4f154ac34b))
|
||||||
|
|
||||||
# app [1.26.0-dev.2](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.1...v1.26.0-dev.2) (2025-10-03)
|
# app [1.26.0-dev.2](https://github.com/ReVanced/revanced-manager/compare/v1.26.0-dev.1...v1.26.0-dev.2) (2025-10-03)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
version = 1.26.0-dev.2
|
version = 1.26.0-dev.8
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ class PreferencesManager(
|
|||||||
val firstLaunch = booleanPreference("first_launch", true)
|
val firstLaunch = booleanPreference("first_launch", true)
|
||||||
val managerAutoUpdates = booleanPreference("manager_auto_updates", false)
|
val managerAutoUpdates = booleanPreference("manager_auto_updates", false)
|
||||||
val showManagerUpdateDialogOnLaunch = booleanPreference("show_manager_update_dialog_on_launch", true)
|
val showManagerUpdateDialogOnLaunch = booleanPreference("show_manager_update_dialog_on_launch", true)
|
||||||
|
val useManagerPrereleases = booleanPreference("manager_prereleases", false)
|
||||||
|
val usePatchesPrereleases = booleanPreference("patches_prereleases", false)
|
||||||
|
|
||||||
val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
|
val disablePatchVersionCompatCheck = booleanPreference("disable_patch_version_compatibility_check", false)
|
||||||
val disableSelectionWarning = booleanPreference("disable_selection_warning", false)
|
val disableSelectionWarning = booleanPreference("disable_selection_warning", false)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.revanced.manager.network.api
|
package app.revanced.manager.network.api
|
||||||
|
|
||||||
import android.os.Build
|
import app.revanced.manager.BuildConfig
|
||||||
import app.revanced.manager.domain.manager.PreferencesManager
|
import app.revanced.manager.domain.manager.PreferencesManager
|
||||||
import app.revanced.manager.network.dto.ReVancedAsset
|
import app.revanced.manager.network.dto.ReVancedAsset
|
||||||
import app.revanced.manager.network.dto.ReVancedGitRepository
|
import app.revanced.manager.network.dto.ReVancedGitRepository
|
||||||
@@ -30,11 +30,12 @@ class ReVancedAPI(
|
|||||||
private suspend inline fun <reified T> request(route: String) = request<T>(apiUrl(), route)
|
private suspend inline fun <reified T> request(route: String) = request<T>(apiUrl(), route)
|
||||||
|
|
||||||
suspend fun getAppUpdate() =
|
suspend fun getAppUpdate() =
|
||||||
getLatestAppInfo().getOrThrow().takeIf { it.version != Build.VERSION.RELEASE }
|
getLatestAppInfo().getOrThrow().takeIf { it.version.removePrefix("v") != BuildConfig.VERSION_NAME }
|
||||||
|
|
||||||
suspend fun getLatestAppInfo() = request<ReVancedAsset>("manager")
|
suspend fun getLatestAppInfo() =
|
||||||
|
request<ReVancedAsset>("manager?prerelease=${prefs.useManagerPrereleases.get()}")
|
||||||
|
|
||||||
suspend fun getPatchesUpdate() = request<ReVancedAsset>("patches")
|
suspend fun getPatchesUpdate() = request<ReVancedAsset>("patches?prerelease=${prefs.usePatchesPrereleases.get()}")
|
||||||
|
|
||||||
suspend fun getContributors() = request<List<ReVancedGitRepository>>("contributors")
|
suspend fun getContributors() = request<List<ReVancedGitRepository>>("contributors")
|
||||||
|
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ import app.revanced.manager.domain.bundles.LocalPatchBundle
|
|||||||
import app.revanced.manager.domain.bundles.PatchBundleSource
|
import app.revanced.manager.domain.bundles.PatchBundleSource
|
||||||
import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
|
import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.asRemoteOrNull
|
||||||
import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
|
import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefault
|
||||||
|
import app.revanced.manager.domain.manager.PreferencesManager
|
||||||
import app.revanced.manager.domain.repository.PatchBundleRepository
|
import app.revanced.manager.domain.repository.PatchBundleRepository
|
||||||
import app.revanced.manager.ui.component.ColumnWithScrollbar
|
import app.revanced.manager.ui.component.ColumnWithScrollbar
|
||||||
import app.revanced.manager.ui.component.ExceptionViewerDialog
|
import app.revanced.manager.ui.component.ExceptionViewerDialog
|
||||||
@@ -65,12 +66,14 @@ fun BundleInformationDialog(
|
|||||||
) {
|
) {
|
||||||
val bundleRepo = koinInject<PatchBundleRepository>()
|
val bundleRepo = koinInject<PatchBundleRepository>()
|
||||||
val networkInfo = koinInject<NetworkInfo>()
|
val networkInfo = koinInject<NetworkInfo>()
|
||||||
|
val prefs = koinInject<PreferencesManager>()
|
||||||
val hasNetwork = remember { networkInfo.isConnected() }
|
val hasNetwork = remember { networkInfo.isConnected() }
|
||||||
val composableScope = rememberCoroutineScope()
|
val composableScope = rememberCoroutineScope()
|
||||||
var viewCurrentBundlePatches by remember { mutableStateOf(false) }
|
var viewCurrentBundlePatches by remember { mutableStateOf(false) }
|
||||||
val isLocal = src is LocalPatchBundle
|
val isLocal = src is LocalPatchBundle
|
||||||
val bundleManifestAttributes = src.patchBundle?.manifestAttributes
|
val bundleManifestAttributes = src.patchBundle?.manifestAttributes
|
||||||
val (autoUpdate, endpoint) = src.asRemoteOrNull?.let { it.autoUpdate to it.endpoint } ?: (null to null)
|
val (autoUpdate, endpoint) = src.asRemoteOrNull?.let { it.autoUpdate to it.endpoint }
|
||||||
|
?: (null to null)
|
||||||
|
|
||||||
fun onAutoUpdateChange(new: Boolean) = composableScope.launch {
|
fun onAutoUpdateChange(new: Boolean) = composableScope.launch {
|
||||||
with(bundleRepo) {
|
with(bundleRepo) {
|
||||||
@@ -173,6 +176,32 @@ fun BundleInformationDialog(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (src.isDefault) {
|
||||||
|
val useBundlePrerelease by prefs.usePatchesPrereleases.getAsState()
|
||||||
|
|
||||||
|
BundleListItem(
|
||||||
|
headlineText = stringResource(R.string.patches_prereleases),
|
||||||
|
supportingText = stringResource(R.string.patches_prereleases_description, src.name),
|
||||||
|
trailingContent = {
|
||||||
|
HapticSwitch(
|
||||||
|
checked = useBundlePrerelease,
|
||||||
|
onCheckedChange = {
|
||||||
|
composableScope.launch {
|
||||||
|
prefs.usePatchesPrereleases.update(
|
||||||
|
it
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
},
|
||||||
|
modifier = Modifier.clickable {
|
||||||
|
composableScope.launch {
|
||||||
|
prefs.usePatchesPrereleases.update(!useBundlePrerelease)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
endpoint?.takeUnless { src.isDefault }?.let { url ->
|
endpoint?.takeUnless { src.isDefault }?.let { url ->
|
||||||
var showUrlInputDialog by rememberSaveable {
|
var showUrlInputDialog by rememberSaveable {
|
||||||
mutableStateOf(false)
|
mutableStateOf(false)
|
||||||
|
|||||||
@@ -234,7 +234,13 @@ fun AppSelectorScreen(
|
|||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
item { LoadingIndicator() }
|
item {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier.fillParentMaxSize(), contentAlignment = Alignment.Center
|
||||||
|
) {
|
||||||
|
LoadingIndicator()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package app.revanced.manager.ui.screen.settings
|
package app.revanced.manager.ui.screen.settings
|
||||||
|
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||||
@@ -34,6 +35,8 @@ import androidx.compose.ui.Modifier
|
|||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||||
import androidx.compose.ui.layout.ContentScale
|
import androidx.compose.ui.layout.ContentScale
|
||||||
|
import androidx.compose.ui.platform.LocalUriHandler
|
||||||
|
import androidx.compose.ui.platform.UriHandler
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
@@ -57,6 +60,7 @@ fun ContributorSettingsScreen(
|
|||||||
) {
|
) {
|
||||||
val repositories = viewModel.repositories
|
val repositories = viewModel.repositories
|
||||||
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
|
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
|
||||||
|
val uriHandler = LocalUriHandler.current
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
@@ -93,7 +97,8 @@ fun ContributorSettingsScreen(
|
|||||||
) {
|
) {
|
||||||
ContributorsCard(
|
ContributorsCard(
|
||||||
title = it.name,
|
title = it.name,
|
||||||
contributors = it.contributors
|
contributors = it.contributors,
|
||||||
|
uriHandler = uriHandler
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,7 +120,8 @@ fun ContributorsCard(
|
|||||||
title: String,
|
title: String,
|
||||||
contributors: List<ReVancedContributor>,
|
contributors: List<ReVancedContributor>,
|
||||||
itemsPerPage: Int = 12,
|
itemsPerPage: Int = 12,
|
||||||
numberOfRows: Int = 2
|
numberOfRows: Int = 2,
|
||||||
|
uriHandler: UriHandler
|
||||||
) {
|
) {
|
||||||
val itemsPerRow = (itemsPerPage / numberOfRows)
|
val itemsPerRow = (itemsPerPage / numberOfRows)
|
||||||
|
|
||||||
@@ -172,7 +178,11 @@ fun ContributorsCard(
|
|||||||
contributorsByPage[page].forEach {
|
contributorsByPage[page].forEach {
|
||||||
if (itemSize > 100.dp) {
|
if (itemSize > 100.dp) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.width(itemSize - 1.dp), // we delete 1.dp to account for not-so divisible numbers
|
modifier = Modifier
|
||||||
|
.width(itemSize - 1.dp)
|
||||||
|
.clickable {
|
||||||
|
uriHandler.openUri("https://github.com/${it.username}")
|
||||||
|
}, // we delete 1.dp to account for not-so divisible numbers
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
||||||
) {
|
) {
|
||||||
@@ -203,6 +213,9 @@ fun ContributorsCard(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(size = (itemSize - 1.dp).coerceAtMost(50.dp)) // we delete 1.dp to account for not-so divisible numbers
|
.size(size = (itemSize - 1.dp).coerceAtMost(50.dp)) // we delete 1.dp to account for not-so divisible numbers
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
|
.clickable {
|
||||||
|
uriHandler.openUri("https://github.com/${it.username}")
|
||||||
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,12 @@ fun UpdatesSettingsScreen(
|
|||||||
headline = R.string.show_manager_update_dialog_on_launch,
|
headline = R.string.show_manager_update_dialog_on_launch,
|
||||||
description = R.string.show_manager_update_dialog_on_launch_description
|
description = R.string.show_manager_update_dialog_on_launch_description
|
||||||
)
|
)
|
||||||
|
|
||||||
|
BooleanItem(
|
||||||
|
preference = vm.useManagerPrereleases,
|
||||||
|
headline = R.string.manager_prereleases,
|
||||||
|
description = R.string.manager_prereleases_description
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -47,7 +47,7 @@ class AdvancedSettingsViewModel(
|
|||||||
app.contentResolver.openOutputStream(target)!!.bufferedWriter().use { writer ->
|
app.contentResolver.openOutputStream(target)!!.bufferedWriter().use { writer ->
|
||||||
val consumer = Redirect.Consume { flow ->
|
val consumer = Redirect.Consume { flow ->
|
||||||
flow.onEach {
|
flow.onEach {
|
||||||
writer.write(it)
|
writer.write("${it}\n")
|
||||||
}.flowOn(Dispatchers.IO).collect()
|
}.flowOn(Dispatchers.IO).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -120,6 +120,10 @@ class MainViewModel(
|
|||||||
settings.useDynamicTheme?.let { dynamicColor ->
|
settings.useDynamicTheme?.let { dynamicColor ->
|
||||||
prefs.dynamicColor.update(dynamicColor)
|
prefs.dynamicColor.update(dynamicColor)
|
||||||
}
|
}
|
||||||
|
settings.usePrereleases?.let { prereleases ->
|
||||||
|
prefs.useManagerPrereleases.update(prereleases)
|
||||||
|
prefs.usePatchesPrereleases.update(prereleases)
|
||||||
|
}
|
||||||
settings.apiUrl?.let { api ->
|
settings.apiUrl?.let { api ->
|
||||||
prefs.api.update(api.removeSuffix("/"))
|
prefs.api.update(api.removeSuffix("/"))
|
||||||
}
|
}
|
||||||
@@ -159,6 +163,7 @@ class MainViewModel(
|
|||||||
val keystorePassword: String,
|
val keystorePassword: String,
|
||||||
val themeMode: Int? = null,
|
val themeMode: Int? = null,
|
||||||
val useDynamicTheme: Boolean? = null,
|
val useDynamicTheme: Boolean? = null,
|
||||||
|
val usePrereleases: Boolean? = null,
|
||||||
val apiUrl: String? = null,
|
val apiUrl: String? = null,
|
||||||
val experimentalPatchesEnabled: Boolean? = null,
|
val experimentalPatchesEnabled: Boolean? = null,
|
||||||
val patchesAutoUpdate: Boolean? = null,
|
val patchesAutoUpdate: Boolean? = null,
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ class UpdatesSettingsViewModel(
|
|||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
val managerAutoUpdates = prefs.managerAutoUpdates
|
val managerAutoUpdates = prefs.managerAutoUpdates
|
||||||
val showManagerUpdateDialogOnLaunch = prefs.showManagerUpdateDialogOnLaunch
|
val showManagerUpdateDialogOnLaunch = prefs.showManagerUpdateDialogOnLaunch
|
||||||
|
val useManagerPrereleases = prefs.useManagerPrereleases
|
||||||
|
|
||||||
|
|
||||||
val isConnected: Boolean
|
val isConnected: Boolean
|
||||||
get() = network.isConnected()
|
get() = network.isConnected()
|
||||||
|
|||||||
@@ -368,6 +368,8 @@
|
|||||||
<string name="manual_update_check_description">Manually check for updates</string>
|
<string name="manual_update_check_description">Manually check for updates</string>
|
||||||
<string name="update_checking_manager">Check for updates on launch</string>
|
<string name="update_checking_manager">Check for updates on launch</string>
|
||||||
<string name="update_checking_manager_description">Check for new versions of ReVanced Manager when the application starts</string>
|
<string name="update_checking_manager_description">Check for new versions of ReVanced Manager when the application starts</string>
|
||||||
|
<string name="manager_prereleases">Use pre-releases</string>
|
||||||
|
<string name="manager_prereleases_description">Use pre-release versions of ReVanced Manager</string>
|
||||||
<string name="changelog">View changelogs</string>
|
<string name="changelog">View changelogs</string>
|
||||||
<string name="changelog_loading">Loading changelog</string>
|
<string name="changelog_loading">Loading changelog</string>
|
||||||
<string name="changelog_download_fail">Failed to download changelog: %s</string>
|
<string name="changelog_download_fail">Failed to download changelog: %s</string>
|
||||||
@@ -435,6 +437,8 @@
|
|||||||
<string name="auto_update">Auto update</string>
|
<string name="auto_update">Auto update</string>
|
||||||
<string name="add_patches">Add patches</string>
|
<string name="add_patches">Add patches</string>
|
||||||
<string name="auto_update_description">Automatically update when a new version is available</string>
|
<string name="auto_update_description">Automatically update when a new version is available</string>
|
||||||
|
<string name="patches_prereleases">Use pre-releases</string>
|
||||||
|
<string name="patches_prereleases_description">Use pre-release version of %s</string>
|
||||||
<string name="patches_url">Patches URL</string>
|
<string name="patches_url">Patches URL</string>
|
||||||
<string name="incompatible_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string>
|
<string name="incompatible_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string>
|
||||||
<string name="incompatible_patch">Incompatible patch</string>
|
<string name="incompatible_patch">Incompatible patch</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user