diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 64448f2e..22b5235e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,7 +8,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index ef61796f..9422e848 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8ee10a0d..2499e612 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -37,14 +37,12 @@ android { extra.set("alwaysUpdateBuildId", false) } getByName("release") { -// isMinifyEnabled = true -// isShrinkResources = true + isMinifyEnabled = false applicationIdSuffix = ".beta" isCrunchPngs = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - signingConfig = signingConfigs.getByName("debug") } } @@ -92,7 +90,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") implementation("androidx.activity:activity-compose:1.4.0") - implementation("androidx.navigation:navigation-compose:2.5.0-alpha03") + implementation("androidx.navigation:navigation-compose:2.4.1") implementation(JetpackCompose.FOUNDATION) implementation(JetpackCompose.UI) @@ -116,12 +114,6 @@ dependencies { implementation("io.ktor:ktor-client-okhttp:1.6.8") implementation("io.ktor:ktor-client-serialization:1.6.8") - implementation("androidx.appcompat:appcompat:1.4.1") - implementation("androidx.activity:activity-ktx:1.4.0") - implementation("androidx.recyclerview:recyclerview:1.2.1") - implementation("androidx.biometric:biometric:1.1.0") - implementation("androidx.work:work-runtime-ktx:2.7.1") - implementation("androidx.room:room-runtime:2.4.2") annotationProcessor("androidx.room:room-compiler:2.4.2") kapt("androidx.room:room-compiler:2.4.2") @@ -132,8 +124,6 @@ dependencies { implementation("org.kodein.di:kodein-di-framework-compose:7.11.0") - implementation("com.google.android.material:material:1.5.0") - implementation(platform("com.google.firebase:firebase-bom:29.0.3")) implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-crashlytics-ktx") @@ -152,8 +142,6 @@ dependencies { implementation("xyz.quaver:documentfilex:0.7.2") implementation("xyz.quaver:subsampledimage:0.0.1-alpha19-SNAPSHOT") - implementation("com.google.guava:guava:31.1-jre") - implementation("org.kodein.log:kodein-log:0.12.0") // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.8.1") diff --git a/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt b/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt index 377aa472..ef48a993 100644 --- a/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt +++ b/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt @@ -24,22 +24,10 @@ import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.graphics.drawable.Drawable import androidx.compose.runtime.* -import androidx.compose.runtime.snapshots.SnapshotStateList -import androidx.compose.runtime.snapshots.SnapshotStateMap import androidx.compose.ui.platform.LocalContext import dalvik.system.PathClassLoader -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import org.kodein.di.DI -import org.kodein.di.bindFactory -import org.kodein.di.bindInstance -import org.kodein.di.bindProvider -import org.kodein.di.compose.rememberInstance -import xyz.quaver.pupil.Pupil import xyz.quaver.pupil.sources.core.Source -import java.util.concurrent.ConcurrentHashMap private const val SOURCES_FEATURE = "pupil.sources" private const val SOURCES_PACKAGE_PREFIX = "xyz.quaver.pupil.sources" diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index 98b87468..eb4791c0 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -31,6 +31,9 @@ import androidx.compose.material.MaterialTheme import androidx.compose.runtime.* import androidx.compose.ui.graphics.Color import androidx.core.view.WindowCompat +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 07d47381..563528a4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,14 +1,14 @@ - -