From eb27a5f03275558b618d86b78810898ee567f194 Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Sat, 3 Aug 2024 21:48:52 -0700 Subject: [PATCH] style: reformat --- .../com/aliucord/manager/patcher/StepRunner.kt | 2 +- .../steps/download/CopyDependenciesStep.kt | 2 +- .../steps/download/DownloadAliuhookStep.kt | 4 ++-- .../steps/download/DownloadDiscordStep.kt | 2 +- .../steps/download/DownloadInjectorStep.kt | 4 ++-- .../patcher/steps/download/DownloadKotlinStep.kt | 2 +- .../manager/patcher/steps/install/CleanupStep.kt | 4 ++-- .../manager/patcher/steps/install/InstallStep.kt | 6 +++--- .../patcher/steps/prepare/FetchInfoStep.kt | 6 +++--- .../manager/patcher/util/ManifestPatcher.kt | 16 ++++++++++++++-- .../ui/screens/patchopts/PatchOptionsScreen.kt | 2 +- 11 files changed, 31 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/StepRunner.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/StepRunner.kt index 092dda6..5b517c5 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/StepRunner.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/StepRunner.kt @@ -4,10 +4,10 @@ import android.content.Context import androidx.lifecycle.Lifecycle import androidx.lifecycle.ProcessLifecycleOwner import com.aliucord.manager.R +import com.aliucord.manager.manager.PreferencesManager import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.patcher.steps.base.Step -import com.aliucord.manager.manager.PreferencesManager import com.aliucord.manager.ui.util.InstallNotifications import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.delay diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/CopyDependenciesStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/CopyDependenciesStep.kt index 58c5739..ffc5736 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/CopyDependenciesStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/CopyDependenciesStep.kt @@ -1,10 +1,10 @@ package com.aliucord.manager.patcher.steps.download import com.aliucord.manager.R +import com.aliucord.manager.manager.PathManager import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.Step -import com.aliucord.manager.manager.PathManager import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.io.File diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadAliuhookStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadAliuhookStep.kt index 23dca51..e344878 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadAliuhookStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadAliuhookStep.kt @@ -3,10 +3,10 @@ package com.aliucord.manager.patcher.steps.download import androidx.compose.runtime.Stable import com.aliucord.manager.R import com.aliucord.manager.domain.repository.AliucordMavenRepository -import com.aliucord.manager.patcher.StepRunner -import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.manager.PathManager import com.aliucord.manager.network.utils.getOrThrow +import com.aliucord.manager.patcher.StepRunner +import com.aliucord.manager.patcher.steps.base.DownloadStep import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordStep.kt index 4b9b3e2..89bed78 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordStep.kt @@ -3,8 +3,8 @@ package com.aliucord.manager.patcher.steps.download import androidx.compose.runtime.Stable import com.aliucord.manager.BuildConfig import com.aliucord.manager.R -import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.manager.PathManager +import com.aliucord.manager.patcher.steps.base.DownloadStep import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadInjectorStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadInjectorStep.kt index ad0ffb9..77d6a68 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadInjectorStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadInjectorStep.kt @@ -2,11 +2,11 @@ package com.aliucord.manager.patcher.steps.download import androidx.compose.runtime.Stable import com.aliucord.manager.R +import com.aliucord.manager.manager.PathManager +import com.aliucord.manager.network.dto.Version import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.patcher.steps.prepare.FetchInfoStep -import com.aliucord.manager.manager.PathManager -import com.aliucord.manager.network.dto.Version import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadKotlinStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadKotlinStep.kt index 85cffcc..6175923 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadKotlinStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadKotlinStep.kt @@ -2,8 +2,8 @@ package com.aliucord.manager.patcher.steps.download import androidx.compose.runtime.Stable import com.aliucord.manager.R -import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.manager.PathManager +import com.aliucord.manager.patcher.steps.base.DownloadStep import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/CleanupStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/CleanupStep.kt index 64dedb2..88832cc 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/CleanupStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/CleanupStep.kt @@ -1,12 +1,12 @@ package com.aliucord.manager.patcher.steps.install import com.aliucord.manager.R +import com.aliucord.manager.manager.PathManager +import com.aliucord.manager.manager.PreferencesManager import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.base.StepState -import com.aliucord.manager.manager.PathManager -import com.aliucord.manager.manager.PreferencesManager import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InstallStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InstallStep.kt index e6ce28e..14f0f83 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InstallStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InstallStep.kt @@ -3,14 +3,14 @@ package com.aliucord.manager.patcher.steps.install import android.content.Context import androidx.lifecycle.* import com.aliucord.manager.R +import com.aliucord.manager.installers.InstallerResult +import com.aliucord.manager.manager.InstallerManager +import com.aliucord.manager.manager.PreferencesManager import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.base.StepState import com.aliucord.manager.patcher.steps.download.CopyDependenciesStep -import com.aliucord.manager.installers.InstallerResult -import com.aliucord.manager.manager.InstallerManager -import com.aliucord.manager.manager.PreferencesManager import com.aliucord.manager.ui.components.dialogs.PlayProtectDialog import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.aliucord.manager.ui.util.InstallNotifications diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchInfoStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchInfoStep.kt index b5b00a1..e4af330 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchInfoStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchInfoStep.kt @@ -2,12 +2,12 @@ package com.aliucord.manager.patcher.steps.prepare import androidx.compose.runtime.Stable import com.aliucord.manager.R -import com.aliucord.manager.patcher.StepRunner -import com.aliucord.manager.patcher.steps.StepGroup -import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.network.dto.Version import com.aliucord.manager.network.service.AliucordGithubService import com.aliucord.manager.network.utils.getOrThrow +import com.aliucord.manager.patcher.StepRunner +import com.aliucord.manager.patcher.steps.StepGroup +import com.aliucord.manager.patcher.steps.base.Step import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/util/ManifestPatcher.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/util/ManifestPatcher.kt index 5144792..1788896 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/util/ManifestPatcher.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/util/ManifestPatcher.kt @@ -134,10 +134,22 @@ object ManifestPatcher { } override fun end() { - if (addLegacyStorage && Build.VERSION.SDK_INT >= 29) super.attr(ANDROID_NAMESPACE, REQUEST_LEGACY_EXTERNAL_STORAGE, android.R.attr.requestLegacyExternalStorage, TYPE_INT_BOOLEAN, 1) + if (addLegacyStorage && Build.VERSION.SDK_INT >= 29) super.attr( + ANDROID_NAMESPACE, + REQUEST_LEGACY_EXTERNAL_STORAGE, + android.R.attr.requestLegacyExternalStorage, + TYPE_INT_BOOLEAN, + 1 + ) if (useVmSafeMode) super.attr(ANDROID_NAMESPACE, VM_SAFE_MODE, android.R.attr.vmSafeMode, TYPE_INT_BOOLEAN, 1) if (addDebuggable) super.attr(ANDROID_NAMESPACE, DEBUGGABLE, android.R.attr.debuggable, TYPE_INT_BOOLEAN, 1) - if (addUseClearTextTraffic) super.attr(ANDROID_NAMESPACE, USES_CLEARTEXT_TRAFFIC, android.R.attr.usesCleartextTraffic, TYPE_INT_BOOLEAN, 1) + if (addUseClearTextTraffic) super.attr( + ANDROID_NAMESPACE, + USES_CLEARTEXT_TRAFFIC, + android.R.attr.usesCleartextTraffic, + TYPE_INT_BOOLEAN, + 1 + ) super.end() } } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt index 45140c9..1138d98 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt @@ -21,8 +21,8 @@ import com.aliucord.manager.R import com.aliucord.manager.ui.components.AnimatedVersionDisplay import com.aliucord.manager.ui.components.TextDivider import com.aliucord.manager.ui.screens.patching.PatchingScreen -import com.aliucord.manager.ui.screens.patchopts.components.PatchOptionsAppBar import com.aliucord.manager.ui.screens.patchopts.components.PackageNameState +import com.aliucord.manager.ui.screens.patchopts.components.PatchOptionsAppBar import com.aliucord.manager.ui.screens.patchopts.components.options.SwitchPatchOption import com.aliucord.manager.ui.screens.patchopts.components.options.TextPatchOption import com.aliucord.manager.ui.util.*