diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f07a75fd..8e22cb1d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -135,13 +135,15 @@ dependencies { implementation("ru.noties.markwon:core:3.1.0") - implementation("xyz.quaver.pupil.sources:core:0.0.1-alpha01-DEV09") + implementation("xyz.quaver.pupil.sources:core:0.0.1-alpha01-DEV10") implementation("xyz.quaver:documentfilex:0.7.1") implementation("xyz.quaver:subsampledimage:0.0.1-alpha18-SNAPSHOT") implementation("com.google.guava:guava:31.0.1-jre") + implementation("app.cash.zipline:zipline:1.0.0-SNAPSHOT") + implementation("org.kodein.log:kodein-log:0.11.1") debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7") diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt index 2bbaf621..4a048efa 100644 --- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt +++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt @@ -46,8 +46,8 @@ import org.kodein.di.* import org.kodein.di.android.x.androidXModule import xyz.quaver.io.FileX import xyz.quaver.pupil.proto.settingsDataStore +import xyz.quaver.pupil.sources.core.NetworkCache import xyz.quaver.pupil.sources.sourceModule -import xyz.quaver.pupil.sources.util.NetworkCache import xyz.quaver.pupil.util.* import java.util.* 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 957105a8..973bff16 100644 --- a/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt +++ b/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt @@ -19,16 +19,12 @@ package xyz.quaver.pupil.sources import android.app.Application -import android.content.Context import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.graphics.drawable.Drawable -import android.util.Log -import dalvik.system.DexClassLoader import dalvik.system.PathClassLoader import org.kodein.di.* -import org.kodein.di.bindings.NoArgBindingDI -import org.kodein.di.bindings.NoArgDIBinding +import xyz.quaver.pupil.sources.core.Source import java.util.* private const val SOURCES_FEATURE = "pupil.sources" diff --git a/app/src/main/java/xyz/quaver/pupil/sources/SourceSelectDialog.kt b/app/src/main/java/xyz/quaver/pupil/sources/SourceSelectDialog.kt index 434333eb..3d04c33c 100644 --- a/app/src/main/java/xyz/quaver/pupil/sources/SourceSelectDialog.kt +++ b/app/src/main/java/xyz/quaver/pupil/sources/SourceSelectDialog.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.window.Dialog import androidx.navigation.NavController import com.google.accompanist.drawablepainter.rememberDrawablePainter import org.kodein.di.compose.rememberInstance +import xyz.quaver.pupil.sources.core.Source @Composable fun SourceSelectDialog(navController: NavController, currentSource: String? = null, onDismissRequest: () -> Unit = { }) {