[build errors] Correct package name for classes from arklib due to re…

…cent package name refactoring
ARK-Builders · Oct 15, 2023 · 68c8239 · 68c8239
1 parent 4d49ed4
commit 68c8239
Show file tree

Hide file tree

Showing 33 changed files with 117 additions and 114 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -88,11 +88,11 @@ android {
 dependencies {
     //For local developments of arklib-android:
     //def arklibVersion = '999'
-    def arklibVersion = '0.3.2'
+    def arklibVersion = '0.3.3'
 
     releaseImplementation "dev.arkbuilders:arklib:$arklibVersion"
     debugImplementation "dev.arkbuilders:arklib-debug:$arklibVersion"
-    implementation("dev.arkbuilders:components:0.0.3") {
+    implementation("dev.arkbuilders:components:0.0.6") {
         exclude group: "dev.arkbuilders", module: "arklib"
     }
 
@@ -121,6 +121,8 @@ dependencies {
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
     implementation 'com.github.MikeOrtiz:TouchImageView:3.1.1'
 
+    implementation 'dev.arkbuilders:arkfilepicker:0.1.1'
+
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
 
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-rc01"

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/StorageBackup.kt b/app/src/main/java/dev/arkbuilders/navigator/data/StorageBackup.kt
@@ -1,9 +1,9 @@
 package dev.arkbuilders.navigator.data
 
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
 import dev.arkbuilders.arklib.ArkFiles
 import dev.arkbuilders.arklib.arkFolder
 import dev.arkbuilders.navigator.data.preferences.PreferenceKey
@@ -22,6 +22,7 @@ import kotlin.io.path.exists
 import kotlin.io.path.inputStream
 import kotlin.io.path.isRegularFile
 import kotlin.io.path.listDirectoryEntries
+import kotlin.io.path.name
 import kotlin.io.path.notExists
 import kotlin.io.path.outputStream
 
@@ -33,8 +34,8 @@ class StorageBackup @Inject constructor(
     private val today: String = keepDates[0]
 
     private val foldersToIgnore = listOf(
-        ArkFiles.PREVIEWS_FOLDER,
-        ArkFiles.THUMBNAILS_FOLDER
+        ArkFiles.PREVIEWS_STORAGE_FOLDER.name,
+        ArkFiles.THUMBNAILS_STORAGE_FOLDER.name
     )
     private val filesToIgnore = listOf<String>()
 

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/AggregatedStatsStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/AggregatedStatsStorage.kt
@@ -4,8 +4,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.Tag
 
 class AggregatedStatsStorage(val shards: List<StatsStorage>) : StatsStorage {
 

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/PlainStatsStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/PlainStatsStorage.kt
@@ -10,9 +10,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import dev.arkbuilders.arklib.arkFolder
 import dev.arkbuilders.arklib.arkStats
-import dev.arkbuilders.arklib.domain.index.RootIndex
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.RootTagsStorage
+import dev.arkbuilders.arklib.data.index.RootIndex
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.RootTagsStorage
 import dev.arkbuilders.navigator.data.preferences.PreferenceKey
 import dev.arkbuilders.navigator.data.preferences.Preferences
 import dev.arkbuilders.navigator.data.stats.category.StatsCategoryStorage

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/StatsStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/StatsStorage.kt
@@ -1,7 +1,7 @@
 package dev.arkbuilders.navigator.data.stats
 
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.Tag
 
 interface StatsStorage {
     suspend fun init()

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/StatsStorageRepo.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/StatsStorageRepo.kt
@@ -1,11 +1,11 @@
 package dev.arkbuilders.navigator.data.stats
 
 import kotlinx.coroutines.flow.SharedFlow
-import dev.arkbuilders.arklib.domain.index.ResourceIndex
-import dev.arkbuilders.arklib.domain.index.RootIndex
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.RootTagsStorage
-import dev.arkbuilders.arklib.domain.tags.TagsStorageRepo
+import dev.arkbuilders.arklib.data.index.ResourceIndex
+import dev.arkbuilders.arklib.data.index.RootIndex
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.RootTagsStorage
+import dev.arkbuilders.arklib.user.tags.TagsStorageRepo
 import dev.arkbuilders.navigator.data.preferences.Preferences
 import java.nio.file.Path
 

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/StatsCategoryStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/StatsCategoryStorage.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import dev.arkbuilders.arklib.arkFolder
 import dev.arkbuilders.arklib.arkStats
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
+import dev.arkbuilders.arklib.data.stats.StatsEvent
 import timber.log.Timber
 import java.nio.file.Path
 

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagLabeledNStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagLabeledNStorage.kt
@@ -5,10 +5,10 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import dev.arkbuilders.arklib.domain.index.ResourceIndex
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.TagStorage
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.data.index.ResourceIndex
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.TagStorage
+import dev.arkbuilders.arklib.user.tags.Tag
 import timber.log.Timber
 import java.nio.file.Path
 import kotlin.io.path.exists

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagLabeledTSStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagLabeledTSStorage.kt
@@ -5,8 +5,8 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.Tag
 import timber.log.Timber
 import java.nio.file.Path
 import kotlin.io.path.inputStream

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagQueriedNStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagQueriedNStorage.kt
@@ -8,8 +8,8 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.Tag
 import timber.log.Timber
 import java.nio.file.Path
 import kotlin.io.path.inputStream

diff --git a/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagQueriedTSStorage.kt b/app/src/main/java/dev/arkbuilders/navigator/data/stats/category/TagQueriedTSStorage.kt
@@ -5,8 +5,8 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.Tag
 import timber.log.Timber
 import java.nio.file.Path
 import kotlin.io.path.inputStream

diff --git a/app/src/main/java/dev/arkbuilders/navigator/di/modules/RepoModule.kt b/app/src/main/java/dev/arkbuilders/navigator/di/modules/RepoModule.kt
@@ -7,13 +7,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
-import dev.arkbuilders.arklib.domain.Message
-import dev.arkbuilders.arklib.domain.index.ResourceIndexRepo
-import dev.arkbuilders.arklib.domain.meta.MetadataProcessorRepo
-import dev.arkbuilders.arklib.domain.preview.PreviewProcessorRepo
-import dev.arkbuilders.arklib.domain.score.ScoreStorageRepo
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.TagsStorageRepo
+import dev.arkbuilders.arklib.data.Message
+import dev.arkbuilders.arklib.data.index.ResourceIndexRepo
+import dev.arkbuilders.arklib.data.meta.MetadataProcessorRepo
+import dev.arkbuilders.arklib.data.preview.PreviewProcessorRepo
+import dev.arkbuilders.arklib.user.score.ScoreStorageRepo
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.TagsStorageRepo
 import dev.arkbuilders.navigator.data.preferences.Preferences
 import dev.arkbuilders.navigator.data.stats.StatsStorageRepo
 import dev.arkbuilders.navigator.data.utils.LogTags.MAIN

diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/DetailsAlertDialog.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/DetailsAlertDialog.kt
@@ -10,8 +10,8 @@ import android.view.WindowManager
 import org.apache.commons.io.FileUtils
 import dev.arkbuilders.navigator.R
 import dev.arkbuilders.navigator.databinding.DialogResourceInfoBinding
-import dev.arkbuilders.arklib.domain.index.Resource
-import dev.arkbuilders.arklib.domain.meta.Metadata
+import dev.arkbuilders.arklib.data.index.Resource
+import dev.arkbuilders.arklib.data.meta.Metadata
 import dev.arkbuilders.navigator.presentation.utils.extra.ExtraLoader
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString

diff --git a/...ain/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt b/...ain/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt
@@ -21,15 +21,15 @@ import moxy.MvpAppCompatDialogFragment
 import moxy.ktx.moxyPresenter
 import dev.arkbuilders.arkfilepicker.folders.RootAndFav
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.index.ResourceIndex
-import dev.arkbuilders.arklib.domain.tags.TagStorage
+import dev.arkbuilders.arklib.data.index.ResourceIndex
+import dev.arkbuilders.arklib.user.tags.TagStorage
 import dev.arkbuilders.navigator.R
 import dev.arkbuilders.navigator.databinding.DialogEditTagsBinding
 import dev.arkbuilders.navigator.data.stats.StatsStorage
 import dev.arkbuilders.navigator.presentation.App
 import dev.arkbuilders.navigator.presentation.dialog.tagssort.TagsSortDialogFragment
-import dev.arkbuilders.arklib.domain.tags.Tag
-import dev.arkbuilders.arklib.domain.tags.Tags
+import dev.arkbuilders.arklib.user.tags.Tag
+import dev.arkbuilders.arklib.user.tags.Tags
 import dev.arkbuilders.navigator.presentation.utils.placeCursorToEnd
 import dev.arkbuilders.navigator.presentation.utils.showKeyboard
 

diff --git a/...in/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogPresenter.kt b/...in/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogPresenter.kt
@@ -16,13 +16,13 @@ import moxy.MvpPresenter
 import moxy.presenterScope
 import dev.arkbuilders.arkfilepicker.folders.RootAndFav
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.index.ResourceIndex
-import dev.arkbuilders.arklib.domain.index.ResourceIndexRepo
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.tags.Tag
-import dev.arkbuilders.arklib.domain.tags.TagStorage
-import dev.arkbuilders.arklib.domain.tags.TagUtils
-import dev.arkbuilders.arklib.domain.tags.TagsStorageRepo
+import dev.arkbuilders.arklib.data.index.ResourceIndex
+import dev.arkbuilders.arklib.data.index.ResourceIndexRepo
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.user.tags.Tag
+import dev.arkbuilders.arklib.user.tags.TagStorage
+import dev.arkbuilders.arklib.user.tags.TagUtils
+import dev.arkbuilders.arklib.user.tags.TagsStorageRepo
 import javax.inject.Inject
 
 sealed class EditTagsAction {

diff --git a/...rc/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogView.kt b/...rc/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogView.kt
@@ -4,8 +4,8 @@ import moxy.MvpView
 import moxy.viewstate.strategy.AddToEndSingleStrategy
 import moxy.viewstate.strategy.SkipStrategy
 import moxy.viewstate.strategy.StateStrategyType
-import dev.arkbuilders.arklib.domain.tags.Tag
-import dev.arkbuilders.arklib.domain.tags.Tags
+import dev.arkbuilders.arklib.user.tags.Tag
+import dev.arkbuilders.arklib.user.tags.Tags
 
 @StateStrategyType(AddToEndSingleStrategy::class)
 interface EditTagsDialogView : MvpView {

diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/navigation/Screens.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/navigation/Screens.kt
@@ -7,7 +7,7 @@ import dev.arkbuilders.navigator.presentation.screen.folders.FoldersFragment
 import dev.arkbuilders.navigator.presentation.screen.gallery.GalleryFragment
 import dev.arkbuilders.navigator.presentation.screen.resources.ResourcesFragment
 import dev.arkbuilders.navigator.presentation.screen.settings.SettingsFragment
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.user.tags.Tag
 
 class Screens {
     class FoldersScreen : SupportAppScreen() {

diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/folders/FoldersViewModel.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/folders/FoldersViewModel.kt
@@ -19,7 +19,7 @@ import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
 import org.orbitmvi.orbit.viewmodel.container
 import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
-import dev.arkbuilders.arklib.domain.index.ResourceIndexRepo
+import dev.arkbuilders.arklib.data.index.ResourceIndexRepo
 import java.nio.file.Path
 
 class ProgressWithText(val enabled: Boolean, val text: String = "")

diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/GalleryFragment.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/GalleryFragment.kt
@@ -47,10 +47,10 @@ import moxy.MvpAppCompatFragment
 import moxy.ktx.moxyPresenter
 import dev.arkbuilders.arkfilepicker.folders.RootAndFav
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.index.Resource
-import dev.arkbuilders.arklib.domain.meta.Metadata
-import dev.arkbuilders.arklib.domain.tags.Tag
-import dev.arkbuilders.arklib.domain.tags.Tags
+import dev.arkbuilders.arklib.data.index.Resource
+import dev.arkbuilders.arklib.data.meta.Metadata
+import dev.arkbuilders.arklib.user.tags.Tag
+import dev.arkbuilders.arklib.user.tags.Tags
 import dev.arkbuilders.arklib.utils.extension
 import timber.log.Timber
 import java.nio.file.Path

diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/GalleryPresenter.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/GalleryPresenter.kt
@@ -25,25 +25,24 @@ import moxy.MvpPresenter
 import moxy.presenterScope
 import dev.arkbuilders.arkfilepicker.folders.RootAndFav
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.Message
-import dev.arkbuilders.arklib.domain.index.Resource
-import dev.arkbuilders.arklib.domain.index.ResourceIndex
-import dev.arkbuilders.arklib.domain.index.ResourceIndexRepo
-import dev.arkbuilders.arklib.domain.meta.Kind
-import dev.arkbuilders.arklib.domain.meta.Metadata
-import dev.arkbuilders.arklib.domain.meta.MetadataProcessor
-import dev.arkbuilders.arklib.domain.meta.MetadataProcessorRepo
-import dev.arkbuilders.arklib.domain.preview.PreviewLocator
-import dev.arkbuilders.arklib.domain.preview.PreviewProcessor
-import dev.arkbuilders.arklib.domain.preview.PreviewProcessorRepo
-import dev.arkbuilders.arklib.domain.score.ScoreStorage
-import dev.arkbuilders.arklib.domain.score.ScoreStorageRepo
-import dev.arkbuilders.arklib.domain.stats.StatsEvent
-import dev.arkbuilders.arklib.domain.storage.StorageException
-import dev.arkbuilders.arklib.domain.tags.Tag
-import dev.arkbuilders.arklib.domain.tags.TagStorage
-import dev.arkbuilders.arklib.domain.tags.Tags
-import dev.arkbuilders.arklib.domain.tags.TagsStorageRepo
+import dev.arkbuilders.arklib.data.Message
+import dev.arkbuilders.arklib.data.index.Resource
+import dev.arkbuilders.arklib.data.index.ResourceIndex
+import dev.arkbuilders.arklib.data.index.ResourceIndexRepo
+import dev.arkbuilders.arklib.data.meta.Metadata
+import dev.arkbuilders.arklib.data.meta.MetadataProcessor
+import dev.arkbuilders.arklib.data.meta.MetadataProcessorRepo
+import dev.arkbuilders.arklib.data.preview.PreviewLocator
+import dev.arkbuilders.arklib.data.preview.PreviewProcessor
+import dev.arkbuilders.arklib.data.preview.PreviewProcessorRepo
+import dev.arkbuilders.arklib.data.stats.StatsEvent
+import dev.arkbuilders.arklib.data.storage.StorageException
+import dev.arkbuilders.arklib.user.score.ScoreStorage
+import dev.arkbuilders.arklib.user.score.ScoreStorageRepo
+import dev.arkbuilders.arklib.user.tags.Tag
+import dev.arkbuilders.arklib.user.tags.TagStorage
+import dev.arkbuilders.arklib.user.tags.Tags
+import dev.arkbuilders.arklib.user.tags.TagsStorageRepo
 import dev.arkbuilders.arklib.utils.ImageUtils
 import dev.arkbuilders.arklib.utils.extension
 import timber.log.Timber
@@ -198,8 +197,8 @@ class GalleryPresenter(
         checkResourceChanges(currentPos)
     }
 
-    fun getKind(pos: Int): Kind =
-        galleryItems[pos].metadata.kind
+    fun getKind(pos: Int): Int =
+        galleryItems[pos].metadata.kind.ordinal
 
     fun bindView(view: PreviewImageViewHolder) = presenterScope.launch {
         view.reset()

diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/GalleryView.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/GalleryView.kt
@@ -5,9 +5,9 @@ import moxy.viewstate.strategy.AddToEndSingleStrategy
 import moxy.viewstate.strategy.SkipStrategy
 import moxy.viewstate.strategy.StateStrategyType
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.index.Resource
-import dev.arkbuilders.arklib.domain.meta.Metadata
-import dev.arkbuilders.arklib.domain.tags.Tags
+import dev.arkbuilders.arklib.data.index.Resource
+import dev.arkbuilders.arklib.data.meta.Metadata
+import dev.arkbuilders.arklib.user.tags.Tags
 import java.nio.file.Path
 
 @StateStrategyType(AddToEndSingleStrategy::class)

diff --git a/.../arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt b/.../arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt
@@ -17,9 +17,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import moxy.presenterScope
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.meta.Metadata
-import dev.arkbuilders.arklib.domain.preview.PreviewLocator
-import dev.arkbuilders.arklib.domain.preview.PreviewStatus
+import dev.arkbuilders.arklib.data.meta.Metadata
+import dev.arkbuilders.arklib.data.preview.PreviewLocator
+import dev.arkbuilders.arklib.data.preview.PreviewStatus
 import dev.arkbuilders.arklib.utils.ImageUtils.loadGlideZoomImage
 import dev.arkbuilders.arklib.utils.ImageUtils.loadSubsamplingImage
 import timber.log.Timber

diff --git a/.../java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewsPager.kt b/.../java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewsPager.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import dev.arkbuilders.navigator.databinding.ItemImageBinding
 import dev.arkbuilders.navigator.databinding.ItemPreviewPlainTextBinding
 import dev.arkbuilders.navigator.presentation.screen.gallery.GalleryPresenter
-import dev.arkbuilders.arklib.domain.meta.Kind
+import dev.arkbuilders.arklib.data.meta.Kind
 
 class PreviewsPager(
     val context: Context,
@@ -43,7 +43,7 @@ class PreviewsPager(
         }
 
     override fun getItemViewType(position: Int) =
-        presenter.getKind(position).ordinal
+        presenter.getKind(position)
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onBindViewHolder(

diff --git a/...rc/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragment.kt b/...rc/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragment.kt
@@ -44,7 +44,7 @@ import moxy.presenterScope
 import dev.arkbuilders.arkfilepicker.folders.RootAndFav
 import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
 import dev.arkbuilders.arklib.ResourceId
-import dev.arkbuilders.arklib.domain.tags.Tag
+import dev.arkbuilders.arklib.user.tags.Tag
 import java.nio.file.Path
 import javax.inject.Inject
 import kotlin.io.path.Path