Merge pull request #31 from Rico040/main

Update stuff
bunny-mod · Nov 25, 2024 · ac7038c · ac7038c
2 parents 66026b4 + 0b80fae
commit ac7038c
Show file tree

Hide file tree

Showing 53 changed files with 136 additions and 236 deletions.
diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml
@@ -37,7 +37,7 @@ jobs:
         run: chmod +x ./gradlew && ./gradlew assembleDebug
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: manager-debug
           path: app/build/outputs/apk/debug/app-debug.apk
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 bin/
 gen/
 out/
+.kotlin/
 #  Uncomment the following line in case you need and you don't have the release build type files in your app
 # release/
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,21 +1,21 @@
-import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude
 import java.io.ByteArrayOutputStream
 
 plugins {
     alias(libs.plugins.aboutlibraries)
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     namespace = "dev.beefers.vendetta.manager"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "io.github.pyoncord.manager"
         minSdk = 28
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1006
         versionName = "1.0.6"
 
@@ -52,7 +52,8 @@ android {
         freeCompilerArgs += listOf(
             "-Xcontext-receivers",
             "-P",
-            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${buildDir.resolve("report").absolutePath}",
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
+                    layout.buildDirectory.get().asFile.resolve("report").absolutePath,
         )
     }
 

diff --git a/app/libs/lspatch.aar b/app/libs/lspatch.aar
diff --git a/app/src/androidTest/java/dev/beefers/vendetta/manager/ExampleInstrumentedTest.kt b/app/src/androidTest/java/dev/beefers/vendetta/manager/ExampleInstrumentedTest.kt
diff --git a/app/src/main/assets/lspatch/so/arm64-v8a/liblspatch.so b/app/src/main/assets/lspatch/so/arm64-v8a/liblspatch.so
diff --git a/app/src/main/assets/lspatch/so/armeabi-v7a/liblspatch.so b/app/src/main/assets/lspatch/so/armeabi-v7a/liblspatch.so
diff --git a/app/src/main/assets/lspatch/so/x86/liblspatch.so b/app/src/main/assets/lspatch/so/x86/liblspatch.so
diff --git a/app/src/main/assets/lspatch/so/x86_64/liblspatch.so b/app/src/main/assets/lspatch/so/x86_64/liblspatch.so
diff --git a/app/src/main/java/dev/beefers/vendetta/manager/installer/step/StepRunner.kt b/app/src/main/java/dev/beefers/vendetta/manager/installer/step/StepRunner.kt
@@ -101,13 +101,13 @@ class StepRunner(
      * Whether or not the patching/installation process has completed.
      * Note that this does not mean all steps were finished successfully
      */
-    var completed by mutableStateOf<Boolean>(false)
+    var completed by mutableStateOf(false)
         private set
 
     /**
      * Whether or not a download step failed, this is only for errors related to network conditions and not cancellations
      */
-    var downloadErrored by mutableStateOf<Boolean>(false)
+    var downloadErrored by mutableStateOf(false)
 
     /**
      * List of steps to go through for this install

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/installer/step/download/base/DownloadStep.kt b/app/src/main/java/dev/beefers/vendetta/manager/installer/step/download/base/DownloadStep.kt
@@ -16,8 +16,6 @@ import dev.beefers.vendetta.manager.installer.step.StepStatus
 import dev.beefers.vendetta.manager.utils.mainThread
 import dev.beefers.vendetta.manager.utils.showToast
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.koin.core.component.inject
 import java.io.File
 import kotlin.math.roundToInt

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/installer/step/patching/ReplaceIconStep.kt b/app/src/main/java/dev/beefers/vendetta/manager/installer/step/patching/ReplaceIconStep.kt
@@ -1,26 +1,21 @@
 package dev.beefers.vendetta.manager.installer.step.patching
 
-import android.os.Build
 import android.content.Context
 import androidx.compose.ui.graphics.Color
 import com.github.diamondminer88.zip.ZipWriter
-import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceIdentifier
-import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceValue
 import dev.beefers.vendetta.manager.R
 import dev.beefers.vendetta.manager.domain.manager.PreferenceManager
 import dev.beefers.vendetta.manager.installer.step.Step
 import dev.beefers.vendetta.manager.installer.step.StepGroup
 import dev.beefers.vendetta.manager.installer.step.StepRunner
 import dev.beefers.vendetta.manager.installer.step.download.DownloadBaseStep
-import dev.beefers.vendetta.manager.installer.utils.ArscUtil
-import dev.beefers.vendetta.manager.installer.utils.ArscUtil.addColorResource
-import dev.beefers.vendetta.manager.installer.utils.ArscUtil.addResource
-import dev.beefers.vendetta.manager.installer.utils.ArscUtil.getMainArscChunk
-import dev.beefers.vendetta.manager.installer.utils.ArscUtil.getPackageChunk
-import dev.beefers.vendetta.manager.installer.utils.ArscUtil.getResourceFileName
-import dev.beefers.vendetta.manager.installer.utils.AxmlUtil
+import dev.beefers.vendetta.manager.installer.util.ArscUtil
+import dev.beefers.vendetta.manager.installer.util.ArscUtil.addColorResource
+import dev.beefers.vendetta.manager.installer.util.ArscUtil.getMainArscChunk
+import dev.beefers.vendetta.manager.installer.util.ArscUtil.getPackageChunk
+import dev.beefers.vendetta.manager.installer.util.ArscUtil.getResourceFileName
+import dev.beefers.vendetta.manager.installer.util.AxmlUtil
 import dev.beefers.vendetta.manager.utils.DiscordVersion
-import dev.beefers.vendetta.manager.utils.getResBytes
 import org.koin.core.component.inject
 
 /**

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/installer/util/ArscUtil.kt b/app/src/main/java/dev/beefers/vendetta/manager/installer/util/ArscUtil.kt
@@ -1,5 +1,5 @@
 // https://github.com/Aliucord/Manager/blob/main/app/src/main/kotlin/com/aliucord/manager/installer/util/ArscUtil.kt
-package dev.beefers.vendetta.manager.installer.utils
+package dev.beefers.vendetta.manager.installer.util
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/installer/util/AxmlUtil.kt b/app/src/main/java/dev/beefers/vendetta/manager/installer/util/AxmlUtil.kt
@@ -1,5 +1,5 @@
 // https://github.com/Aliucord/Manager/blob/main/app/src/main/kotlin/com/aliucord/manager/installer/util/AxmlUtil.kt
-package dev.beefers.vendetta.manager.installer.utils
+package dev.beefers.vendetta.manager.installer.util
 
 import dev.beefers.vendetta.manager.utils.find
 import com.github.diamondminer88.zip.ZipReader

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/installer/util/ManifestPatcher.kt b/app/src/main/java/dev/beefers/vendetta/manager/installer/util/ManifestPatcher.kt
@@ -1,7 +1,6 @@
 package dev.beefers.vendetta.manager.installer.util
 
 import android.Manifest
-import android.os.Build
 import pxb.android.axml.AxmlReader
 import pxb.android.axml.AxmlVisitor
 import pxb.android.axml.AxmlWriter

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/activity/MainActivity.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/activity/MainActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.core.app.ActivityCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/components/RadioController.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/components/RadioController.kt
@@ -14,7 +14,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 
 @Composable
 inline fun <reified E : Enum<E>> EnumRadioController(

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/components/SegmentedButton.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/components/SegmentedButton.kt
@@ -1,6 +1,5 @@
 package dev.beefers.vendetta.manager.ui.components
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.clickable
@@ -19,7 +18,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun RowScope.SegmentedButton(
     icon: Any,

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/components/ThinDivider.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/components/ThinDivider.kt
@@ -1,12 +1,12 @@
 package dev.beefers.vendetta.manager.ui.components
 
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun ThinDivider() = Divider(
-    color = MaterialTheme.colorScheme.onSurface.copy(0.1f),
+fun ThinDivider() = HorizontalDivider(
     thickness = 0.5.dp,
+    color = MaterialTheme.colorScheme.onSurface.copy(0.1f)
 )
diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/components/settings/SettingsItemChoice.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/components/settings/SettingsItemChoice.kt
@@ -21,7 +21,7 @@ inline fun <reified E : Enum<E>> SettingsItemChoice(
 ) {
     val ctx = LocalContext.current
     val choiceLabel = labelFactory(pref)
-    var opened = remember {
+    val opened = remember {
         mutableStateOf(false)
     }
 

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/screen/about/AboutScreen.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/screen/about/AboutScreen.kt
@@ -14,10 +14,10 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material3.Divider
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalContentColor
@@ -30,7 +30,6 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -56,15 +55,15 @@ import dev.beefers.vendetta.manager.utils.Constants
 import dev.beefers.vendetta.manager.utils.DimenUtils
 import dev.beefers.vendetta.manager.utils.getBitmap
 import dev.beefers.vendetta.manager.utils.showToast
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 class AboutScreen : Screen {
 
     @Composable
     @OptIn(ExperimentalMaterial3Api::class)
     override fun Content() {
         val uriHandler = LocalUriHandler.current
-        val prefs: PreferenceManager = get()
+        val prefs: PreferenceManager = koinInject()
         val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
         val ctx = LocalContext.current
         val bitmap = remember {
@@ -134,7 +133,7 @@ class AboutScreen : Screen {
                         LinkItem(
                             icon = R.drawable.ic_github,
                             label = R.string.label_github,
-                            link = "https://github.com/pyoncord"
+                            link = "https://github.com/bunny-mod"
                         )
 
                         LinkItem(
@@ -177,10 +176,10 @@ class AboutScreen : Screen {
                                 }
                             )
                             if (i != Constants.TEAM_MEMBERS.lastIndex) {
-                                Divider(
+                                HorizontalDivider(
+                                    modifier = Modifier.padding(horizontal = 16.dp),
                                     thickness = 0.5.dp,
-                                    color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
-                                    modifier = Modifier.padding(horizontal = 16.dp)
+                                    color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
                                 )
                             }
                         }
@@ -205,10 +204,10 @@ class AboutScreen : Screen {
                                 uriHandler.openUri("https://github.com/rushiiMachine")
                             }
                         )
-                        Divider(
+                        HorizontalDivider(
+                            modifier = Modifier.padding(horizontal = 16.dp),
                             thickness = 0.5.dp,
-                            color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
-                            modifier = Modifier.padding(horizontal = 16.dp)
+                            color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
                         )
                         ListItem(
                             text = "Xinto",
@@ -231,11 +230,11 @@ class AboutScreen : Screen {
                         //     text = stringResource(R.string.label_translate),
                         //     onClick = { uriHandler.openUri("https://crowdin.com/project/vendetta-manager") }
                         // )
-                        Divider(
-                            thickness = 0.5.dp,
-                            color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
-                            modifier = Modifier.padding(horizontal = 16.dp)
-                        )
+                        // HorizontalDivider(
+                        //     modifier = Modifier.padding(horizontal = 16.dp),
+                        //     thickness = 0.5.dp,
+                        //     color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f)
+                        // )
                         ListItem(
                             text = stringResource(R.string.title_os_libraries),
                             onClick = { navigator.push(LibrariesScreen()) }
@@ -259,7 +258,7 @@ class AboutScreen : Screen {
             navigationIcon = {
                 IconButton(onClick = { navigator.pop() }) {
                     Icon(
-                        imageVector = Icons.Filled.ArrowBack,
+                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                         contentDescription = stringResource(R.string.action_back)
                     )
                 }

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/screen/home/HomeScreen.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/screen/home/HomeScreen.kt
@@ -1,7 +1,6 @@
 package dev.beefers.vendetta.manager.ui.screen.home
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -12,9 +11,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.OpenInNew
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material3.Button
@@ -37,7 +36,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.collectAsLazyPagingItems
 import cafe.adriel.voyager.core.screen.Screen
-import cafe.adriel.voyager.koin.getScreenModel
+import cafe.adriel.voyager.koin.koinScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import dev.beefers.vendetta.manager.BuildConfig
@@ -54,19 +53,18 @@ import dev.beefers.vendetta.manager.ui.widgets.updater.UpdateDialog
 import dev.beefers.vendetta.manager.utils.Constants
 import dev.beefers.vendetta.manager.utils.DiscordVersion
 import dev.beefers.vendetta.manager.utils.navigate
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 class HomeScreen : Screen {
 
-    @OptIn(ExperimentalFoundationApi::class)
     @Composable
     override fun Content() {
         val navigator = LocalNavigator.currentOrThrow
-        val prefs: PreferenceManager = get()
-        val viewModel: HomeViewModel = getScreenModel()
+        val prefs: PreferenceManager = koinInject()
+        val viewModel: HomeViewModel = koinScreenModel()
 
         val currentVersion = remember {
-            DiscordVersion.fromVersionCode(viewModel.installManager.current?.versionCode.toString())
+            DiscordVersion.fromVersionCode(viewModel.installManager.current?.longVersionCode.toString())
         }
 
         val latestVersion =
@@ -180,7 +178,7 @@ class HomeScreen : Screen {
                         modifier = Modifier.clip(RoundedCornerShape(16.dp))
                     ) {
                         SegmentedButton(
-                            icon = Icons.Filled.OpenInNew,
+                            icon = Icons.AutoMirrored.Filled.OpenInNew,
                             text = stringResource(R.string.action_launch),
                             onClick = { viewModel.launchVendetta() }
                         )
@@ -220,7 +218,7 @@ class HomeScreen : Screen {
 
     @Composable
     private fun Actions() {
-        val viewModel: HomeViewModel = getScreenModel()
+        val viewModel: HomeViewModel = koinScreenModel()
         val navigator = LocalNavigator.currentOrThrow
 
         IconButton(onClick = { viewModel.getDiscordVersions() }) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     bin/
     gen/
     out/
+    .kotlin/
     #  Uncomment the following line in case you need and you don't have the release build type files in your app
     # release/
@@ Expand Down @@