diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc0157d..43f1eb0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | tag="${{ github.ref_name }}" - apk_file="wintry-manager-$tag.apk" + apk_file="shiggy-manager-$tag.apk" mv -T ./app/build/outputs/apk/release/app-release.apk "./$apk_file" gh release create "$tag" \ diff --git a/INFO.md b/INFO.md deleted file mode 100644 index d08f190..0000000 --- a/INFO.md +++ /dev/null @@ -1,9 +0,0 @@ -## Backing up Aliucord - -Note: This section is about the app installation itself, not the installed plugins, themes, and settings. - -The patched Aliucord APK is tailored to the current device's Android version and CPU architecture. -Reusing a patched Aliucord APK from one device on another will likely break. Backing up and -restoring on another device will likely break. - -Install Aliucord **directly via Manager** on the device you wish to use it on. diff --git a/README.md b/README.md deleted file mode 100644 index 70f3b5b..0000000 --- a/README.md +++ /dev/null @@ -1,69 +0,0 @@ -
- Wintry Manager preview -

Wintry Manager

-

Install Wintry on your Android device! Based on Aliucord Manager.

- -[![Discord](https://img.shields.io/discord/1394286025026572310?logo=discord&logoColor=white&style=for-the-badge&color=5865F2)](https://discord.gg/ybPB5tgD) -[![GitHub Stars](https://img.shields.io/github/stars/wtcord/wt-manager?logo=github&style=for-the-badge&color=ffd663)](https://github.com/wtcord/wt-manager/stargazers) -[![Build Status](https://img.shields.io/github/actions/workflow/status/wtcord/wt-manager/build.yml?label=Build&logo=github&style=for-the-badge&branch=main)](https://nightly.link/wtcord/wt-manager/workflows/build/main/app.zip) -![GitHub Downloads](https://img.shields.io/github/downloads/wtcord/wt-manager/total?style=for-the-badge&logo=github) -![Code Size](https://img.shields.io/github/languages/code-size/wtcord/wt-manager?style=for-the-badge) -[![GitHub License](https://img.shields.io/github/license/wtcord/wt-manager?style=for-the-badge&color=007ec6)](https://github.com/wtcord/wt-manager/blob/main/LICENSE) - -
- -## Prerequisites - -Supported Android versions: - -- Android 9 (SDK 28) - Android 16 QPR1 (SDK 36) -- Architectures: arm64, armeabi-v7, x86_64, x86 - -## Installation - -1. Download the [latest release APK](https://github.com/wtcord/wt-manager/releases/latest) -1. Open and install Wintry Manager - - If you have not enabled "Install from unknown sources" for your browser via system settings, do so now. -1. Open Wintry Manager -1. Grant the permission requests -1. Click "New Install" or "Update" if you have previously installed Wintry. - - You may change how the Wintry app icon will look once installed. -1. Click "Install" and wait. Do not exit the app while it is running. - - If a failure occurs, it may be due to a variety of reasons: - - Poor internet connection - - Internet censorship / blocks (use a VPN or a different DNS server) - - Insufficient free storage (at least 500MB is recommended) - - If you are stuck, please ask for help in the `#support` channel of our [Discord](https://discord.gg/ybPB5tgD). -1. Click "Launch" or directly launch the newly installed Wintry app -1. Sign in to Discord - -## Building - -1. Install the prerequisites: - - Git - - [JDK 21+](https://adoptium.net/temurin/releases/?os=any&arch=any&version=21) -2. Clone the repo: - ```shell - git clone https://github.com/wtcord/wt-manager && cd wt-manager - ``` -3. Build the project: - #### Linux/macOS - ```shell - chmod +x gradlew && ./gradlew :app:packageStaging --stacktrace - ``` - #### Windows - ```shell - .\gradlew.bat :app:packageStaging --stacktrace - ``` -4. Built APK will be located at `./app/build/outputs/apk/staging/app-staging.apk` - - diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 4b75d0e..0000000 --- a/TODO.md +++ /dev/null @@ -1,9 +0,0 @@ -- Android API 21 support -- Unified permissions screen like in Aurora Store -- zip-android 64KiB alignment -- zip-android faster file deletion -- Better UI for conflicting package names - - Auto-rename package names when adding new installs...? -- `IconOptionsScreen` - - https://discord.com/channels/811255666990907402/1373756392892272691/1380726498725593220 - - Reset button on PatchOptionsScreen? diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3894b44..b71d6bb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,24 +18,24 @@ val gitHasLocalCommits = gitCurrentBranch?.let { providers.execIgnoreCode("git", val gitHasHasLocalChanges = providers.execIgnoreCode("git", "status", "-s").isNotEmpty() android { - namespace = "dev.wintry.manager" + namespace = "dev.shiggy.manager" compileSdk = 36 defaultConfig { minSdk = 28 targetSdk = 36 - versionCode = 10_00_01 - versionName = "1.0.1" + versionCode = 10_00_00 + versionName = "1.0.0" vectorDrawables { useSupportLibrary = true } - buildConfigField("String", "APPLICATION_NAME", "\"Wintry Manager\"") - buildConfigField("String", "TAG", "\"WintryManager\"") + buildConfigField("String", "APPLICATION_NAME", "\"Shiggy Manager\"") + buildConfigField("String", "TAG", "\"ShiggyManager\"") - buildConfigField("String", "GITHUB_ORG", "\"wtcord\"") - buildConfigField("String", "SUPPORT_SERVER", "\"ybPB5tgD\"") + buildConfigField("String", "GITHUB_ORG", "\"ShiggyCord\"") + buildConfigField("String", "SUPPORT_SERVER", "\"\"") buildConfigField("String", "BACKEND_URL", "\"https://aliucord.com/\"") diff --git a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt index 7d24828..55237e8 100644 --- a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt +++ b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt @@ -24,7 +24,7 @@ import com.aliucord.manager.ui.screens.home.HomeScreen import com.aliucord.manager.ui.theme.ManagerTheme import com.aliucord.manager.ui.widgets.updater.UpdaterDialog import com.aliucord.manager.util.back -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig import org.koin.android.ext.android.inject class MainActivity : ComponentActivity() { diff --git a/app/src/main/kotlin/com/aliucord/manager/ManagerApplication.kt b/app/src/main/kotlin/com/aliucord/manager/ManagerApplication.kt index b76862f..6c9ffb7 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ManagerApplication.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ManagerApplication.kt @@ -49,7 +49,7 @@ class ManagerApplication : Application() { singleOf(::AliucordGithubService) singleOf(::AliucordMavenService) singleOf(::RNATrackerService) - singleOf(::WintryGithubService) + singleOf(::ShiggyGithubService) }) // UI Models diff --git a/app/src/main/kotlin/com/aliucord/manager/di/Http.kt b/app/src/main/kotlin/com/aliucord/manager/di/Http.kt index 21177e7..7a0810f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/di/Http.kt +++ b/app/src/main/kotlin/com/aliucord/manager/di/Http.kt @@ -1,7 +1,7 @@ package com.aliucord.manager.di import android.app.Application -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig import io.ktor.client.HttpClient import io.ktor.client.call.HttpClientCall import io.ktor.client.engine.okhttp.OkHttp diff --git a/app/src/main/kotlin/com/aliucord/manager/installers/UnknownInstallerError.kt b/app/src/main/kotlin/com/aliucord/manager/installers/UnknownInstallerError.kt index 3bb279f..23eb231 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installers/UnknownInstallerError.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installers/UnknownInstallerError.kt @@ -1,7 +1,7 @@ package com.aliucord.manager.installers import android.content.Context -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.Parcelize @Parcelize diff --git a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstaller.kt b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstaller.kt index da25c50..a6670e5 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstaller.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstaller.kt @@ -11,7 +11,7 @@ import android.util.Log import androidx.core.content.ContextCompat import com.aliucord.manager.installers.Installer import com.aliucord.manager.util.isMiui -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig import kotlinx.coroutines.suspendCancellableCoroutine import java.io.File import kotlin.coroutines.resume diff --git a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstallerError.kt b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstallerError.kt index 93b8e73..ece60a5 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstallerError.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMInstallerError.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.pm.PackageInstaller import android.os.Parcelable import com.aliucord.manager.installers.InstallerResult -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMIntentReceiver.kt b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMIntentReceiver.kt index 8d0cc7d..d3cdb95 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMIntentReceiver.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMIntentReceiver.kt @@ -7,7 +7,7 @@ import android.util.Log import android.widget.Toast import com.aliucord.manager.installers.InstallerResult import com.aliucord.manager.installers.UnknownInstallerError -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig /** * This class is used as a callback receiver for [PackageInstaller] events, diff --git a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMResultReceiver.kt b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMResultReceiver.kt index 383c94e..d593641 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMResultReceiver.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installers/pm/PMResultReceiver.kt @@ -5,7 +5,7 @@ import android.content.pm.PackageInstaller import com.aliucord.manager.installers.InstallerResult import com.aliucord.manager.installers.UnknownInstallerError import com.aliucord.manager.util.showToast -import dev.wintry.manager.R +import dev.shiggy.manager.R /** * This receiver is meant to be registered dynamically in combination with [PMIntentReceiver] in order to diff --git a/app/src/main/kotlin/com/aliucord/manager/manager/InstallLogManager.kt b/app/src/main/kotlin/com/aliucord/manager/manager/InstallLogManager.kt index 7cc81d2..435b580 100644 --- a/app/src/main/kotlin/com/aliucord/manager/manager/InstallLogManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/manager/InstallLogManager.kt @@ -11,7 +11,7 @@ import androidx.core.content.getSystemService import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.aliucord.manager.util.IS_PROBABLY_EMULATOR import com.aliucord.manager.util.isPlayProtectEnabled -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig import kotlinx.serialization.* import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream diff --git a/app/src/main/kotlin/com/aliucord/manager/manager/PathManager.kt b/app/src/main/kotlin/com/aliucord/manager/manager/PathManager.kt index ba4226f..5c5c773 100644 --- a/app/src/main/kotlin/com/aliucord/manager/manager/PathManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/manager/PathManager.kt @@ -18,10 +18,10 @@ class PathManager( val aliucordDir = Environment.getExternalStorageDirectory().resolve("Aliucord") /** - * The Wintry folder where shared Wintry files are stored. - * Standard path: `~/Wintry` + * The Shiggy folder where shared Shiggy files are stored. + * Standard path: `~/Shiggy` */ - val wintryDir = Environment.getExternalStorageDirectory().resolve("Wintry") + val shiggyDir = Environment.getExternalStorageDirectory().resolve("Shiggy") /** * The directory in external storage in which plugins are stored by Aliucord. @@ -36,7 +36,7 @@ class PathManager( /** * Global keystore used for signing APKs. */ - val keystoreFile = wintryDir.resolve("ks.keystore") + val keystoreFile = shiggyDir.resolve("ks.keystore") /** * The internal directory used for downloading components related to patching, and @@ -122,7 +122,7 @@ class PathManager( fun cachedKotlinDex() = patchingDownloadDir .resolve("kotlin.dex") - fun cachedWintryXposed(version: SemVer) = patchingDownloadDir + fun cachedShiggyXposed(version: SemVer) = patchingDownloadDir .resolve("wt-xposed") .resolve("$version.apk") diff --git a/app/src/main/kotlin/com/aliucord/manager/manager/download/AndroidDownloadManager.kt b/app/src/main/kotlin/com/aliucord/manager/manager/download/AndroidDownloadManager.kt index 27e3abb..5c3a4a4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/manager/download/AndroidDownloadManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/manager/download/AndroidDownloadManager.kt @@ -9,8 +9,8 @@ import androidx.core.content.getSystemService import androidx.core.net.toUri import com.aliucord.manager.manager.download.IDownloadManager.ProgressListener import com.aliucord.manager.manager.download.IDownloadManager.Result -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import java.io.File diff --git a/app/src/main/kotlin/com/aliucord/manager/manager/download/KtorDownloadManager.kt b/app/src/main/kotlin/com/aliucord/manager/manager/download/KtorDownloadManager.kt index c4810e6..f0df81c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/manager/download/KtorDownloadManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/manager/download/KtorDownloadManager.kt @@ -9,7 +9,7 @@ import androidx.core.content.getSystemService import com.aliucord.manager.manager.download.IDownloadManager.Result import com.aliucord.manager.patcher.util.InsufficientStorageException import com.aliucord.manager.util.IS_PROBABLY_EMULATOR -import dev.wintry.manager.R +import dev.shiggy.manager.R import io.ktor.client.HttpClient import io.ktor.client.request.header import io.ktor.client.request.prepareGet diff --git a/app/src/main/kotlin/com/aliucord/manager/network/services/HttpService.kt b/app/src/main/kotlin/com/aliucord/manager/network/services/HttpService.kt index 521082b..4b8f166 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/services/HttpService.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/services/HttpService.kt @@ -2,7 +2,7 @@ package com.aliucord.manager.network.services import android.util.Log import com.aliucord.manager.network.utils.* -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig import io.ktor.client.HttpClient import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.request diff --git a/app/src/main/kotlin/com/aliucord/manager/network/services/WintryGithubService.kt b/app/src/main/kotlin/com/aliucord/manager/network/services/ShiggyGithubService.kt similarity index 71% rename from app/src/main/kotlin/com/aliucord/manager/network/services/WintryGithubService.kt rename to app/src/main/kotlin/com/aliucord/manager/network/services/ShiggyGithubService.kt index 75f4209..6476b76 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/services/WintryGithubService.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/services/ShiggyGithubService.kt @@ -6,12 +6,10 @@ import io.ktor.client.request.header import io.ktor.client.request.url import io.ktor.http.HttpHeaders -class WintryGithubService( - private val http: HttpService, +class ShiggyGithubService( + private val http: HttpService, ) { - /** - * Fetches all the Manager releases with a 60s local cache. - */ + /** Fetches all the Manager releases with a 60s local cache. */ suspend fun getManagerReleases(): ApiResponse> { return http.request { url("https://api.github.com/repos/$ORG/$MANAGER_REPO/releases") @@ -19,9 +17,7 @@ class WintryGithubService( } } - /** - * Fetches the latest Xposed release with a 60s local cache. - */ + /** Fetches the latest Xposed release with a 60s local cache. */ suspend fun getLatestXposedRelease(): ApiResponse { return http.request { url("https://api.github.com/repos/$ORG/$XPOSED_REPO/releases/latest") @@ -30,8 +26,8 @@ class WintryGithubService( } companion object { - const val ORG = "wtcord" - const val MANAGER_REPO = "wt-manager" - const val XPOSED_REPO = "wt-xposed" + const val ORG = "kmmiio99o" + const val MANAGER_REPO = "ShiggyManager" + const val XPOSED_REPO = "ShiggyXposed" } } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/InstallMetadata.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/InstallMetadata.kt index 1be68db..203b136 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/InstallMetadata.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/InstallMetadata.kt @@ -5,7 +5,7 @@ import com.aliucord.manager.ui.screens.patchopts.PatchOptions import kotlinx.serialization.Serializable /** - * Data stored inside patched APKs as ~~"aliucord.json"~~ "wintry.json" in order to preserve install-time information about Aliucord and the Manager. + * Data stored inside patched APKs as ~~"aliucord.json"~~ "shiggy.json" in order to preserve install-time information about Aliucord and the Manager. */ @Serializable data class InstallMetadata( @@ -45,7 +45,7 @@ data class InstallMetadata( val lspatchVersion: Int?, /** - * Version of WintryXposed embedded into the APK. + * Version of ShiggyXposed embedded into the APK. */ - val wintryXposedVersion: SemVer?, + val shiggyXposedVersion: SemVer?, ) diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/ShiggyPatchRunner.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/ShiggyPatchRunner.kt new file mode 100644 index 0000000..e81d892 --- /dev/null +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/ShiggyPatchRunner.kt @@ -0,0 +1,31 @@ +package com.aliucord.manager.patcher + +import com.aliucord.manager.patcher.steps.download.* +import com.aliucord.manager.patcher.steps.install.* +import com.aliucord.manager.patcher.steps.patch.* +import com.aliucord.manager.patcher.steps.prepare.* +import com.aliucord.manager.ui.screens.patchopts.PatchOptions +import kotlinx.collections.immutable.persistentListOf + +class ShiggyPatchRunner(options: PatchOptions) : StepRunner() { + override val steps = + persistentListOf( + FetchDiscordRNAStep(options), + DowngradeCheckStep(options), + RestoreDownloadsStep(), + DownloadDiscordRNABaseStep(), + DownloadDiscordRNALangStep(), + DownloadDiscordRNAResourcesStep(), + DownloadDiscordRNALibStep(), + DownloadShiggyXposedStep(), + CopyDependenciesStep(), + PatchIconsStep(options), + PatchShiggyManifestStep(options), + SaveMetadataStep(options), + AlignmentStep(), + SigningStep(), + InjectShiggyXposedStep(), + InstallStep(options), + CleanupStep(), + ) +} 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 0a1d0f6..a0a9c33 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/StepRunner.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/StepRunner.kt @@ -9,8 +9,8 @@ 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.ui.util.InstallNotifications -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.delay import org.koin.core.component.KoinComponent diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/WintryPatchRunner.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/WintryPatchRunner.kt deleted file mode 100644 index f0da3c2..0000000 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/WintryPatchRunner.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.aliucord.manager.patcher - -import com.aliucord.manager.patcher.steps.download.* -import com.aliucord.manager.patcher.steps.install.* -import com.aliucord.manager.patcher.steps.patch.* -import com.aliucord.manager.patcher.steps.prepare.* -import com.aliucord.manager.ui.screens.patchopts.PatchOptions -import kotlinx.collections.immutable.persistentListOf - -class WintryPatchRunner(options: PatchOptions) : StepRunner() { - override val steps = persistentListOf( - FetchDiscordRNAStep(options), - DowngradeCheckStep(options), - RestoreDownloadsStep(), - - DownloadDiscordRNABaseStep(), - DownloadDiscordRNALangStep(), - DownloadDiscordRNAResourcesStep(), - DownloadDiscordRNALibStep(), - DownloadWintryXposedStep(), - CopyDependenciesStep(), - - PatchIconsStep(options), - PatchWintryManifestStep(options), - SaveMetadataStep(options), - - AlignmentStep(), - SigningStep(), - InjectWintryXposedStep(), - - InstallStep(options), - CleanupStep(), - ) -} diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/StepGroup.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/StepGroup.kt index 9e1e997..0e36dfa 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/StepGroup.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/StepGroup.kt @@ -3,7 +3,7 @@ package com.aliucord.manager.patcher.steps import android.os.Parcelable import androidx.annotation.StringRes import androidx.compose.runtime.Immutable -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/base/DownloadStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/base/DownloadStep.kt index 8cc6281..47cec23 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/base/DownloadStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/base/DownloadStep.kt @@ -10,7 +10,7 @@ import com.aliucord.manager.manager.download.KtorDownloadManager import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.util.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.koin.core.component.KoinComponent 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 e112781..5114168 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 @@ -9,7 +9,7 @@ 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.util.InsufficientStorageException -import dev.wintry.manager.R +import dev.shiggy.manager.R 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 bd02bd0..9d6c16f 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 @@ -10,7 +10,7 @@ import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.patcher.steps.base.IDexProvider import com.aliucord.manager.patcher.steps.patch.ReorganizeDexStep import com.github.diamondminer88.zip.ZipReader -import dev.wintry.manager.R +import dev.shiggy.manager.R 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/DownloadDiscordRNABaseStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt index 13f8449..0aca216 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt @@ -3,7 +3,7 @@ package com.aliucord.manager.patcher.steps.download import com.aliucord.manager.manager.PathManager import com.aliucord.manager.network.services.RNATrackerService.Companion.BASE_URL import com.aliucord.manager.patcher.steps.base.DownloadDiscordRNAStep -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.inject class DownloadDiscordRNABaseStep : DownloadDiscordRNAStep() { diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt index f022e77..973a70a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt @@ -3,7 +3,7 @@ package com.aliucord.manager.patcher.steps.download import com.aliucord.manager.manager.PathManager import com.aliucord.manager.network.services.RNATrackerService.Companion.BASE_URL import com.aliucord.manager.patcher.steps.base.DownloadDiscordRNAStep -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.inject class DownloadDiscordRNALangStep : DownloadDiscordRNAStep() { diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt index a91bb3e..cc2e809 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt @@ -4,7 +4,7 @@ import android.os.Build import com.aliucord.manager.manager.PathManager import com.aliucord.manager.network.services.RNATrackerService.Companion.BASE_URL import com.aliucord.manager.patcher.steps.base.DownloadDiscordRNAStep -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.inject class DownloadDiscordRNALibStep : DownloadDiscordRNAStep() { diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt index f59285b..8760bce 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt @@ -3,7 +3,7 @@ package com.aliucord.manager.patcher.steps.download import com.aliucord.manager.manager.PathManager import com.aliucord.manager.network.services.RNATrackerService.Companion.BASE_URL import com.aliucord.manager.patcher.steps.base.DownloadDiscordRNAStep -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.inject class DownloadDiscordRNAResourcesStep : DownloadDiscordRNAStep() { 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 390cadd..53d35c5 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.manager.PathManager import com.aliucord.manager.patcher.steps.base.DownloadStep -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R 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 910c407..07fba61 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 @@ -11,8 +11,8 @@ import com.aliucord.manager.patcher.steps.base.* import com.aliucord.manager.patcher.steps.patch.ReorganizeDexStep import com.aliucord.manager.patcher.steps.prepare.FetchInfoStep import com.aliucord.manager.ui.components.dialogs.CustomComponentVersionPicker -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R 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 0349a16..d61a054 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 @@ -5,7 +5,7 @@ import com.aliucord.manager.manager.PathManager import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.patcher.steps.base.IDexProvider import com.aliucord.manager.patcher.steps.patch.ReorganizeDexStep -import dev.wintry.manager.R +import dev.shiggy.manager.R 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/DownloadPatchesStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadPatchesStep.kt index d64948e..f225601 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadPatchesStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadPatchesStep.kt @@ -11,8 +11,8 @@ import com.aliucord.manager.patcher.steps.base.DownloadStep import com.aliucord.manager.patcher.steps.base.StepState import com.aliucord.manager.patcher.steps.prepare.FetchInfoStep import com.aliucord.manager.ui.components.dialogs.CustomComponentVersionPicker -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R 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/DownloadWintryXposedStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadShiggyXposedStep.kt similarity index 68% rename from app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadWintryXposedStep.kt rename to app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadShiggyXposedStep.kt index d169399..2e5cf0c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadWintryXposedStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadShiggyXposedStep.kt @@ -1,28 +1,28 @@ package com.aliucord.manager.patcher.steps.download import com.aliucord.manager.manager.PathManager -import com.aliucord.manager.network.services.WintryGithubService +import com.aliucord.manager.network.services.ShiggyGithubService import com.aliucord.manager.network.utils.SemVer import com.aliucord.manager.network.utils.getOrThrow import com.aliucord.manager.patcher.StepRunner import com.aliucord.manager.patcher.steps.base.DownloadStep -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.inject -class DownloadWintryXposedStep : DownloadStep() { +class DownloadShiggyXposedStep : DownloadStep() { private val paths: PathManager by inject() - private val wintryGithubService: WintryGithubService by inject() + private val shiggyGithubService: ShiggyGithubService by inject() override val localizedName = R.string.patch_step_dl_wtxposed - override val targetFile get() = paths.cachedWintryXposed(targetVersion) + override val targetFile get() = paths.cachedShiggyXposed(targetVersion) override lateinit var targetUrl: String lateinit var targetVersion: SemVer private set override suspend fun execute(container: StepRunner) { - val latestRelease = wintryGithubService.getLatestXposedRelease().getOrThrow() - container.log("Latest WintryXposed release is ${latestRelease.name}") + val latestRelease = shiggyGithubService.getLatestXposedRelease().getOrThrow() + container.log("Latest ShiggyXposed release is ${latestRelease.name}") targetVersion = SemVer.parse(latestRelease.name) targetUrl = latestRelease.assets.first { it.name == "app-release.apk" }.browserDownloadUrl diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/AlignmentStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/AlignmentStep.kt index a79e8fa..2e33765 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/AlignmentStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/AlignmentStep.kt @@ -7,7 +7,7 @@ import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.download.CopyDependenciesStep import com.github.diamondminer88.zip.* -import dev.wintry.manager.R +import dev.shiggy.manager.R 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 96a29f5..3e3d84e 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 @@ -5,7 +5,7 @@ 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 dev.wintry.manager.R +import dev.shiggy.manager.R 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/InjectWintryXposedStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectShiggyXposedStep.kt similarity index 91% rename from app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectWintryXposedStep.kt rename to app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectShiggyXposedStep.kt index f34a4a7..478b09b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectWintryXposedStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectShiggyXposedStep.kt @@ -4,9 +4,9 @@ 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.download.CopyDependenciesStep -import com.aliucord.manager.patcher.steps.download.DownloadWintryXposedStep +import com.aliucord.manager.patcher.steps.download.DownloadShiggyXposedStep import com.aliucord.manager.patcher.util.Signer -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.lsposed.lspatch.share.LSPConfig @@ -14,9 +14,9 @@ import org.lsposed.patch.LSPatch import org.lsposed.patch.util.Logger import java.io.File -class InjectWintryXposedStep : Step() { +class InjectShiggyXposedStep : Step() { override val group: StepGroup = StepGroup.Install - override val localizedName: Int = R.string.patch_step_inject_wintry + override val localizedName: Int = R.string.patch_step_inject_shiggy suspend fun patch( container: StepRunner, @@ -58,10 +58,10 @@ class InjectWintryXposedStep : Step() { override suspend fun execute(container: StepRunner) { val apks = container.getStep().patchedApks - val xposed = container.getStep().targetFile + val xposed = container.getStep().targetFile - container.log("Adding WintryXposed module with LSPatch") - container.log("WintryXposed path = ${xposed.absolutePath}") + container.log("Adding ShiggyXposed module with LSPatch") + container.log("ShiggyXposed path = ${xposed.absolutePath}") // Create temporary folder in working directory val tempDir = apks.first().parentFile!!.resolve("lspatched") 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 0be0004..3d3495b 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 @@ -14,7 +14,7 @@ import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.aliucord.manager.ui.util.InstallNotifications import com.aliucord.manager.util.isPackageInstalled import com.aliucord.manager.util.isPlayProtectEnabled -import dev.wintry.manager.R +import dev.shiggy.manager.R 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/SigningStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/SigningStep.kt index 09dec67..4b063e4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/SigningStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/SigningStep.kt @@ -5,7 +5,7 @@ import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.download.CopyDependenciesStep import com.aliucord.manager.patcher.util.Signer -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent /** diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/AddAliuhookLibsStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/AddAliuhookLibsStep.kt index 78d5033..77bfd3a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/AddAliuhookLibsStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/AddAliuhookLibsStep.kt @@ -8,7 +8,7 @@ import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.download.CopyDependenciesStep import com.aliucord.manager.patcher.steps.download.DownloadAliuhookStep import com.github.diamondminer88.zip.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent /** diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt index 4ad0af4..74cb4e7 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchIconsStep.kt @@ -30,7 +30,7 @@ import com.aliucord.manager.ui.screens.patchopts.PatchOptions.IconReplacement import com.aliucord.manager.util.getResBytes import com.github.diamondminer88.zip.ZipWriter import com.google.devrel.gmscore.tools.apk.arsc.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.io.ByteArrayOutputStream diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchManifestStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchManifestStep.kt index d1e47e0..75dd992 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchManifestStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchManifestStep.kt @@ -8,7 +8,7 @@ import com.aliucord.manager.patcher.util.ManifestPatcher import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.github.diamondminer88.zip.ZipReader import com.github.diamondminer88.zip.ZipWriter -import dev.wintry.manager.R +import dev.shiggy.manager.R /** * Patch the APK's AndroidManifest.xml diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchWintryManifestStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchShiggyManifestStep.kt similarity index 91% rename from app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchWintryManifestStep.kt rename to app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchShiggyManifestStep.kt index a86bceb..b1ad27a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchWintryManifestStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/PatchShiggyManifestStep.kt @@ -3,7 +3,7 @@ package com.aliucord.manager.patcher.steps.patch import com.aliucord.manager.patcher.util.ManifestPatcher import com.aliucord.manager.ui.screens.patchopts.PatchOptions -class PatchWintryManifestStep(val options: PatchOptions) : PatchManifestStep(options) { +class PatchShiggyManifestStep(val options: PatchOptions) : PatchManifestStep(options) { override fun patchManifest(manifestBytes: ByteArray, isBase: Boolean) = ManifestPatcher.patchManifest( manifestBytes = manifestBytes, packageName = options.packageName, diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReorganizeDexStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReorganizeDexStep.kt index ee540e4..f48fbcd 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReorganizeDexStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/ReorganizeDexStep.kt @@ -7,7 +7,7 @@ import com.aliucord.manager.patcher.steps.base.IDexProvider import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.download.CopyDependenciesStep import com.github.diamondminer88.zip.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SaveMetadataStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SaveMetadataStep.kt index e1f0d58..2e80832 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SaveMetadataStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SaveMetadataStep.kt @@ -8,8 +8,8 @@ import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.download.* import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.github.diamondminer88.zip.ZipWriter -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.serialization.json.Json import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -31,7 +31,7 @@ class SaveMetadataStep(private val options: PatchOptions) : Step(), KoinComponen val aliuhook = container.getStepOrNull() val injector = container.getStepOrNull() val patches = container.getStepOrNull() - val wintryXposed = container.getStepOrNull() + val shiggyXposed = container.getStepOrNull() val metadata = InstallMetadata( options = options, @@ -41,12 +41,12 @@ class SaveMetadataStep(private val options: PatchOptions) : Step(), KoinComponen injectorVersion = injector?.targetVersion, patchesVersion = patches?.targetVersion, lspatchVersion = LSPConfig.instance.VERSION_CODE, - wintryXposedVersion = wintryXposed?.targetVersion, + shiggyXposedVersion = shiggyXposed?.targetVersion, ) container.log("Writing serialized install metadata to APK") ZipWriter(apk, /* append = */ true).use { - it.writeEntry("wintry.json", json.encodeToString(metadata)) + it.writeEntry("shiggy.json", json.encodeToString(metadata)) } } } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt index 7a56ad6..871c0d0 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt @@ -17,7 +17,7 @@ import com.github.diamondminer88.zip.ZipReader import com.github.difflib.DiffUtils import com.github.difflib.UnifiedDiffUtils import com.github.difflib.patch.Patch -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.io.FileNotFoundException diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/DowngradeCheckStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/DowngradeCheckStep.kt index 925f368..1ce6c3f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/DowngradeCheckStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/DowngradeCheckStep.kt @@ -10,7 +10,7 @@ import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.base.StepState import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.aliucord.manager.util.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt index 910f103..8b43781 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt @@ -7,7 +7,7 @@ import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.aliucord.manager.ui.screens.patchopts.VersionPreference -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent import org.koin.core.component.inject import kotlin.properties.Delegates 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 c3dfefd..3a78614 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 @@ -7,7 +7,7 @@ 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 dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/RestoreDownloadsStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/RestoreDownloadsStep.kt index 4792e1c..ac51ba4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/RestoreDownloadsStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/RestoreDownloadsStep.kt @@ -6,7 +6,7 @@ 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 dev.wintry.manager.R +import dev.shiggy.manager.R 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 5782809..893e164 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 @@ -150,7 +150,7 @@ object ManifestPatcher { "name", android.R.attr.name, TYPE_STRING, - "isWintry" /* originally "isAliucord" */ + "isShiggy" /* originally "isAliucord" */ ) attr(ANDROID_NAMESPACE, "value", android.R.attr.value, TYPE_INT_BOOLEAN, 1) } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/util/Signer.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/util/Signer.kt index bf4b4c6..75bdbbd 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/util/Signer.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/util/Signer.kt @@ -7,7 +7,7 @@ package com.aliucord.manager.patcher.util import com.aliucord.manager.manager.PathManager import com.android.apksig.ApkSigner -import dev.wintry.manager.BuildConfig +import dev.shiggy.manager.BuildConfig import org.bouncycastle.asn1.x500.X500Name import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo import org.bouncycastle.cert.X509v3CertificateBuilder @@ -32,7 +32,7 @@ object Signer : KoinComponent { // Create new keystore if it doesn't exist if (!paths.keystoreFile.exists()) { - paths.wintryDir.mkdirs() + paths.shiggyDir.mkdirs() newKeystore(paths.keystoreFile) } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/BackButton.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/BackButton.kt index 088bea1..22d9d25 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/BackButton.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/BackButton.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import cafe.adriel.voyager.navigator.LocalNavigator import com.aliucord.manager.util.back -import dev.wintry.manager.R +import dev.shiggy.manager.R /** * Standalone back button for interacting with the current navigator. diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/Contributors.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/Contributors.kt index d246197..d57c43b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/Contributors.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/Contributors.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp import coil3.compose.SubcomposeAsyncImage import com.aliucord.manager.network.models.Contributor import com.valentinilk.shimmer.shimmer -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun ContributorCommitsItem( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt index afdc088..29477bd 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/CustomDiscordAppIcon.kt @@ -19,7 +19,7 @@ import androidx.core.graphics.applyCanvas import androidx.core.graphics.createBitmap import androidx.core.graphics.drawable.toDrawable import com.aliucord.manager.ui.screens.patchopts.PatchOptions.IconReplacement -import dev.wintry.manager.R +import dev.shiggy.manager.R // Sizing information is obtained from here: https://medium.com/google-design/designing-adaptive-icons-515af294c783 diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/LoadFailure.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/LoadFailure.kt index 4089b4a..cff9d48 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/LoadFailure.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/LoadFailure.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun LoadFailure(modifier: Modifier = Modifier) { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt index cae74de..f839e6c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R @Composable fun ProjectHeader( @@ -28,7 +28,7 @@ fun ProjectHeader( modifier = modifier, ) { Image( - painter = painterResource(if (aliucord) R.drawable.ic_aliucord_logo else R.drawable.ic_rounded_wintry), + painter = painterResource(if (aliucord) R.drawable.ic_aliucord_logo else R.drawable.ic_rounded_shiggy), contentDescription = null, modifier = Modifier .padding(bottom = 6.dp) @@ -36,7 +36,7 @@ fun ProjectHeader( ) Text( - text = stringResource(if (aliucord) R.string.aliucord else R.string.wintry), + text = stringResource(if (aliucord) R.string.aliucord else R.string.shiggy), style = MaterialTheme.typography.titleMedium.copy(fontSize = 26.sp) ) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/ResetToDefaultButton.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/ResetToDefaultButton.kt index eaca211..93cabcf 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/ResetToDefaultButton.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/ResetToDefaultButton.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.util.mirrorVertically -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun ResetToDefaultButton( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/CustomComponentVersionPicker.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/CustomComponentVersionPicker.kt index c066ba8..6b7bd2f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/CustomComponentVersionPicker.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/CustomComponentVersionPicker.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import com.aliucord.manager.network.utils.SemVer -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun CustomComponentVersionPicker( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/InstallerAbortDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/InstallerAbortDialog.kt index 2bba97d..f2266c1 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/InstallerAbortDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/InstallerAbortDialog.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun InstallerAbortDialog( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/NetworkWarningDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/NetworkWarningDialog.kt index 182326a..4269314 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/NetworkWarningDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/NetworkWarningDialog.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun NetworkWarningDialog( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/PlayProtectDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/PlayProtectDialog.kt index e7e4825..6d5d9ad 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/PlayProtectDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/PlayProtectDialog.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import com.aliucord.manager.ui.theme.customColors -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PlayProtectDialog( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/StoragePermissionsDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/StoragePermissionsDialog.kt index 5c0d57e..22e78b1 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/StoragePermissionsDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/StoragePermissionsDialog.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.core.net.toUri import com.google.accompanist.permissions.* -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R @Composable @OptIn(ExperimentalPermissionsApi::class) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/UnknownSourcesPermissionDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/UnknownSourcesPermissionDialog.kt index bf70fa9..56de846 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/UnknownSourcesPermissionDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/dialogs/UnknownSourcesPermissionDialog.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import androidx.core.net.toUri -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R @Composable fun UnknownSourcesPermissionDialog() { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/previews/TextBannerPreview.kt b/app/src/main/kotlin/com/aliucord/manager/ui/previews/TextBannerPreview.kt index 397abc6..e9909f4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/previews/TextBannerPreview.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/previews/TextBannerPreview.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.tooling.preview.* import com.aliucord.manager.ui.screens.patching.components.TextBanner import com.aliucord.manager.ui.theme.ManagerTheme import com.aliucord.manager.ui.theme.customColors -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt b/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt index edd82fa..dcd1a31 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/IconOptionsScreenPreview.kt @@ -14,7 +14,7 @@ import com.aliucord.manager.ui.screens.iconopts.IconOptionsMode import com.aliucord.manager.ui.screens.iconopts.IconOptionsScreenContent import com.aliucord.manager.ui.screens.patchopts.PatchOptions.IconReplacement import com.aliucord.manager.ui.theme.ManagerTheme -import dev.wintry.manager.R +import dev.shiggy.manager.R import dev.zt64.compose.pipette.HsvColor import java.io.ByteArrayOutputStream diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/about/AboutScreenLoadedPreview.kt b/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/about/AboutScreenLoadedPreview.kt index 5713fec..bc4c3b2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/about/AboutScreenLoadedPreview.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/about/AboutScreenLoadedPreview.kt @@ -18,31 +18,35 @@ import kotlinx.serialization.json.Json @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO) private fun AboutScreenLoadedPreview( - @PreviewParameter(ContributorsProvider::class) - contributors: ImmutableList, + @PreviewParameter(ContributorsProvider::class) contributors: ImmutableList, ) { ManagerTheme { AboutScreenContent( - state = remember { mutableStateOf(AboutScreenState.Loaded(contributors)) }, + state = remember { mutableStateOf(AboutScreenState.Loaded(contributors)) }, ) } } private class ContributorsProvider : PreviewParameterProvider> { private val realDataRaw = - "[{\"username\":\"Juby210\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/31005896?v=4\",\"commits\":334,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":184},{\"name\":\"Aliucord-backend\",\"commits\":65},{\"name\":\"DiscordRN\",\"commits\":17},{\"name\":\"AliucordRN\",\"commits\":12},{\"name\":\"DiscordThemer\",\"commits\":8},{\"name\":\"buildtool\",\"commits\":7},{\"name\":\"plugins-template\",\"commits\":7},{\"name\":\"libzip\",\"commits\":5},{\"name\":\"Manager\",\"commits\":5},{\"name\":\"hook\",\"commits\":5},{\"name\":\"dokka\",\"commits\":4},{\"name\":\"gradle\",\"commits\":4},{\"name\":\"plugin-requests\",\"commits\":3},{\"name\":\"rollup-plugin-hermes\",\"commits\":3},{\"name\":\"rollup-plugin-aliucord\",\"commits\":2},{\"name\":\"debug-ws-server\",\"commits\":1},{\"name\":\"AliucordRNXposed\",\"commits\":1},{\"name\":\"AliucordNative\",\"commits\":1}]},{\"username\":\"rushiiMachine\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/33725716?v=4\",\"commits\":311,\"repositories\":[{\"name\":\"Manager\",\"commits\":184},{\"name\":\"Aliucord\",\"commits\":50},{\"name\":\"binary-resources\",\"commits\":27},{\"name\":\"plugins-webhook\",\"commits\":18},{\"name\":\"hook\",\"commits\":7},{\"name\":\"AliucordRN\",\"commits\":5},{\"name\":\"plugins\",\"commits\":4},{\"name\":\"gradle\",\"commits\":3},{\"name\":\"rollup-plugin-hermes\",\"commits\":3},{\"name\":\"Aliucord-backend\",\"commits\":2},{\"name\":\"ban-appeals\",\"commits\":2},{\"name\":\"AliucordNative\",\"commits\":2},{\"name\":\"rollup-plugin-aliucord\",\"commits\":2},{\"name\":\".github\",\"commits\":2}]},{\"username\":\"Vendicated\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/45497981?v=4\",\"commits\":229,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":123},{\"name\":\"AliucordRN\",\"commits\":19},{\"name\":\"hook\",\"commits\":19},{\"name\":\"Aliucord-backend\",\"commits\":15},{\"name\":\"plugins-template\",\"commits\":11},{\"name\":\"Manager\",\"commits\":8},{\"name\":\"AliucordNative\",\"commits\":6},{\"name\":\"documentation\",\"commits\":5},{\"name\":\"rollup-plugin-aliucord\",\"commits\":5},{\"name\":\"buildtool\",\"commits\":4},{\"name\":\"ban-appeals\",\"commits\":3},{\"name\":\"AliucordRNBootstrap\",\"commits\":3},{\"name\":\"plugin-template-rn\",\"commits\":3},{\"name\":\"AliuTube\",\"commits\":2},{\"name\":\"plugin-requests\",\"commits\":1},{\"name\":\"dokka\",\"commits\":1},{\"name\":\"debug-ws-server\",\"commits\":1}]},{\"username\":\"js6pak\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/35262707?v=4\",\"commits\":121,\"repositories\":[{\"name\":\"DiscordRN\",\"commits\":68},{\"name\":\"gradle\",\"commits\":26},{\"name\":\"AliucordRN\",\"commits\":10},{\"name\":\"Aliucord\",\"commits\":9},{\"name\":\"rollup-plugin-aliucord\",\"commits\":4},{\"name\":\"AliucordNative\",\"commits\":2},{\"name\":\"AliucordRNXposed\",\"commits\":1},{\"name\":\"rollup-plugin-hermes\",\"commits\":1}]},{\"username\":\"zt64\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/31907977?v=4\",\"commits\":66,\"repositories\":[{\"name\":\"Manager\",\"commits\":48},{\"name\":\"Aliucord\",\"commits\":18}]},{\"username\":\"TymanWasTaken\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/32660892?v=4\",\"commits\":31,\"repositories\":[{\"name\":\"aliucordrn-cli\",\"commits\":13},{\"name\":\"plugins\",\"commits\":6},{\"name\":\"AliucordRN\",\"commits\":4},{\"name\":\"Aliucord\",\"commits\":2},{\"name\":\"Manager\",\"commits\":1},{\"name\":\"debug-ws-server\",\"commits\":1},{\"name\":\"rollup-plugin-hermes\",\"commits\":1},{\"name\":\"AliucordNative\",\"commits\":1},{\"name\":\"rollup-plugin-aliucord\",\"commits\":1},{\"name\":\"plugin-template-rn\",\"commits\":1}]},{\"username\":\"X1nto\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/48173186?v=4\",\"commits\":16,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":12},{\"name\":\"buildtool\",\"commits\":2},{\"name\":\"Manager\",\"commits\":1},{\"name\":\"DiscordRN\",\"commits\":1}]},{\"username\":\"Drownbywind\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/29250530?v=4\",\"commits\":12,\"repositories\":[{\"name\":\"documentation\",\"commits\":12}]},{\"username\":\"nikosszzz\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/53112175?v=4\",\"commits\":12,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":9},{\"name\":\"rollup-plugin-hermes\",\"commits\":1},{\"name\":\"AliucordNative\",\"commits\":1},{\"name\":\"rollup-plugin-aliucord\",\"commits\":1}]},{\"username\":\"wingio\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/44992537?v=4\",\"commits\":12,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":9},{\"name\":\"Manager\",\"commits\":2},{\"name\":\"AliucordRN\",\"commits\":1}]},{\"username\":\"GangsterFox\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/84905506?v=4\",\"commits\":11,\"repositories\":[{\"name\":\"documentation\",\"commits\":11}]},{\"username\":\"mantikafasi\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/67705577?v=4\",\"commits\":11,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":11}]},{\"username\":\"janisslsm\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/97699850?v=4\",\"commits\":11,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":4},{\"name\":\"AliucordNative\",\"commits\":3},{\"name\":\"hook\",\"commits\":2},{\"name\":\"Manager\",\"commits\":1},{\"name\":\"rollup-plugin-aliucord\",\"commits\":1}]},{\"username\":\"C10udburst\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/18114966?v=4\",\"commits\":9,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":6},{\"name\":\"plugins-template\",\"commits\":1},{\"name\":\"AliucordNative\",\"commits\":1},{\"name\":\"plugin-template-rn\",\"commits\":1}]},{\"username\":\"Kyza\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/40003440?v=4\",\"commits\":8,\"repositories\":[{\"name\":\"plugins-template\",\"commits\":8}]},{\"username\":\"pylixonly\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/82711525?v=4\",\"commits\":8,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":6},{\"name\":\"AliucordNative\",\"commits\":1},{\"name\":\"rollup-plugin-aliucord\",\"commits\":1}]},{\"username\":\"LampDelivery\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/158360149?v=4\",\"commits\":8,\"repositories\":[{\"name\":\"documentation\",\"commits\":8}]},{\"username\":\"Ushie\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/79272171?v=4\",\"commits\":7,\"repositories\":[{\"name\":\"Manager\",\"commits\":7}]},{\"username\":\"nyakowint\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/24845294?v=4\",\"commits\":6,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":3},{\"name\":\"plugin-requests\",\"commits\":1},{\"name\":\"documentation\",\"commits\":1},{\"name\":\"Manager\",\"commits\":1}]},{\"username\":\"hairyfred\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/30961255?v=4\",\"commits\":5,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":4},{\"name\":\"Aliucord-backend\",\"commits\":1}]},{\"username\":\"OmegaSunkey\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/94485936?v=4\",\"commits\":5,\"repositories\":[{\"name\":\"Aliucord-backend\",\"commits\":3},{\"name\":\"Aliucord\",\"commits\":1},{\"name\":\"AliucordRN\",\"commits\":1}]},{\"username\":\"Swishilicous\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/52143580?v=4\",\"commits\":3,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":2},{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"MrSpidercat\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/41306077?v=4\",\"commits\":3,\"repositories\":[{\"name\":\"documentation\",\"commits\":3}]},{\"username\":\"RhyMegu\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/95598076?v=4\",\"commits\":3,\"repositories\":[{\"name\":\"documentation\",\"commits\":3}]},{\"username\":\"terabyte25\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/23338617?v=4\",\"commits\":2,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":2}]},{\"username\":\"scrazzz\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/70033559?v=4\",\"commits\":2,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":2}]},{\"username\":\"kasefuchs\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/64592097?v=4\",\"commits\":2,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1},{\"name\":\"gradle\",\"commits\":1}]},{\"username\":\"Kyiro\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/54126666?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"Aunali321\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/48486084?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Manager\",\"commits\":1}]},{\"username\":\"Cynosphere\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/1606710?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":1}]},{\"username\":\"Alvari-Kupari\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/138302953?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"FieryFlames\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/30497388?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":1}]},{\"username\":\"maisymoe\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/61095277?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":1}]},{\"username\":\"Wolfkid200444\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/32025746?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"unxcepted\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/28658966?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"sravan1946\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/57430307?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"Enovale\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/17408285?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Manager\",\"commits\":1}]},{\"username\":\"ScrubN\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/72096833?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"aarondoet\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/42084688?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"sepruko\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/33651534?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"adntaha\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/63275405?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":1}]},{\"username\":\"danik4985\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/82022495?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"Aliucord\",\"commits\":1}]},{\"username\":\"myumichi\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/156945548?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"documentation\",\"commits\":1}]},{\"username\":\"tacohitbox\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/87399016?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"AliuTube\",\"commits\":1}]},{\"username\":\"Martinz64\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/24656265?v=4\",\"commits\":1,\"repositories\":[{\"name\":\"AliucordRN\",\"commits\":1}]}]" - private val realData = Json.decodeFromString(ImmutableListSerializer(Contributor.serializer()), realDataRaw) + "[{\"username\":\"maisymoe\",\"avatarUrl\":\"https://avatars.githubusercontent.com/u/61095277?v=4\",\"repositories\":]" + private val realData = + Json.decodeFromString(ImmutableListSerializer(Contributor.serializer()), realDataRaw) - override val values = sequenceOf( - emptyImmutableList(), - persistentListOf( - Contributor( - username = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", - avatarUrl = "UNUSED", - commits = Int.MAX_VALUE, - repositories = (realData[0].repositories + realData[0].repositories).toImmutableList(), + override val values = + sequenceOf( + emptyImmutableList(), + persistentListOf( + Contributor( + username = + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz", + avatarUrl = "UNUSED", + commits = Int.MAX_VALUE, + repositories = + (realData[0].repositories + realData[0].repositories) + .toImmutableList(), + ) + ), + realData, ) - ), - realData, - ) } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/about/AboutScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/about/AboutScreen.kt index 48c200a..8330614 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/about/AboutScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/about/AboutScreen.kt @@ -23,14 +23,13 @@ import cafe.adriel.voyager.koin.koinScreenModel import com.aliucord.manager.ui.components.* import com.aliucord.manager.ui.screens.about.components.LeadContributor import com.aliucord.manager.ui.util.paddings.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize @Parcelize class AboutScreen : Screen, Parcelable { - @IgnoredOnParcel - override val key = "About" + @IgnoredOnParcel override val key = "About" @Composable override fun Content() { @@ -43,99 +42,94 @@ class AboutScreen : Screen, Parcelable { @Composable fun AboutScreenContent(state: State) { Scaffold( - topBar = { - TopAppBar( - title = { Text(stringResource(R.string.navigation_about_manager)) }, - navigationIcon = { BackButton() }, - ) - } + topBar = { + TopAppBar( + title = { Text(stringResource(R.string.navigation_about_manager)) }, + navigationIcon = { BackButton() }, + ) + } ) { paddingValues -> LazyColumn( - verticalArrangement = Arrangement.spacedBy(2.dp), - horizontalAlignment = Alignment.CenterHorizontally, - contentPadding = paddingValues - .exclude(PaddingValuesSides.Horizontal + PaddingValuesSides.Top) - .add(PaddingValues(vertical = 16.dp)), - modifier = Modifier - .padding(paddingValues.exclude(PaddingValuesSides.Bottom)) - .padding(horizontal = 14.dp), + verticalArrangement = Arrangement.spacedBy(2.dp), + horizontalAlignment = Alignment.CenterHorizontally, + contentPadding = + paddingValues + .exclude(PaddingValuesSides.Horizontal + PaddingValuesSides.Top) + .add(PaddingValues(vertical = 16.dp)), + modifier = + Modifier.padding(paddingValues.exclude(PaddingValuesSides.Bottom)) + .padding(horizontal = 14.dp), ) { item(key = "MANAGER_CREDIT_DISCLAIMER_BANNER") { Box( - contentAlignment = Alignment.Center, - modifier = Modifier - .padding(bottom = 24.dp) - .border( - width = 2.dp, - color = MaterialTheme.colorScheme.surfaceVariant, - shape = MaterialTheme.shapes.medium - ) - .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.surfaceContainerHigh) + contentAlignment = Alignment.Center, + modifier = + Modifier.padding(bottom = 24.dp) + .border( + width = 2.dp, + color = MaterialTheme.colorScheme.surfaceVariant, + shape = MaterialTheme.shapes.medium + ) + .clip(MaterialTheme.shapes.medium) + .background(MaterialTheme.colorScheme.surfaceContainerHigh) ) { Row( - horizontalArrangement = Arrangement.spacedBy(12.dp), - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .padding(horizontal = 20.dp, vertical = 14.dp) + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(horizontal = 20.dp, vertical = 14.dp) ) { Text( - text = stringResource(R.string.about_manager_credit_disclaimer_notice), - style = MaterialTheme.typography.labelMedium, + text = + stringResource( + R.string.about_manager_credit_disclaimer_notice + ), + style = MaterialTheme.typography.labelMedium, ) } } } - item(key = "PROJECT_HEADER") { - ProjectHeader(aliucord = true) - } + item(key = "PROJECT_HEADER") { ProjectHeader(aliucord = true) } item(key = "HEADER_DIVIDER") { TextDivider( - text = stringResource(R.string.contributors_lead), - modifier = Modifier.padding(top = 18.dp, bottom = 20.dp), + text = stringResource(R.string.contributors_lead), + modifier = Modifier.padding(top = 18.dp, bottom = 20.dp), ) } item(key = "MAIN_CONTRIBUTORS") { Row( - horizontalArrangement = Arrangement.SpaceEvenly, - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth(), ) { - LeadContributor("Vendicated", "the ven") - LeadContributor("Juby210", "Fox") - LeadContributor("rushii", "explod", "rushiiMachine") + LeadContributor("C0C0B01", "Creator of Kettu") + LeadContributor("kmmiio99o", "Creator of ShiggyCord") + LeadContributor("pylixonly", "Creator of Bunny") } } item(key = "CONTRIBUTORS_DIVIDER") { TextDivider( - text = stringResource(R.string.contributors), - modifier = Modifier.padding(top = 16.dp, bottom = 6.dp) + text = stringResource(R.string.contributors), + modifier = Modifier.padding(top = 16.dp, bottom = 6.dp) ) } when (val state = state.value) { - AboutScreenState.Loading -> item(key = "CONTRIBUTIONS_LOADING") { - Box( - contentAlignment = Alignment.Center, - content = { CircularProgressIndicator() }, - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 38.dp), - ) - } - - AboutScreenState.Failure -> item(key = "LOAD_FAILURE") { - LoadFailure( - modifier = Modifier - .fillMaxSize() - .padding(vertical = 38.dp) - ) - } - + AboutScreenState.Loading -> + item(key = "CONTRIBUTIONS_LOADING") { + Box( + contentAlignment = Alignment.Center, + content = { CircularProgressIndicator() }, + modifier = Modifier.fillMaxWidth().padding(vertical = 38.dp), + ) + } + AboutScreenState.Failure -> + item(key = "LOAD_FAILURE") { + LoadFailure(modifier = Modifier.fillMaxSize().padding(vertical = 38.dp)) + } is AboutScreenState.Loaded -> { items(state.contributors, key = { it.username }) { user -> ContributorCommitsItem(user) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt index 65976b4..ccad646 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt @@ -24,8 +24,8 @@ import com.aliucord.manager.ui.util.DiscordVersion import com.aliucord.manager.ui.util.toUnsafeImmutable import com.aliucord.manager.util.* import com.github.diamondminer88.zip.ZipReader -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.coroutines.* import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock @@ -37,7 +37,7 @@ class HomeModel( private val application: Application, private val github: AliucordGithubService, private val maven: AliucordMavenService, - private val wtGithub: WintryGithubService, + private val wtGithub: ShiggyGithubService, private val rnaTracker: RNATrackerService, private val json: Json, ) : ScreenModel { @@ -47,7 +47,7 @@ class HomeModel( private val refreshingLock = Mutex() private var remoteDataJson: BuildInfo? = null private var trackerIndexJson: RNATrackerIndex? = null - private var latestWintryXposedVersion: SemVer? = null + private var latestShiggyXposedVersion: SemVer? = null private var latestAliuhookVersion: SemVer? = null init { @@ -109,7 +109,7 @@ class HomeModel( val metadata = try { val applicationInfo = application.packageManager.getApplicationInfo(packageName, 0) val metadataFile = ZipReader(applicationInfo.publicSourceDir) - .use { it.openEntry("wintry.json")?.read() } + .use { it.openEntry("shiggy.json")?.read() } @OptIn(ExperimentalSerializationApi::class) metadataFile?.let { json.decodeFromStream(it.inputStream()) } @@ -190,7 +190,7 @@ class HomeModel( private suspend fun fetchRemoteData() { listOf( - // // These aren't needed by Wintry + // // These aren't needed by Shiggy // screenModelScope.launch(Dispatchers.IO) { // github.getBuildData().fold( // success = { remoteDataJson = it }, @@ -211,14 +211,14 @@ class HomeModel( }, screenModelScope.launch(Dispatchers.IO) { wtGithub.getLatestXposedRelease().fold( - success = { latestWintryXposedVersion = SemVer.parse(it.name) }, - fail = { Log.w(BuildConfig.TAG, "Failed to fetch latest WintryXposed version", it) }, + success = { latestShiggyXposedVersion = SemVer.parse(it.name) }, + fail = { Log.w(BuildConfig.TAG, "Failed to fetch latest ShiggyXposed version", it) }, ) }, ).joinAll() - if (trackerIndexJson == null /* remoteDataJson == null || latestAliuhookVersion == null */ || latestWintryXposedVersion == null) { + if (trackerIndexJson == null /* remoteDataJson == null || latestAliuhookVersion == null */ || latestShiggyXposedVersion == null) { mainThread { application.showToast(R.string.home_network_fail) } } } @@ -230,8 +230,8 @@ class HomeModel( return application.packageManager .getInstalledPackages(PackageManager.GET_META_DATA) .filter { - // Wintry doesn't have "legacy installer" whatsoever - return@filter it.applicationInfo?.metaData?.containsKey("isWintry") == true + // Shiggy doesn't have "legacy installer" whatsoever + return@filter it.applicationInfo?.metaData?.containsKey("isShiggy") == true // // Packages installed via the legacy Installer do not have the metadata marker // val isAliucordPkg = it.packageName == "com.aliucord" @@ -241,11 +241,11 @@ class HomeModel( } /** - * Checks whether the current Wintry installation is up-to-date. + * Checks whether the current Shiggy installation is up-to-date. * * Currently mirrors the behavior of Bunny Manager by directly comparing against - * the latest available Discord and WintryXposed release. This is a temporary approach and will remain - * in place until Wintry adds support for version pinning. + * the latest available Discord and ShiggyXposed release. This is a temporary approach and will remain + * in place until Shiggy adds support for version pinning. */ private fun isInstallationUpToDate(pkg: PackageInfo): Boolean? { val trackerData = trackerIndexJson ?: return null @@ -257,7 +257,7 @@ class HomeModel( // Try to parse install metadata. If none present, install was made via legacy installer. val apkPath = pkg.applicationInfo?.publicSourceDir ?: return false val installMetadata = try { - val metadataFile = ZipReader(apkPath).use { it.openEntry("wintry.json")?.read() } + val metadataFile = ZipReader(apkPath).use { it.openEntry("shiggy.json")?.read() } ?: return false @OptIn(ExperimentalSerializationApi::class) @@ -274,6 +274,6 @@ class HomeModel( VersionPreference.Custom -> return true } - return latestByPref == versionCode && installMetadata.wintryXposedVersion == latestWintryXposedVersion + return latestByPref == versionCode && installMetadata.shiggyXposedVersion == latestShiggyXposedVersion } } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt index a4b25c5..f3f548e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt @@ -34,7 +34,7 @@ import com.aliucord.manager.ui.screens.plugins.PluginsScreen import com.aliucord.manager.ui.util.paddings.PaddingValuesSides import com.aliucord.manager.ui.util.paddings.exclude import com.aliucord.manager.util.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/HomeAppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/HomeAppBar.kt index 1783d07..ad33247 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/HomeAppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/HomeAppBar.kt @@ -8,7 +8,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator import com.aliucord.manager.ui.screens.about.AboutScreen import com.aliucord.manager.ui.screens.logs.LogsListScreen import com.aliucord.manager.ui.screens.settings.SettingsScreen -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun HomeAppBar() { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstallButton.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstallButton.kt index f847af8..7744eef 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstallButton.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstallButton.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.util.thenIf import com.valentinilk.shimmer.* -import dev.wintry.manager.R +import dev.shiggy.manager.R private val shimmerTheme = defaultShimmerTheme.copy( shimmerWidth = 150.dp, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt index 480adfc..b4e9ab3 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.components.SegmentedButton import com.aliucord.manager.ui.components.VersionDisplay import com.aliucord.manager.ui.screens.home.InstallData -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun InstalledItemCard( @@ -88,7 +88,7 @@ fun InstalledItemCard( horizontalArrangement = Arrangement.spacedBy(2.dp), modifier = Modifier.clip(MaterialTheme.shapes.large), ) { - // // Plugins cannot be managed externally yet in Wintry + // // Plugins cannot be managed externally yet in Shiggy // SegmentedButton( // icon = painterResource(R.drawable.ic_extension), // text = stringResource(R.string.plugins_title), diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsMode.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsMode.kt index 42a3387..0b9e7f9 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsMode.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsMode.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.Immutable enum class IconOptionsMode { Original, OldDiscord, - Wintry, + Shiggy, Aliucord, CustomColor, CustomImage, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsModel.kt index f55db8f..1ef7205 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsModel.kt @@ -10,8 +10,8 @@ import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.screenModelScope import com.aliucord.manager.ui.screens.patchopts.PatchOptions.IconReplacement import com.aliucord.manager.util.* -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import dev.zt64.compose.pipette.HsvColor import java.io.IOException @@ -74,9 +74,9 @@ class IconOptionsModel( // ---------- Other ---------- // init { when (prefilledOptions) { - is IconReplacement.CustomColor if prefilledOptions.color == IconReplacement.WintryColor -> { - changeMode(IconOptionsMode.Wintry) - initSelectedColor(IconReplacement.WintryColor) + is IconReplacement.CustomColor if prefilledOptions.color == IconReplacement.ShiggyColor -> { + changeMode(IconOptionsMode.Shiggy) + initSelectedColor(IconReplacement.ShiggyColor) } is IconReplacement.CustomColor if prefilledOptions.color == IconReplacement.AliucordColor -> { @@ -104,7 +104,7 @@ class IconOptionsModel( return when (mode) { IconOptionsMode.Original -> IconReplacement.Original IconOptionsMode.OldDiscord -> IconReplacement.OldDiscord - IconOptionsMode.Wintry -> IconReplacement.CustomColor(IconReplacement.WintryColor) + IconOptionsMode.Shiggy -> IconReplacement.CustomColor(IconReplacement.ShiggyColor) IconOptionsMode.Aliucord -> IconReplacement.CustomColor(IconReplacement.AliucordColor) IconOptionsMode.CustomColor -> IconReplacement.CustomColor(color = selectedColor.toColor()) IconOptionsMode.CustomImage -> IconReplacement.CustomImage( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt index ec5fc0d..7637223 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt @@ -41,7 +41,7 @@ import com.aliucord.manager.ui.screens.patchopts.PatchOptionsScreen import com.aliucord.manager.ui.util.ColorSaver import com.aliucord.manager.ui.util.throttledState import com.aliucord.manager.util.back -import dev.wintry.manager.R +import dev.shiggy.manager.R import dev.zt64.compose.pipette.CircularColorPicker import dev.zt64.compose.pipette.HsvColor import kotlinx.parcelize.IgnoredOnParcel @@ -120,10 +120,10 @@ fun IconOptionsScreenContent( onClick = remember { { setMode(IconOptionsMode.OldDiscord) } }, ) RadioSelectorItem( - name = stringResource(R.string.wintry), - description = stringResource(R.string.iconopts_variant_desc_wintry), - selected = mode == IconOptionsMode.Wintry, - onClick = remember { { setMode(IconOptionsMode.Wintry) } }, + name = stringResource(R.string.shiggy), + description = stringResource(R.string.iconopts_variant_desc_shiggy), + selected = mode == IconOptionsMode.Shiggy, + onClick = remember { { setMode(IconOptionsMode.Shiggy) } }, ) RadioSelectorItem( name = stringResource(R.string.aliucord), @@ -220,7 +220,7 @@ private fun IconPreview( IconOptionsMode.Original -> PatchOptions.IconReplacement.BlurpleColor IconOptionsMode.OldDiscord -> PatchOptions.IconReplacement.OldBlurpleColor IconOptionsMode.Aliucord -> PatchOptions.IconReplacement.AliucordColor - IconOptionsMode.Wintry -> PatchOptions.IconReplacement.WintryColor + IconOptionsMode.Shiggy -> PatchOptions.IconReplacement.ShiggyColor IconOptionsMode.CustomColor -> selectedColor.toColor() IconOptionsMode.CustomImage -> error("unreachable") } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/IconOptionsAppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/IconOptionsAppBar.kt index 4e0a606..39c4d14 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/IconOptionsAppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/IconOptionsAppBar.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.res.stringResource import cafe.adriel.voyager.navigator.LocalNavigator import com.aliucord.manager.ui.components.BackButton import com.aliucord.manager.ui.screens.settings.SettingsScreen -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun IconOptionsAppBar() { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/RGBTextField.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/RGBTextField.kt index 5b432c0..5294384 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/RGBTextField.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/components/RGBTextField.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R import java.util.Locale import kotlin.math.roundToInt diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreen.kt index c9678be..95f2d7d 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreen.kt @@ -18,7 +18,7 @@ import com.aliucord.manager.ui.components.Label import com.aliucord.manager.ui.screens.log.components.LogAppBar import com.aliucord.manager.ui.screens.log.components.LogTextArea import com.aliucord.manager.util.back -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import org.koin.core.parameter.parametersOf diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreenModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreenModel.kt index fac48dd..17c837d 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreenModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/LogScreenModel.kt @@ -10,8 +10,8 @@ import cafe.adriel.voyager.core.model.screenModelScope import com.aliucord.manager.manager.InstallLogData import com.aliucord.manager.manager.InstallLogManager import com.aliucord.manager.util.* -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R class LogScreenModel( private val installId: String, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/components/LogAppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/components/LogAppBar.kt index 42d463c..398fbcb 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/components/LogAppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/log/components/LogAppBar.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import com.aliucord.manager.ui.components.BackButton -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun LogAppBar( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreenModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreenModel.kt index 9b490e6..5e3186b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreenModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreenModel.kt @@ -8,7 +8,7 @@ import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.screenModelScope import com.aliucord.manager.manager.InstallLogManager import com.aliucord.manager.util.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogEntryCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogEntryCard.kt index a5255a6..ad3132c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogEntryCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogEntryCard.kt @@ -21,7 +21,7 @@ import com.aliucord.manager.patcher.steps.base.StepState import com.aliucord.manager.ui.screens.logs.LogEntry import com.aliucord.manager.ui.screens.patching.components.StepStateIcon import com.aliucord.manager.ui.screens.patching.components.TimeElapsed -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun LogEntryCard( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsListAppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsListAppBar.kt index e358d39..91c22b4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsListAppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsListAppBar.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.res.stringResource import cafe.adriel.voyager.navigator.LocalNavigator import com.aliucord.manager.ui.components.BackButton import com.aliucord.manager.ui.screens.settings.SettingsScreen -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun LogsListAppBar( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsNone.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsNone.kt index 18beaea..faf4e60 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsNone.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/LogsNone.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun LogsNone(modifier: Modifier = Modifier) { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/dialogs/DeleteLogsDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/dialogs/DeleteLogsDialog.kt index 5338097..870bc98 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/dialogs/DeleteLogsDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/components/dialogs/DeleteLogsDialog.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun DeleteLogsDialog( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt index 2e612cd..92e0d23 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreen.kt @@ -40,8 +40,8 @@ import com.aliucord.manager.ui.util.spacedByLastAtBottom import com.aliucord.manager.ui.util.thenIf import com.aliucord.manager.util.back import com.aliucord.manager.util.isIgnoringBatteryOptimizations -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.flow.filter import kotlinx.parcelize.IgnoredOnParcel diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt index 6d5d30f..82a6e45 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/PatchingScreenModel.kt @@ -9,7 +9,7 @@ import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.screenModelScope import com.aliucord.manager.manager.* import com.aliucord.manager.patcher.StepRunner -import com.aliucord.manager.patcher.WintryPatchRunner +import com.aliucord.manager.patcher.ShiggyPatchRunner import com.aliucord.manager.patcher.steps.StepGroup import com.aliucord.manager.patcher.steps.base.* import com.aliucord.manager.patcher.steps.install.InstallStep @@ -17,8 +17,8 @@ import com.aliucord.manager.patcher.util.InsufficientStorageException import com.aliucord.manager.ui.screens.patchopts.PatchOptions import com.aliucord.manager.ui.util.toUnsafeImmutable import com.aliucord.manager.util.* -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableMap import kotlinx.coroutines.* @@ -125,7 +125,7 @@ class PatchingScreenModel( } private suspend fun startPatchRunner() { - val runner = WintryPatchRunner(options) + val runner = ShiggyPatchRunner(options) .also { stepRunner = it } val newSteps = runner.steps.groupBy { it.group } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/FunFact.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/FunFact.kt index 15f50c0..603c1ca 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/FunFact.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/FunFact.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.screens.patching.PatchingScreenState import com.aliucord.manager.ui.screens.patching.VERTICAL_PADDING -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun FunFact( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/PatchingAppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/PatchingAppBar.kt index e2898ba..9dfefbf 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/PatchingAppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/PatchingAppBar.kt @@ -4,7 +4,7 @@ import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PatchingAppBar( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt index 98f30c4..ca8cb82 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.aliucord.manager.patcher.steps.base.Step import com.aliucord.manager.patcher.steps.base.StepState -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.collections.immutable.ImmutableList @Composable diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepStateIcon.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepStateIcon.kt index 56409f8..2afaeb8 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepStateIcon.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepStateIcon.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import com.aliucord.manager.patcher.steps.base.StepState -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlin.math.floor import kotlin.math.roundToInt diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptions.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptions.kt index efa728b..1fd456b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptions.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptions.kt @@ -109,9 +109,9 @@ data class PatchOptions( val AliucordColor = Color(0xFF00C853) /** - * The default Wintry background color. + * The default Shiggy background color. */ - val WintryColor = Color(0xFF133E87) + val ShiggyColor = Color(0xFF133E87) /** * The new Discord blurple used in icons. @@ -127,10 +127,10 @@ data class PatchOptions( companion object { val Default = PatchOptions( - appName = "Wintry", - packageName = "dev.wintry.app", + appName = "Shiggy", + packageName = "dev.shiggy.app", debuggable = false, - iconReplacement = IconReplacement.CustomColor(IconReplacement.WintryColor), + iconReplacement = IconReplacement.CustomColor(IconReplacement.ShiggyColor), versionPreference = VersionPreference.Stable, customVersionCode = "", ) 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 b8a954d..6fb8139 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 @@ -32,7 +32,7 @@ import com.aliucord.manager.ui.screens.patchopts.components.PatchOptionsAppBar import com.aliucord.manager.ui.screens.patchopts.components.options.* import com.aliucord.manager.ui.util.* import com.aliucord.manager.util.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.coroutines.delay import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize @@ -85,7 +85,7 @@ class PatchOptionsScreen( selectedColor = when (iconModel.mode) { IconOptionsMode.Original -> PatchOptions.IconReplacement.BlurpleColor IconOptionsMode.OldDiscord -> PatchOptions.IconReplacement.OldBlurpleColor - IconOptionsMode.Wintry -> PatchOptions.IconReplacement.WintryColor + IconOptionsMode.Shiggy -> PatchOptions.IconReplacement.ShiggyColor IconOptionsMode.Aliucord -> PatchOptions.IconReplacement.AliucordColor IconOptionsMode.CustomColor -> iconModel.selectedColor.toColor() IconOptionsMode.CustomImage -> null diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PackageNameStateLabel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PackageNameStateLabel.kt index 4cb7669..e601b86 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PackageNameStateLabel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PackageNameStateLabel.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.screens.patchopts.PackageNameState -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PackageNameStateLabel( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PatchOptionsAppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PatchOptionsAppBar.kt index b923cf0..a56c2f5 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PatchOptionsAppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/PatchOptionsAppBar.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.res.stringResource import cafe.adriel.voyager.navigator.LocalNavigator import com.aliucord.manager.ui.components.BackButton import com.aliucord.manager.ui.screens.settings.SettingsScreen -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PatchOptionsAppBar( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsModel.kt index ca4cfc2..f166d64 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsModel.kt @@ -12,8 +12,8 @@ import com.aliucord.manager.ui.util.emptyImmutableList import com.aliucord.manager.ui.util.toUnsafeImmutable import com.aliucord.manager.util.* import com.github.diamondminer88.zip.ZipReader -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsScreen.kt index 42f86f6..cabae2c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsScreen.kt @@ -22,7 +22,7 @@ import com.aliucord.manager.ui.screens.plugins.components.* import com.aliucord.manager.ui.screens.plugins.components.dialogs.UninstallPluginDialog import com.aliucord.manager.ui.screens.plugins.model.PluginItem import com.aliucord.manager.ui.util.paddings.* -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.collections.immutable.ImmutableList import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/Changelog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/Changelog.kt index bd38529..3c0342a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/Changelog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/Changelog.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage import com.aliucord.manager.ui.screens.plugins.model.PluginItem -import dev.wintry.manager.R +import dev.shiggy.manager.R private val hyperLinkPattern = Regex("\\[(.+?)]\\((.+?\\))") diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginCard.kt index 0b275b6..45c42eb 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginCard.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.screens.plugins.model.PluginItem -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PluginCard( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginSearch.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginSearch.kt index 3de0427..b62ba1c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginSearch.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginSearch.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import com.aliucord.manager.ui.components.ResetToDefaultButton -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PluginSearch( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsError.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsError.kt index b34ced3..9d94a50 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsError.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsError.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PluginsError(modifier: Modifier = Modifier) { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsNone.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsNone.kt index d07d976..315ed02 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsNone.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/PluginsNone.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun PluginsNone(modifier: Modifier = Modifier) { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/dialogs/UninstallPluginDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/dialogs/UninstallPluginDialog.kt index 4df0c71..812752f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/dialogs/UninstallPluginDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/components/dialogs/UninstallPluginDialog.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun UninstallPluginDialog( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsModel.kt index f6f69e6..8e2a18b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsModel.kt @@ -8,8 +8,8 @@ import com.aliucord.manager.manager.PathManager import com.aliucord.manager.manager.PreferencesManager import com.aliucord.manager.ui.theme.Theme import com.aliucord.manager.util.* -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R class SettingsModel( private val application: Application, @@ -55,7 +55,7 @@ class SettingsModel( } fun shareApk() { - // TODO(Wintry): Implement this + // TODO(Shiggy): Implement this application.showToast(R.string.settings_export_apk_not_implemented) // val file = paths.patchingWorkingDir().resolve("patched.apk") // val fileUri = FileProvider.getUriForFile( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsScreen.kt index 644beae..9bfc273 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/SettingsScreen.kt @@ -24,7 +24,7 @@ import com.aliucord.manager.ui.components.BackButton import com.aliucord.manager.ui.components.MainActionButton import com.aliucord.manager.ui.components.settings.* import com.aliucord.manager.ui.screens.settings.components.ThemeDialog -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/components/ThemeDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/components/ThemeDialog.kt index 5d371eb..dbd8d49 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/components/ThemeDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/settings/components/ThemeDialog.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.aliucord.manager.ui.theme.Theme -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun ThemeDialog( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt b/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt index 8f43505..1ff9074 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/theme/Theme.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import com.google.accompanist.systemuicontroller.rememberSystemUiController -import dev.wintry.manager.R +import dev.shiggy.manager.R @Composable fun ManagerTheme( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/theme/ThemeTypography.kt b/app/src/main/kotlin/com/aliucord/manager/ui/theme/ThemeTypography.kt index 3d9183b..67062f4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/theme/ThemeTypography.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/theme/ThemeTypography.kt @@ -3,7 +3,7 @@ package com.aliucord.manager.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.font.* -import dev.wintry.manager.R +import dev.shiggy.manager.R // This uses a variable font variant of Roboto. // ref: https://medium.com/androiddevelopers/just-your-type-variable-fonts-in-compose-5bf63b357994 diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt b/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt index 0538e5e..9a2311f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.ui.res.stringResource -import dev.wintry.manager.R +import dev.shiggy.manager.R import kotlinx.parcelize.Parcelize @Parcelize diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/util/InstallNotifications.kt b/app/src/main/kotlin/com/aliucord/manager/ui/util/InstallNotifications.kt index 051ce96..e3d478f 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/util/InstallNotifications.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/util/InstallNotifications.kt @@ -12,8 +12,8 @@ import androidx.core.app.* import androidx.core.content.ContextCompat import com.aliucord.manager.MainActivity import com.aliucord.manager.util.findActivity -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R object InstallNotifications { private const val CHANNEL_ID = "installation" diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterDialog.kt index 7527c7e..f1e379c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterDialog.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties -import dev.wintry.manager.R +import dev.shiggy.manager.R import org.koin.androidx.compose.koinViewModel @Composable diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterViewModel.kt index 54de578..838e363 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterViewModel.kt @@ -13,18 +13,18 @@ import com.aliucord.manager.manager.InstallerSetting import com.aliucord.manager.manager.download.IDownloadManager import com.aliucord.manager.manager.download.KtorDownloadManager import com.aliucord.manager.network.services.AliucordGithubService -import com.aliucord.manager.network.services.WintryGithubService +import com.aliucord.manager.network.services.ShiggyGithubService import com.aliucord.manager.network.utils.SemVer import com.aliucord.manager.network.utils.getOrThrow import com.aliucord.manager.util.* -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlin.system.exitProcess class UpdaterViewModel( - private val github: WintryGithubService, + private val github: ShiggyGithubService, private val downloader: KtorDownloadManager, private val installers: InstallerManager, private val application: Application, diff --git a/app/src/main/kotlin/com/aliucord/manager/util/Context.kt b/app/src/main/kotlin/com/aliucord/manager/util/Context.kt index 4c6e791..809c639 100644 --- a/app/src/main/kotlin/com/aliucord/manager/util/Context.kt +++ b/app/src/main/kotlin/com/aliucord/manager/util/Context.kt @@ -13,8 +13,8 @@ import android.widget.Toast import androidx.annotation.AnyRes import androidx.annotation.StringRes import com.google.android.gms.safetynet.SafetyNet -import dev.wintry.manager.BuildConfig -import dev.wintry.manager.R +import dev.shiggy.manager.BuildConfig +import dev.shiggy.manager.R import java.io.File import java.io.InputStream import kotlin.coroutines.resume diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0031e2a..893de54 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Wintry Manager + Shiggy Manager A Discord mod built with simplicity and a seamless experience in mind. Aliucord @@ -8,7 +8,7 @@ Support Server Installer - Wintry + Shiggy A mod for the Discord Android App Cancel @@ -40,11 +40,11 @@ Reinstall Grant Permissions - In order for Wintry Manager to function, file permissions are required. Since shared data is stored in ~/Wintry, permissions are required in order to access it. - Installing Wintry requires granting permissions to install apps from unknown sources. + In order for Shiggy Manager to function, file permissions are required. + Installing Shiggy requires granting permissions to install apps from unknown sources. No installations found! - Failed to launch Wintry + Failed to launch Shiggy Advanced Appearance @@ -56,12 +56,16 @@ Developer options Don\'t enable this unless you know what it does! (yes, really) Keep patched APKs - Keep all patched files and APKs after installation for debugging purposes. Note that exporting the APK is only useful after a successful patching session. + Keep all patched files and APKs after installation for debugging purposes. Note that exporting the APK is only useful after a successful patching session. Clear cache Export APK This feature is not implemented yet - This manager is a fork of the original Aliucord Manager project, adapted for use with Wintry. All credit goes to the Aliucord team for their foundational work. + This manager is a fork of the original Aliucord Manager project, adapted for use with Shiggy. All credit goes to the Aliucord team for their foundational work. System Dark @@ -87,7 +91,9 @@ Failed to load Metered network - It appears you are connected to mobile data or a potentially metered network. Continuing with the installation may result in several hundred megabytes being downloaded. Are you sure you want to continue? + It appears you are connected to mobile data or a potentially metered network. Continuing with the installation may result in several hundred megabytes being downloaded. Are you sure you want to continue? Don\'t show this again Supported version: @@ -102,16 +108,20 @@ Saved to %s Failed to save %s - Successfully installed Wintry - Cancelled Wintry installation - Please uninstall your current version of Wintry in order to continue! - Successfully uninstalled Wintry + Successfully installed Shiggy + Cancelled Shiggy installation + Please uninstall your current version of Shiggy in order to continue! + Successfully uninstalled Shiggy Cancelled uninstallation Failed to verify download Insufficient storage space! - Since battery optimizations have not been disabled, minimizing this screen may abort the installation process! - Installation failed! You can either retry or click this banner to open the Wintry server for help. - Successfully installed Wintry! Do *NOT* uninstall the manager (this app) as it is required to perform certain types of updates. + Since battery optimizations have not been disabled, minimizing this screen may abort the installation process! + Installation failed! You can either retry or click this banner to open the Shiggy server for help. + Successfully installed Shiggy! Do *NOT* uninstall the manager (this app) as it is required to perform certain types of updates. Installer failure (Unknown reason) Installation was blocked @@ -152,8 +162,8 @@ Downloading libs apk Downloading lang apk Downloading resources apk - Injecting WintryXposed with LSPatch - Downloading WintryXposed + Injecting ShiggyXposed with LSPatch + Downloading ShiggyXposed Queued Ongoing @@ -164,7 +174,9 @@ Really exit? Are you sure you really want to abort an in-progress installation? - A new update has been released for Wintry Manager! It may be required in order to function properly. Would you like to update? + A new update has been released for Shiggy Manager! It may be required in order to function properly. Would you like to update? Update to v%s Failed to check for updates! Failed to update! Please download and install the update manually! @@ -177,18 +189,24 @@ Failed to fetch data! - The manager provides several customizations at installation time that are not able to be changed once installed. + The manager provides several customizations at installation time that are not able to be changed once installed. Package Name - The package name is a unique identifier for all apps. Using different ones can allow for multiple installations of Wintry. + The package name is a unique identifier for all apps. Using different ones can allow for multiple installations of Shiggy. Invalid package name! Target app will be overwritten! Valid package name! App Name - The app name is what\'s displayed in your home launcher. This should be changed on secondary installations for ease of use. + The app name is what\'s displayed in your home launcher. This should be changed on secondary installations for ease of use. Debuggable Enable the debuggable manifest flag. Only use this if you know what you are doing! Replace app icon - Change the app\'s icon to Wintry\'s icon (or a custom one) instead of Discord\'s. + Change the app\'s icon to Shiggy\'s icon (or a custom one) instead of Discord\'s. Basic Advanced The selected icon options are invalid! @@ -204,9 +222,11 @@ Custom Image Does not alter the original icon, instead only adding the missing monochrome icon to the APK. Changes the original icon color to Aliucord\'s branding. - Changes the original icon color to Wintry\'s branding. + Changes the original icon color to Shiggy\'s branding. Select a custom icon background color. - Select a custom replacement image. Note that the image must have sufficient padding as per the Adaptive Icon foreground guidelines. Maximum image size is 256KiB. + Select a custom replacement image. Note that the image must have sufficient padding as per the Adaptive Icon foreground guidelines. Maximum image size is 256KiB. Hue & Saturation The main HSV color components. Lightness @@ -218,7 +238,9 @@ Select Image Example image Icon Preview - A preview of the selected options, cropped and scaled to show how the icon will appear on your device + A preview of the selected options, cropped and scaled to show how the icon will appear on your device Preview A full, uncropped preview of the selected image. No image selected @@ -241,13 +263,15 @@ Active installation Progress notifications sent during a minimized installation - Wintry installation ready! + Shiggy installation ready! Click to install… - Wintry failed to install + Shiggy failed to install Click to view more info… Play Protect - Google Play Protect appears to be enabled on your device. It may attempt to interfere with a new installation due to the usage of a unique signing key. You can disable it in Play Protect\'s settings.\n\nIf it does show a warning dialog, press\n\"More Details\" -> \"Install anyway\" + Google Play Protect appears to be enabled on your device. It may attempt to interfere with a new installation due to the usage of a unique signing key. You can disable it in Play Protect\'s settings.\n\nIf it does show a warning dialog, press\n\"More Details\" -> \"Install anyway\" Continue Open Play Protect Don\'t show this again