PDF MVI 리팩토링

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
         android:minSdkVersion="30" />
 
     <application
+        android:name=".SeeDocs"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/kr/co/seedocs/SeeDocs.kt

@@ -1,17 +1,31 @@
 package kr.co.seedocs
 
 import android.app.Application
-import dagger.hilt.android.HiltAndroidApp
+import kr.co.main.di.mainModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 import timber.log.Timber
 
-@HiltAndroidApp
-class SeeDocs: Application() {
+private val allModules =
+    listOf(
+        mainModule,
+    )
+
+class SeeDocs : Application() {
 
     override fun onCreate() {
         super.onCreate()
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
+
+        startKoin {
+            androidContext(this@SeeDocs)
+            androidLogger(if (BuildConfig.DEBUG) Level.DEBUG else Level.NONE)
+            modules(allModules)
+        }
     }
 }

build-logic/convention/build.gradle.kts

@@ -54,9 +54,5 @@ gradlePlugin {
             id = "seedocs.feature"
             implementationClass = "SeeDocsFeatureConventionPlugin"
         }
-        register("SeeDocsHilt") {
-            id = "seedocs.hilt"
-            implementationClass = "SeeDocsHiltConventionPlugin"
-        }
     }
 }

build-logic/convention/src/main/java/SeeDocsFeatureConventionPlugin.kt

@@ -1,4 +1,5 @@
 import kr.co.convention.implementations
