Jetpack Compose Migration

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/debug.yml

@@ -17,6 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+
       - name: set up JDK 1.8
         uses: actions/setup-java@v1
         with:

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Code Linter
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/cache@v2
+        with:
+          path: ~/work/_temp/_github_home/cache
+          key: ${{ runner.os }}-qodana-${{ github.ref }}
+          restore-keys: |
+            ${{ runner.os }}-qodana-${{ github.ref }}
+            ${{ runner.os }}-qodana-
+      - uses: docker://jetbrains/qodana-jvm-android
+        with:
+          args: --cache-dir=/github/home/cache --results-dir=/github/workspace/qodana --save-report --report-dir=/github/workspace/qodana/report
+      - uses: actions/upload-artifact@v2
+        with:
+          path: qodana

.gitignore

@@ -1,10 +1,4 @@
 .gradle/
 .idea/
 build/
-out/
-app/src/main/java/com/vanced/manager/core/base/DummyJava.java
-app/build/
-app/release
 local.properties
-/.github/
-*.iml

README.md

@@ -1,9 +1,7 @@
 # Vanced Manager
-<div>
-
 [![Github All Releases](https://img.shields.io/github/downloads/YTVanced/VancedManager/total.svg?style=for-the-badge)](https://github.com/YTVanced/VancedManager/releases/latest) [![Github All Releases](https://img.shields.io/github/release/YTVanced/VancedManager.svg?style=for-the-badge)](https://github.com/YTVanced/VancedManager/releases/latest)
 
-</div>
+# **Now discontinued https://twitter.com/YTVanced/status/1503052250268286980**
 
 Hi, when we released Vanced 15.05.54, people were upset because it used the .apks format, which was way harder to install than a traditional .apk file. Even though we wrote clear instructions on how to install the new Vanced build, people still couldn't figure it out.  
 Then we thought, "why don't we make a manager for vanced, which will download, update and uninstall Vanced and MicroG, have an easy and understandable UI and be less than 10mb?" and that's how Vanced Manager was born.  
@@ -15,11 +13,7 @@ After 3 months of development, we are finally ready to introduce Vanced Manager
 ## Contributions
 Pull requests should be made to the Dev branch as that is the working branch, master is for release code.
 
-For anyone who wants to provide translations please submit them to https://crowdin.com/project/vanced-manager as we also use it for YouTube Vanced. Any issues with translations should be posted there too.
-
-## TODO
-- [ ] Clean up the ViewModel and DataModel code
-- [ ] Migrate to Jetpack Compose when it's officially released
+For anyone who wants to provide translations please submit them to https://crowdin.com/project/vanced-manager as we also use it for Vanced. Any issues with translations should be posted there too.
 
 ## Building 
 
@@ -42,8 +36,3 @@ Clone the repo, open it in Android Studio and build the app.
 chmod +x gradlew
 ./gradlew assembleDebug
 ```
-
-## Vanced FAQ
-Vanced FAQ (from the faq branch) now available on the playstore!
-
-<a href='https://play.google.com/store/apps/details?id=com.vanced.faq&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="85" src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png'/></a>

app/.gitignore

@@ -0,0 +1,2 @@
+/build
+/release

app/build.gradle.kts

@@ -1,39 +1,35 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("kapt")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
-    id("com.google.firebase.firebase-perf")
-    id("androidx.navigation.safeargs.kotlin")
-    id("kotlin-android")
+    id("kotlin-parcelize")
+    kotlin("plugin.serialization")
 }
 
+val composeVersion = "1.1.1"
+
 android {
-    compileSdkVersion(30)
+    compileSdk = 31
 
     defaultConfig {
+        minSdk = 21
+        targetSdk = 31
+
         applicationId = "com.vanced.manager"
-        minSdkVersion(21)
-        targetSdkVersion(30)
-        versionCode = 260
-        versionName = "2.6.0 (Crimson)"
+
+        versionCode = 3000
+        versionName = "3.0.0 (Re@Composed)"
 
         vectorDrawables.useSupportLibrary = true
 
         buildConfigField("String[]", "MANAGER_LANGUAGES", "{$languages}")
-        buildConfigField("Boolean", "ENABLE_CROWDIN_AUTH", "false")
-        buildConfigField("String", "CROWDIN_HASH", "\"${System.getenv("CROWDIN_HASH")}\"")
-        buildConfigField("String", "CROWDIN_CLIENT_ID", "\"${System.getenv("CROWDIN_CLIENT_ID")}\"")
-        buildConfigField("String", "CROWDIN_CLIENT_SECRET", "\"${System.getenv("CROWDIN_CLIENT_SECRET")}\"")
     }
 
-    lintOptions {
-        disable("MissingTranslation", "ExtraTranslation")
-    }
-
-    applicationVariants.all {
-        resValue("string", "versionName", versionName)
+    lint {
+        disable += "MissingTranslation"
+        disable += "ExtraTranslation"
     }
 
     buildTypes {
@@ -44,39 +40,49 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
-        //compose = true
+        compose = true
     }
 
     packagingOptions {
-        exclude("META-INF/DEPENDENCIES")
-        exclude("META-INF/*.kotlin_module")
+        resources.excludes.add("META-INF/DEPENDENCIES")
+        resources.excludes.add("META-INF/*.kotlin_module")
     }
 
-// To inline the bytecode built with JVM target 1.8 into
-// bytecode that is being built with JVM target 1.6. (e.g. navArgs)
-
+    // To inline the bytecode built with JVM target 1.8 into
+    // bytecode that is being built with JVM target 1.6. (e.g. navArgs)
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
-            //useIR = true
-        }
+    composeOptions {
+        kotlinCompilerExtensionVersion = composeVersion
     }
 
 }
 
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+        optIn("androidx.compose.material3.ExperimentalMaterial3Api")
+        optIn("androidx.compose.animation.ExperimentalAnimationApi")
+        optIn("androidx.compose.foundation.ExperimentalFoundationApi")
+    }
+}
+
+fun KotlinJvmOptions.optIn(library: String) {
+    freeCompilerArgs = freeCompilerArgs +
+            "-opt-in=$library"
+}
+
 val languages: String get() {
     val langs = arrayListOf("en", "bn_BD", "bn_IN", "pa_IN", "pa_PK", "pt_BR", "pt_PT", "zh_CN", "zh_TW")
     val exceptions = arrayOf("bn", "pa", "pt", "zh")
 
     File("$projectDir/src/main/res").listFiles()?.filter {
         val name = it.name
-        name.startsWith("values-") && !name.contains("v23")
+        name.startsWith("values") && !name.contains("v23") && !name.contains("night")
     }?.forEach { dir ->
         val dirname = dir.name.substringAfter("-").substringBefore("-")
         if (!exceptions.contains(dirname)) {
@@ -87,69 +93,64 @@ val languages: String get() {
 }
 
 dependencies {
-
-    //val composeVersion = "1.0.0-alpha12"
-    implementation(project(":core-presentation"))
-    implementation(project(":core-ui"))
-
-    implementation(project(":library-network"))
-
-    // Kotlin
-    implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
 
     // AndroidX
-    implementation("androidx.appcompat:appcompat:1.2.0")
-    implementation("androidx.browser:browser:1.3.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
-    implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.fragment:fragment-ktx:1.3.3")
-    implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
-    implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.0.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
-    implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
-    implementation("androidx.preference:preference-ktx:1.1.1")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("androidx.browser:browser:1.4.0")
+    implementation("androidx.preference:preference-ktx:1.2.0")
+    implementation("androidx.activity:activity-compose:1.4.0")
 
+    val lifecycleVersion = "2.4.1"
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 
     // Compose
-//    implementation("androidx.compose.ui:ui:$composeVersion")
-//    implementation("androidx.compose.ui:ui-tooling:$composeVersion")
-//    implementation("androidx.compose.foundation:foundation:$composeVersion")
-//    implementation("androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha02")
-//    implementation("androidx.compose.material:material:$composeVersion")
-//    implementation("androidx.compose.material:material-icons-core:$composeVersion")
-//    implementation("androidx.compose.material:material-icons-extended:$composeVersion")
-//    implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
-
-    // Appearance
-    implementation("com.github.madrapps:pikolo:2.0.1")
-    implementation("com.google.android.material:material:1.3.0")
-
-    // JSON parser
-    implementation("com.beust:klaxon:5.5")
-
-    // Crowdin
-    implementation("com.github.crowdin.mobile-sdk-android:sdk:1.4.0")
-
-    // HTTP networking
-    implementation("com.github.kittinunf.fuel:fuel:2.3.1")
-    implementation("com.github.kittinunf.fuel:fuel-coroutines:2.3.1")
-    implementation("com.github.kittinunf.fuel:fuel-json:2.3.1")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-
-    // Root permissions
-    implementation("com.github.topjohnwu.libsu:core:3.1.2")
-    implementation("com.github.topjohnwu.libsu:io:3.1.2")
-
-    // Layout
-    implementation("com.google.android:flexbox:2.0.1")
-
-    // Firebase
-    implementation("com.google.firebase:firebase-analytics-ktx:18.0.3")
-    implementation("com.google.firebase:firebase-crashlytics:17.4.1")
-    implementation("com.google.firebase:firebase-messaging:21.1.0")
-    implementation("com.google.firebase:firebase-perf:19.1.1")
+    implementation("androidx.compose.compiler:compiler:$composeVersion")
+    implementation("androidx.compose.foundation:foundation:$composeVersion")
+    implementation("androidx.compose.material:material-icons-core:$composeVersion")
+    implementation("androidx.compose.material:material-icons-extended:$composeVersion")
+    implementation("androidx.compose.material:material:$composeVersion")
+    implementation("androidx.compose.material3:material3:1.0.0-alpha06")
+    implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
+    implementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    implementation("androidx.compose.ui:ui-util:$composeVersion")
+    implementation("androidx.compose.ui:ui:$composeVersion")
+
+    // Google
+    implementation("com.google.android.material:material:1.5.0")
+
+    val accompanistVersion = "0.22.1-rc"
+    implementation("com.google.accompanist:accompanist-navigation-animation:$accompanistVersion")
+    implementation("com.google.accompanist:accompanist-placeholder-material:$accompanistVersion")
+    implementation("com.google.accompanist:accompanist-swiperefresh:$accompanistVersion")
+    implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
+
+    // Other
+    implementation("com.github.zsoltk:compose-router:0.28.0")
+
+    implementation("io.coil-kt:coil-compose:1.4.0")
+
+    implementation("com.github.skydoves:orchestra-colorpicker:1.1.0")
+
+    val libsuVersion = "3.2.1"
+    implementation("com.github.topjohnwu.libsu:core:$libsuVersion")
+    implementation("com.github.topjohnwu.libsu:io:$libsuVersion")
+    implementation("com.github.topjohnwu.libsu:busybox:$libsuVersion")
+
+    val koinVersion = "3.1.3"
+    implementation("io.insert-koin:koin-android:$koinVersion")
+    implementation("io.insert-koin:koin-androidx-compose:$koinVersion")
+
+    val retrofitVersion = "2.9.0"
+    implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
+    implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
+
+    implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
+
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
 }

app/proguard-rules.pro

@@ -12,8 +12,13 @@
 #   public *;
 #}
 
--keep class com.vanced.manager.core.App
--keep class com.crowdin.platform.* { *; }
+-keep class com.vanced.manager.network.dto.GithubReleaseDto {
+     *;
+}
+
+-keep class com.vanced.manager.network.dto.GithubReleaseAssetDto {
+     *;
+}
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.