* Correct package name for classes from arklib (#394)

* Update arklib-android version
ARK-Builders · Oct 16, 2023 · 9541122 · 9541122
1 parent da66315
commit 9541122
Show file tree

Hide file tree

Showing 48 changed files with 201 additions and 201 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -88,12 +88,12 @@ android {
 dependencies {
     //For local developments of arklib-android:
     //def arklibVersion = '999'
-    def arklibVersion = '0.2.6'
+    def arklibVersion = '0.3.3'
 
-    releaseImplementation "space.taran:arklib:$arklibVersion"
-    debugImplementation "space.taran:arklib-debug:$arklibVersion"
-    implementation("dev.arkbuilders:components:0.0.3") {
-        exclude group: "space.taran", module: "arklib"
+    releaseImplementation "dev.arkbuilders:arklib:$arklibVersion"
+    debugImplementation "dev.arkbuilders:arklib-debug:$arklibVersion"
+    implementation("dev.arkbuilders:components:0.0.6") {
+        exclude group: "dev.arkbuilders", module: "arklib"
     }
 
     //// For local development, you can inject local AAR dependency:
@@ -120,7 +120,8 @@ dependencies {
 
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
     implementation 'com.github.MikeOrtiz:TouchImageView:3.1.1'
-    implementation 'com.github.ARK-Builders:ark-filepicker:fc6bbb1ffc'
+
+    implementation 'dev.arkbuilders:arkfilepicker:0.1.1'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
 

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,11 +1,11 @@
 package dev.arkbuilders.navigator.data
 
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arklib.ArkFiles
-import space.taran.arklib.arkFolder
+import dev.arkbuilders.arklib.ArkFiles
+import dev.arkbuilders.arklib.arkFolder
 import dev.arkbuilders.navigator.data.preferences.PreferenceKey
 import dev.arkbuilders.navigator.data.preferences.Preferences
 import java.nio.file.Path
@@ -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 space.taran.arklib.domain.stats.StatsEvent
-import space.taran.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
@@ -8,11 +8,11 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import space.taran.arklib.arkFolder
-import space.taran.arklib.arkStats
-import space.taran.arklib.domain.index.RootIndex
-import space.taran.arklib.domain.stats.StatsEvent
-import space.taran.arklib.domain.tags.RootTagsStorage
+import dev.arkbuilders.arklib.arkFolder
+import dev.arkbuilders.arklib.arkStats
+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 space.taran.arklib.domain.stats.StatsEvent
-import space.taran.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 space.taran.arklib.domain.index.ResourceIndex
-import space.taran.arklib.domain.index.RootIndex
-import space.taran.arklib.domain.stats.StatsEvent
-import space.taran.arklib.domain.tags.RootTagsStorage
-import space.taran.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
@@ -6,9 +6,9 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import space.taran.arklib.arkFolder
-import space.taran.arklib.arkStats
-import space.taran.arklib.domain.stats.StatsEvent
+import dev.arkbuilders.arklib.arkFolder
+import dev.arkbuilders.arklib.arkStats
+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 space.taran.arklib.domain.index.ResourceIndex
-import space.taran.arklib.domain.stats.StatsEvent
-import space.taran.arklib.domain.tags.TagStorage
-import space.taran.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 space.taran.arklib.domain.stats.StatsEvent
-import space.taran.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 space.taran.arklib.domain.stats.StatsEvent
-import space.taran.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 space.taran.arklib.domain.stats.StatsEvent
-import space.taran.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/AppComponent.kt b/app/src/main/java/dev/arkbuilders/navigator/di/AppComponent.kt
@@ -24,7 +24,7 @@ import dev.arkbuilders.navigator.presentation.screen.resources.ResourcesPresente
 import dev.arkbuilders.navigator.presentation.screen.resources.adapter.FileItemViewHolder
 import dev.arkbuilders.navigator.presentation.screen.resources.adapter.ResourcesGridPresenter
 import dev.arkbuilders.navigator.presentation.screen.settings.SettingsFragment
-import space.taran.arkfilepicker.folders.FoldersRepo
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
 import javax.inject.Singleton
 
 @Singleton

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
@@ -6,14 +6,14 @@ import dagger.Provides
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arklib.domain.Message
-import space.taran.arklib.domain.index.ResourceIndexRepo
-import space.taran.arklib.domain.meta.MetadataProcessorRepo
-import space.taran.arklib.domain.preview.PreviewProcessorRepo
-import space.taran.arklib.domain.score.ScoreStorageRepo
-import space.taran.arklib.domain.stats.StatsEvent
-import space.taran.arklib.domain.tags.TagsStorageRepo
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
+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/App.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/App.kt
@@ -15,9 +15,9 @@ import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arklib.initArkLib
-import space.taran.arklib.initRustLogger
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
+import dev.arkbuilders.arklib.initArkLib
+import dev.arkbuilders.arklib.initRustLogger
 import timber.log.Timber
 
 class App : Application() {

diff --git a/...src/main/java/dev/arkbuilders/navigator/presentation/dialog/ConfirmationDialogFragment.kt b/...src/main/java/dev/arkbuilders/navigator/presentation/dialog/ConfirmationDialogFragment.kt
@@ -10,9 +10,9 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.DELETE_FOLDER_KEY
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.FORGET_FAVORITE_KEY
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.FORGET_ROOT_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.DELETE_FOLDER_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.FORGET_FAVORITE_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.FORGET_ROOT_KEY
 import dev.arkbuilders.navigator.databinding.DialogInfoBinding
 import dev.arkbuilders.navigator.presentation.utils.textOrGone
 

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 space.taran.arklib.domain.index.Resource
-import space.taran.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/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/RootPickerDialogFragment.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/RootPickerDialogFragment.kt
@@ -8,9 +8,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import dev.arkbuilders.navigator.presentation.App
 import kotlinx.coroutines.launch
-import space.taran.arkfilepicker.ArkFilePickerConfig
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment
+import dev.arkbuilders.arkfilepicker.ArkFilePickerConfig
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
+import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragment
 import java.nio.file.Path
 import javax.inject.Inject
 import kotlin.io.path.Path

diff --git a/...ain/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt b/...ain/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt
@@ -19,17 +19,17 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import moxy.MvpAppCompatDialogFragment
 import moxy.ktx.moxyPresenter
-import space.taran.arkfilepicker.folders.RootAndFav
-import space.taran.arklib.ResourceId
-import space.taran.arklib.domain.index.ResourceIndex
-import space.taran.arklib.domain.tags.TagStorage
+import dev.arkbuilders.arkfilepicker.folders.RootAndFav
+import dev.arkbuilders.arklib.ResourceId
+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 space.taran.arklib.domain.tags.Tag
-import space.taran.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
@@ -14,15 +14,15 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import moxy.MvpPresenter
 import moxy.presenterScope
-import space.taran.arkfilepicker.folders.RootAndFav
-import space.taran.arklib.ResourceId
-import space.taran.arklib.domain.index.ResourceIndex
-import space.taran.arklib.domain.index.ResourceIndexRepo
-import space.taran.arklib.domain.stats.StatsEvent
-import space.taran.arklib.domain.tags.Tag
-import space.taran.arklib.domain.tags.TagStorage
-import space.taran.arklib.domain.tags.TagUtils
-import space.taran.arklib.domain.tags.TagsStorageRepo
+import dev.arkbuilders.arkfilepicker.folders.RootAndFav
+import dev.arkbuilders.arklib.ResourceId
+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 space.taran.arklib.domain.tags.Tag
-import space.taran.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/.../java/dev/arkbuilders/navigator/presentation/dialog/rootsscan/RootsScanDialogPresenter.kt b/.../java/dev/arkbuilders/navigator/presentation/dialog/rootsscan/RootsScanDialogPresenter.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import moxy.MvpPresenter
 import moxy.presenterScope
-import space.taran.arklib.arkFolder
+import dev.arkbuilders.arklib.arkFolder
 import dev.arkbuilders.navigator.data.utils.LogTags
 import dev.arkbuilders.navigator.data.utils.listDevices
 import java.nio.file.Path

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
@@ -1,13 +1,13 @@
 package dev.arkbuilders.navigator.presentation.navigation
 
 import ru.terrakok.cicerone.android.support.SupportAppScreen
-import space.taran.arkfilepicker.folders.RootAndFav
-import space.taran.arklib.ResourceId
+import dev.arkbuilders.arkfilepicker.folders.RootAndFav
+import dev.arkbuilders.arklib.ResourceId
 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 space.taran.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/FoldersFragment.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/folders/FoldersFragment.kt
@@ -29,17 +29,17 @@ import dev.arkbuilders.navigator.presentation.utils.toast
 import dev.arkbuilders.navigator.presentation.utils.toastFailedPaths
 import dev.arkbuilders.navigator.presentation.view.StackedToasts
 import org.orbitmvi.orbit.viewmodel.observe
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.DELETE_FOLDER_KEY
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.FAVORITE_KEY
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.FORGET_FAVORITE_KEY
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.FORGET_ROOT_KEY
-import space.taran.arkfilepicker.folders.FoldersRepo.Companion.ROOT_KEY
-import space.taran.arkfilepicker.folders.RootAndFav
-import space.taran.arkfilepicker.presentation.folderstree.DeviceNode
-import space.taran.arkfilepicker.presentation.folderstree.FavoriteNode
-import space.taran.arkfilepicker.presentation.folderstree.FolderNode
-import space.taran.arkfilepicker.presentation.folderstree.FolderTreeView
-import space.taran.arkfilepicker.presentation.folderstree.RootNode
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.DELETE_FOLDER_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.FAVORITE_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.FORGET_FAVORITE_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.FORGET_ROOT_KEY
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo.Companion.ROOT_KEY
+import dev.arkbuilders.arkfilepicker.folders.RootAndFav
+import dev.arkbuilders.arkfilepicker.presentation.folderstree.DeviceNode
+import dev.arkbuilders.arkfilepicker.presentation.folderstree.FavoriteNode
+import dev.arkbuilders.arkfilepicker.presentation.folderstree.FolderNode
+import dev.arkbuilders.arkfilepicker.presentation.folderstree.FolderTreeView
+import dev.arkbuilders.arkfilepicker.presentation.folderstree.RootNode
 import java.nio.file.Path
 import javax.inject.Inject
 import kotlin.io.path.Path

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
@@ -18,8 +18,8 @@ import org.orbitmvi.orbit.syntax.simple.intent
 import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
 import org.orbitmvi.orbit.viewmodel.container
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arklib.domain.index.ResourceIndexRepo
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
+import dev.arkbuilders.arklib.data.index.ResourceIndexRepo
 import java.nio.file.Path
 
 class ProgressWithText(val enabled: Boolean, val text: String = "")