+import kr.co.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -9,7 +10,6 @@ class SeeDocsFeatureConventionPlugin : Plugin<Project> {
         with(target) {
             pluginManager.apply {
                 apply("seedocs.library")
-                apply("seedocs.hilt")
             }
 
             dependencies {
@@ -19,6 +19,7 @@ class SeeDocsFeatureConventionPlugin : Plugin<Project> {
                     project(":core:data"),
                     project(":core:navigation"),
                     project(":core:model"),
+                    libs.koin.compose
                 )
             }
         }

build-logic/convention/src/main/java/SeeDocsLibraryConventionPlugin.kt

@@ -18,6 +18,7 @@ class SeeDocsLibraryConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.library")
                 apply("org.jetbrains.kotlin.android")
+                apply("com.google.devtools.ksp")
             }
 
             extensions.configure<LibraryExtension> {
@@ -31,7 +32,8 @@ class SeeDocsLibraryConventionPlugin : Plugin<Project> {
 
             dependencies {
                 implementations(
-                    libs.timber
+                    libs.timber,
+                    libs.koin.core
                 )
                 testImplementations(
                     kotlin("test")

build-logic/convention/src/main/java/kr/co/convention/ProjectExtensions.kt

@@ -9,6 +9,9 @@ import org.gradle.kotlin.dsl.the
 internal val Project.libs get() = the<LibrariesForLibs>()
 
 fun Project.App() {
+    project.pluginManager.apply {
+        apply("com.google.devtools.ksp")
+    }
     project.dependencies {
         implementations(
             libs.androidx.core.splashscreen,
@@ -22,7 +25,7 @@ fun Project.App() {
             libs.compose.activity,
             libs.compose.lifecycle.runtime,
             libs.compose.navigation,
-            libs.compose.hilt.navigation,
+            libs.koin.compose,
         )
 
         testImplementations(

build.gradle.kts

@@ -8,7 +8,6 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.gms) apply false
-    alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.room) apply false
 }

core/data/build.gradle.kts

@@ -2,7 +2,6 @@ import kr.co.convention.setNamespace
 
 plugins {
     alias(libs.plugins.seedocs.library)
-    alias(libs.plugins.seedocs.hilt)
 }
 
 android {

core/database/build.gradle.kts

@@ -3,7 +3,6 @@ import kr.co.convention.setNamespace
 
 plugins {
     alias(libs.plugins.seedocs.library)
-    alias(libs.plugins.seedocs.hilt)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.room)
 }

feature/main/src/main/java/kr/co/main/di/MainModule.kt

@@ -0,0 +1,11 @@
+package kr.co.main.di
+
+import kr.co.di.pdfModule
+import org.koin.dsl.module
+
+val mainModule =
+    module {
+        includes(
+            pdfModule,
+        )
+    }

feature/main/src/main/java/kr/co/main/navigation/MainNavHost.kt

@@ -33,8 +33,6 @@ internal fun MainNavHost(
             padding = padding
         )
 
-        pdfNavGraph(
-            popBackStack = navigator::popBackStack
-        )
+        pdfNavGraph()
     }
 }

feature/pdf/src/main/java/kr/co/di/PdfModule.kt

@@ -0,0 +1,10 @@
+package kr.co.di
+
+import kr.co.pdf.PdfViewModel
+import org.koin.core.module.dsl.viewModel
+import org.koin.dsl.module
+
+val pdfModule =
+    module {
+        viewModel { PdfViewModel() }
+    }

feature/pdf/src/main/java/kr/co/navigation/PdfNavGraph.kt

@@ -6,12 +6,10 @@ import androidx.navigation.toRoute
 import kr.co.pdf.PdfRoute
 
 fun NavGraphBuilder.pdfNavGraph(
-    popBackStack: () -> Unit = {}
 ) {
     composable<Route.Pdf> {
         PdfRoute(
             path = it.toRoute<Route.Pdf>().path,
-            popBackStack = popBackStack
         )
     }
 }

feature/pdf/src/main/java/kr/co/pdf/PdfScreen.kt

@@ -28,6 +28,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -43,65 +44,59 @@ import androidx.compose.ui.unit.dp
 import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.launch
+import kr.co.pdf.model.UiIntent
+import kr.co.pdf.model.UiState
 import kr.co.ui.theme.SeeDocsTheme
 import kr.co.ui.theme.Theme
-import kr.co.ui.util.rememberTopBarState
 import kr.co.ui.widget.SimpleTextField
 import kr.co.ui.widget.TextFieldInputType
-import kr.co.util.PdfToBitmap
-import kr.co.util.rememberPdfState
 import net.engawapg.lib.zoomable.rememberZoomState
 import net.engawapg.lib.zoomable.zoomable
+import org.koin.androidx.compose.koinViewModel
 import java.io.File
 
 @Composable
 internal fun PdfRoute(
     path: String,
-    popBackStack: () -> Unit = {},
+    viewModel: PdfViewModel = koinViewModel(),
 ) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
     val uri = remember { Uri.fromFile(File(path)) }
 
     val context = LocalContext.current
 
     val scope = rememberCoroutineScope()
 
-    val renderer = remember(uri) {
+    LaunchedEffect(path) {
         context.contentResolver.openFileDescriptor(
             uri,
             "r"
-        )?.let { PdfRenderer(it) }
+        )?.let { viewModel.handleIntent(UiIntent.Init(PdfRenderer(it))) }
     }
 
-    val tabBarState = rememberTopBarState()
-
     val listState = rememberLazyListState()
 
-    renderer?.let {
-        PdfScreen(
-            renderer = it,
-            listState = listState,
-            isTopBarVisible = tabBarState.topBarVisible,
-            onPdfBodyPressed = tabBarState::show,
-            onPageIndexChange = { page ->
-                scope.launch {
-                    listState.scrollToItem(page - 1)
-                }
-            },
-        )
-    }
+    PdfScreen(
+        uiState = uiState,
+        listState = listState,
+        handleIntent = viewModel::handleIntent,
+        onPageIndexChange = { page ->
+            scope.launch {
+                listState.scrollToItem(page - 1)
+            }
+        },
+    )
+
 }
 
 @Composable
 private fun PdfScreen(
-    renderer: PdfRenderer,
+    uiState: UiState = UiState(),
     listState: LazyListState = rememberLazyListState(),
-    pdfState: PdfToBitmap = rememberPdfState(renderer),
-    isTopBarVisible: Boolean = false,
-    onPdfBodyPressed: () -> Unit,
+    handleIntent: (UiIntent) -> Unit = {},
     onPageIndexChange: (Int) -> Unit = {},
 ) {
-    val bitmaps = pdfState.bitmap.collectAsStateWithLifecycle()
-
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -114,29 +109,29 @@ private fun PdfScreen(
                 .pointerInput(null) {
                     detectTapGestures(
                         onTap = {
-                            onPdfBodyPressed()
+                            handleIntent(UiIntent.ShowTopBar)
                         },
                         onPress = {
-                            onPdfBodyPressed()
+                            handleIntent(UiIntent.ShowTopBar)
                         }
                     )
                 },
             state = listState,
             verticalArrangement = Arrangement.spacedBy(4.dp)
         ) {
-            items(renderer.pageCount) { page ->
+            items(uiState.totalPage) { page ->
                 LaunchedEffect(page) {
-                    pdfState.renderPage(page)
+                    handleIntent(UiIntent.RenderPage(page))
                 }
 
                 PdfImage(
-                    bitmap = bitmaps.value[page],
+                    bitmap = uiState.bitmaps[page],
                 )
             }
         }
 
         AnimatedVisibility(
-            visible = isTopBarVisible,
+            visible = uiState.topBarState.topBarVisible,
             enter = slideIn {
                 IntOffset(0, -it.height)
             },
@@ -146,8 +141,11 @@ private fun PdfScreen(
         ) {
             PdfTopBar(
                 currentPage = listState.firstVisibleItemIndex + 1,
-                totalPage = renderer.pageCount,
-                onPageIndexChange = onPageIndexChange
+                totalPage = uiState.totalPage,
+                onPageIndexChange = {
+                    handleIntent(UiIntent.ChangePage(it))
+                    onPageIndexChange(it)
+                }
             )
         }
     }