From 9541122cb37541c574e4e6684e15f1835809b4ec Mon Sep 17 00:00:00 2001 From: Kirill Taran Date: Sun, 8 Oct 2023 05:32:56 +0300 Subject: [PATCH] * Correct package name for classes from arklib (#394) * Update arklib-android version --- app/build.gradle | 13 ++--- .../navigator/data/StorageBackup.kt | 11 +++-- .../data/stats/AggregatedStatsStorage.kt | 4 +- .../navigator/data/stats/PlainStatsStorage.kt | 10 ++-- .../navigator/data/stats/StatsStorage.kt | 4 +- .../navigator/data/stats/StatsStorageRepo.kt | 10 ++-- .../stats/category/StatsCategoryStorage.kt | 6 +-- .../data/stats/category/TagLabeledNStorage.kt | 8 +-- .../stats/category/TagLabeledTSStorage.kt | 4 +- .../data/stats/category/TagQueriedNStorage.kt | 4 +- .../stats/category/TagQueriedTSStorage.kt | 4 +- .../arkbuilders/navigator/di/AppComponent.kt | 2 +- .../navigator/di/modules/RepoModule.kt | 16 +++--- .../arkbuilders/navigator/presentation/App.kt | 6 +-- .../dialog/ConfirmationDialogFragment.kt | 6 +-- .../presentation/dialog/DetailsAlertDialog.kt | 4 +- .../dialog/RootPickerDialogFragment.kt | 6 +-- .../dialog/edittags/EditTagsDialogFragment.kt | 12 ++--- .../edittags/EditTagsDialogPresenter.kt | 18 +++---- .../dialog/edittags/EditTagsDialogView.kt | 4 +- .../rootsscan/RootsScanDialogPresenter.kt | 2 +- .../presentation/navigation/Screens.kt | 6 +-- .../screen/folders/FoldersFragment.kt | 22 ++++----- .../screen/folders/FoldersViewModel.kt | 4 +- .../screen/gallery/GalleryFragment.kt | 14 +++--- .../screen/gallery/GalleryPresenter.kt | 49 +++++++++---------- .../screen/gallery/GalleryView.kt | 8 +-- .../previewpager/PreviewImageViewHolder.kt | 12 ++--- .../gallery/previewpager/PreviewsPager.kt | 4 +- .../presentation/screen/main/MainActivity.kt | 4 +- .../screen/resources/ResourcesFragment.kt | 8 +-- .../resources/ResourcesFragmentHelper.kt | 6 +-- .../screen/resources/ResourcesPresenter.kt | 32 ++++++------ .../resources/adapter/FileItemViewHolder.kt | 14 +++--- .../adapter/ResourceDiffUtilCallback.kt | 2 +- .../adapter/ResourcesGridPresenter.kt | 16 +++--- .../presentation/utils/StringProvider.kt | 2 +- .../utils/extra/DocumentExtraLoader.kt | 2 +- .../presentation/utils/extra/ExtraLoader.kt | 2 +- .../utils/extra/LinkExtraLoader.kt | 2 +- .../utils/extra/VideoExtraLoader.kt | 2 +- .../presentation/view/StackedToasts.kt | 4 +- .../navigator/stub/MetadataProcessorStub.kt | 8 +-- .../navigator/stub/ResourceIndexStub.kt | 10 ++-- .../navigator/stub/StatsStorageStub.kt | 4 +- .../navigator/stub/TagsStorageStub.kt | 6 +-- .../arkbuilders/navigator/stub/TestData.kt | 4 +- build.gradle | 1 - 48 files changed, 201 insertions(+), 201 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 778a173f..231e74e2 100644 --- 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 index d084b076..6b71fd7d 100644 --- 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() 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 index 50928df3..2550f5d6 100644 --- 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 { 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 index 599585b7..83310cb4 100644 --- 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 index ab76e94c..5fe758ef 100644 --- 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 index 5fe40795..b3ecb85d 100644 --- 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 index ff1249c7..ba633162 100644 --- 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 index a3cf1697..d618acc1 100644 --- 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 index 583591b6..c4bbe779 100644 --- 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 index 896126eb..63754cab 100644 --- 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 index d963cda4..56b0cdfe 100644 --- 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 index 4f1b82d1..0ba9892a 100644 --- 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 index e1e19a94..2bc89fc1 100644 --- 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 index 5ecff1b6..da53a48d 100644 --- 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/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/ConfirmationDialogFragment.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/ConfirmationDialogFragment.kt index e37d4dab..b9baba3a 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/ConfirmationDialogFragment.kt +++ b/app/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 index 8b77a368..e385a685 100644 --- 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 index 1f005c9f..3f2d6a1a 100644 --- 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/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt index 2942b307..bf4580c4 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogFragment.kt +++ b/app/src/main/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/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogPresenter.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogPresenter.kt index 9db3e04a..d70d488c 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogPresenter.kt +++ b/app/src/main/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/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogView.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogView.kt index ce72f4af..b20e79e1 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/edittags/EditTagsDialogView.kt +++ b/app/src/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/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/rootsscan/RootsScanDialogPresenter.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/rootsscan/RootsScanDialogPresenter.kt index 8414fd77..25c057dc 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/dialog/rootsscan/RootsScanDialogPresenter.kt +++ b/app/src/main/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 index 335d23b2..91a2cf53 100644 --- 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 index 50d7953e..e4aa0161 100644 --- 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 index c96e888f..f7f24597 100644 --- 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 = "") 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 index 84f0424b..a623d30d 100644 --- 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 @@ -45,13 +45,13 @@ import dev.arkbuilders.navigator.presentation.view.StackedToasts import kotlinx.coroutines.launch import moxy.MvpAppCompatFragment import moxy.ktx.moxyPresenter -import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.tags.Tag -import space.taran.arklib.domain.tags.Tags -import space.taran.arklib.utils.extension +import dev.arkbuilders.arkfilepicker.folders.RootAndFav +import dev.arkbuilders.arklib.ResourceId +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 import kotlin.system.measureTimeMillis 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 index 398c1530..a8903eb9 100644 --- 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 @@ -23,29 +23,28 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import moxy.MvpPresenter import moxy.presenterScope -import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.Message -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.ResourceIndexRepo -import space.taran.arklib.domain.meta.Kind -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataProcessor -import space.taran.arklib.domain.meta.MetadataProcessorRepo -import space.taran.arklib.domain.preview.PreviewLocator -import space.taran.arklib.domain.preview.PreviewProcessor -import space.taran.arklib.domain.preview.PreviewProcessorRepo -import space.taran.arklib.domain.score.ScoreStorage -import space.taran.arklib.domain.score.ScoreStorageRepo -import space.taran.arklib.domain.stats.StatsEvent -import space.taran.arklib.domain.storage.StorageException -import space.taran.arklib.domain.tags.Tag -import space.taran.arklib.domain.tags.TagStorage -import space.taran.arklib.domain.tags.Tags -import space.taran.arklib.domain.tags.TagsStorageRepo -import space.taran.arklib.utils.ImageUtils -import space.taran.arklib.utils.extension +import dev.arkbuilders.arkfilepicker.folders.RootAndFav +import dev.arkbuilders.arklib.ResourceId +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 import java.io.FileReader import java.nio.file.Files @@ -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 index 7ea8b84c..4d856a2d 100644 --- 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 @@ -4,10 +4,10 @@ import dev.arkbuilders.navigator.presentation.common.CommonMvpView import moxy.viewstate.strategy.AddToEndSingleStrategy import moxy.viewstate.strategy.SkipStrategy import moxy.viewstate.strategy.StateStrategyType -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.tags.Tags +import dev.arkbuilders.arklib.ResourceId +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/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt index f1572edc..2e814869 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewImageViewHolder.kt @@ -16,12 +16,12 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import moxy.presenterScope -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.PreviewLocator -import space.taran.arklib.domain.preview.PreviewStatus -import space.taran.arklib.utils.ImageUtils.loadGlideZoomImage -import space.taran.arklib.utils.ImageUtils.loadSubsamplingImage +import dev.arkbuilders.arklib.ResourceId +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 @SuppressLint("ClickableViewAccessibility") diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewsPager.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewsPager.kt index 75d9f278..8871be32 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/gallery/previewpager/PreviewsPager.kt +++ b/app/src/main/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 space.taran.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/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/main/MainActivity.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/main/MainActivity.kt index cc7b22ce..8858540a 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/main/MainActivity.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/main/MainActivity.kt @@ -18,8 +18,8 @@ import dev.arkbuilders.navigator.presentation.navigation.Screens import dev.arkbuilders.navigator.presentation.utils.toast import kotlinx.coroutines.launch import ru.terrakok.cicerone.NavigatorHolder -import space.taran.arkfilepicker.folders.FoldersRepo -import space.taran.arkfilepicker.folders.RootAndFav +import dev.arkbuilders.arkfilepicker.folders.FoldersRepo +import dev.arkbuilders.arkfilepicker.folders.RootAndFav import javax.inject.Inject class MainActivity : AppCompatActivity(R.layout.activity_main) { diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragment.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragment.kt index e83d017d..fda2e743 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragment.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragment.kt @@ -41,10 +41,10 @@ import kotlinx.coroutines.launch import moxy.MvpAppCompatFragment import moxy.ktx.moxyPresenter import moxy.presenterScope -import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arkfilepicker.presentation.onArkPathPicked -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.tags.Tag +import dev.arkbuilders.arkfilepicker.folders.RootAndFav +import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.user.tags.Tag 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/resources/ResourcesFragmentHelper.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragmentHelper.kt index a046b385..f8a639b9 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragmentHelper.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesFragmentHelper.kt @@ -2,9 +2,9 @@ package dev.arkbuilders.navigator.presentation.screen.resources import android.view.View import androidx.core.view.isVisible -import space.taran.arkfilepicker.ArkFilePickerConfig -import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment -import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerMode +import dev.arkbuilders.arkfilepicker.ArkFilePickerConfig +import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragment +import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode import dev.arkbuilders.navigator.R import dev.arkbuilders.navigator.databinding.PopupSelectedResourcesActionsBinding import dev.arkbuilders.navigator.presentation.dialog.ConfirmationDialogFragment diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesPresenter.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesPresenter.kt index 147e4a16..f9e647e6 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesPresenter.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/ResourcesPresenter.kt @@ -26,22 +26,22 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import moxy.MvpPresenter import moxy.presenterScope -import space.taran.arkfilepicker.folders.FoldersRepo -import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.Message -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.ResourceIndexRepo -import space.taran.arklib.domain.meta.MetadataProcessor -import space.taran.arklib.domain.meta.MetadataProcessorRepo -import space.taran.arklib.domain.preview.PreviewProcessor -import space.taran.arklib.domain.preview.PreviewProcessorRepo -import space.taran.arklib.domain.score.ScoreStorage -import space.taran.arklib.domain.score.ScoreStorageRepo -import space.taran.arklib.domain.storage.StorageException -import space.taran.arklib.domain.tags.Tag -import space.taran.arklib.domain.tags.TagStorage -import space.taran.arklib.domain.tags.TagsStorageRepo +import dev.arkbuilders.arkfilepicker.folders.FoldersRepo +import dev.arkbuilders.arkfilepicker.folders.RootAndFav +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.data.Message +import dev.arkbuilders.arklib.data.index.ResourceIndex +import dev.arkbuilders.arklib.data.index.ResourceIndexRepo +import dev.arkbuilders.arklib.data.meta.MetadataProcessor +import dev.arkbuilders.arklib.data.meta.MetadataProcessorRepo +import dev.arkbuilders.arklib.data.preview.PreviewProcessor +import dev.arkbuilders.arklib.data.preview.PreviewProcessorRepo +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.TagsStorageRepo import timber.log.Timber import java.nio.file.Path import javax.inject.Inject diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/FileItemViewHolder.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/FileItemViewHolder.kt index e4edd789..f3fcf65f 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/FileItemViewHolder.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/FileItemViewHolder.kt @@ -6,7 +6,7 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import dev.arkbuilders.navigator.databinding.ItemFileGridBinding import dev.arkbuilders.navigator.presentation.utils.extra.ExtraLoader -import space.taran.arklib.domain.score.Score +import dev.arkbuilders.arklib.user.score.Score import dev.arkbuilders.navigator.presentation.utils.dpToPx import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -14,12 +14,12 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.PreviewLocator -import space.taran.arklib.domain.preview.PreviewStatus -import space.taran.arklib.utils.ImageUtils -import space.taran.arklib.utils.extension +import dev.arkbuilders.arklib.ResourceId +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 +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/resources/adapter/ResourceDiffUtilCallback.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourceDiffUtilCallback.kt index d5fad39b..fca6a4c6 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourceDiffUtilCallback.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourceDiffUtilCallback.kt @@ -1,7 +1,7 @@ package dev.arkbuilders.navigator.presentation.screen.resources.adapter import androidx.recyclerview.widget.DiffUtil -import space.taran.arklib.ResourceId +import dev.arkbuilders.arklib.ResourceId class ResourceDiffUtilCallback( private val oldItems: List, diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourcesGridPresenter.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourcesGridPresenter.kt index 6343f45c..7f3ffe42 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourcesGridPresenter.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/screen/resources/adapter/ResourcesGridPresenter.kt @@ -17,14 +17,14 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.plus import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext -import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.meta.MetadataProcessor -import space.taran.arklib.domain.preview.PreviewProcessor -import space.taran.arklib.domain.score.ScoreStorage -import space.taran.arklib.domain.tags.TagStorage +import dev.arkbuilders.arkfilepicker.folders.RootAndFav +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.data.index.Resource +import dev.arkbuilders.arklib.data.index.ResourceIndex +import dev.arkbuilders.arklib.data.meta.MetadataProcessor +import dev.arkbuilders.arklib.data.preview.PreviewProcessor +import dev.arkbuilders.arklib.user.score.ScoreStorage +import dev.arkbuilders.arklib.user.tags.TagStorage import java.nio.file.Files import javax.inject.Inject import kotlin.io.path.notExists diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/StringProvider.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/StringProvider.kt index e13fc5da..3353e6ba 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/StringProvider.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/StringProvider.kt @@ -2,7 +2,7 @@ package dev.arkbuilders.navigator.presentation.utils import android.content.Context import androidx.annotation.StringRes -import space.taran.arklib.domain.meta.Kind +import dev.arkbuilders.arklib.data.meta.Kind import dev.arkbuilders.navigator.R class StringProvider(private val context: Context) { diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/DocumentExtraLoader.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/DocumentExtraLoader.kt index 22eee094..35d8c8f1 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/DocumentExtraLoader.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/DocumentExtraLoader.kt @@ -2,7 +2,7 @@ package dev.arkbuilders.navigator.presentation.utils.extra import android.widget.TextView import dev.arkbuilders.navigator.R -import space.taran.arklib.domain.meta.Metadata +import dev.arkbuilders.arklib.data.meta.Metadata import dev.arkbuilders.navigator.presentation.utils.textOrGone object DocumentExtraLoader { diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/ExtraLoader.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/ExtraLoader.kt index c2d5d990..dbf4ab80 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/ExtraLoader.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/ExtraLoader.kt @@ -1,7 +1,7 @@ package dev.arkbuilders.navigator.presentation.utils.extra import android.widget.TextView -import space.taran.arklib.domain.meta.Metadata +import dev.arkbuilders.arklib.data.meta.Metadata import dev.arkbuilders.navigator.presentation.utils.makeGone object ExtraLoader { diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/LinkExtraLoader.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/LinkExtraLoader.kt index a4c96903..f408f3cc 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/LinkExtraLoader.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/LinkExtraLoader.kt @@ -2,7 +2,7 @@ package dev.arkbuilders.navigator.presentation.utils.extra import android.widget.TextView import dev.arkbuilders.navigator.R -import space.taran.arklib.domain.meta.Metadata +import dev.arkbuilders.arklib.data.meta.Metadata import dev.arkbuilders.navigator.presentation.utils.textOrGone object LinkExtraLoader { diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/VideoExtraLoader.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/VideoExtraLoader.kt index fdbcadc3..7b7832d5 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/VideoExtraLoader.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/utils/extra/VideoExtraLoader.kt @@ -2,7 +2,7 @@ package dev.arkbuilders.navigator.presentation.utils.extra import android.widget.TextView import dev.arkbuilders.navigator.R -import space.taran.arklib.domain.meta.Metadata +import dev.arkbuilders.arklib.data.meta.Metadata import dev.arkbuilders.navigator.presentation.utils.textOrGone object VideoExtraLoader { diff --git a/app/src/main/java/dev/arkbuilders/navigator/presentation/view/StackedToasts.kt b/app/src/main/java/dev/arkbuilders/navigator/presentation/view/StackedToasts.kt index 49292e80..11e73538 100644 --- a/app/src/main/java/dev/arkbuilders/navigator/presentation/view/StackedToasts.kt +++ b/app/src/main/java/dev/arkbuilders/navigator/presentation/view/StackedToasts.kt @@ -21,8 +21,8 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import dev.arkbuilders.navigator.R import dev.arkbuilders.navigator.databinding.ItemToastBinding -import space.taran.arklib.utils.tickerFlow -import space.taran.arklib.utils.tryUnlock +import dev.arkbuilders.arklib.utils.tickerFlow +import dev.arkbuilders.arklib.utils.tryUnlock import java.nio.file.Path import kotlin.io.path.absolutePathString diff --git a/app/src/test/java/dev/arkbuilders/navigator/stub/MetadataProcessorStub.kt b/app/src/test/java/dev/arkbuilders/navigator/stub/MetadataProcessorStub.kt index a5810ae0..ea39ee1c 100644 --- a/app/src/test/java/dev/arkbuilders/navigator/stub/MetadataProcessorStub.kt +++ b/app/src/test/java/dev/arkbuilders/navigator/stub/MetadataProcessorStub.kt @@ -1,9 +1,9 @@ package dev.arkbuilders.navigator.stub -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataUpdate -import space.taran.arklib.domain.processor.RootProcessor +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.data.meta.Metadata +import dev.arkbuilders.arklib.data.meta.MetadataUpdate +import dev.arkbuilders.arklib.data.processor.RootProcessor class MetadataProcessorStub : RootProcessor() { private val metaById: MutableMap = mapOf( diff --git a/app/src/test/java/dev/arkbuilders/navigator/stub/ResourceIndexStub.kt b/app/src/test/java/dev/arkbuilders/navigator/stub/ResourceIndexStub.kt index 91b87fb7..0df2aebc 100644 --- a/app/src/test/java/dev/arkbuilders/navigator/stub/ResourceIndexStub.kt +++ b/app/src/test/java/dev/arkbuilders/navigator/stub/ResourceIndexStub.kt @@ -2,11 +2,11 @@ package dev.arkbuilders.navigator.stub import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.ResourceUpdates -import space.taran.arklib.domain.index.RootIndex +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.data.index.Resource +import dev.arkbuilders.arklib.data.index.ResourceIndex +import dev.arkbuilders.arklib.data.index.ResourceUpdates +import dev.arkbuilders.arklib.data.index.RootIndex import java.nio.file.Path import kotlin.io.path.Path diff --git a/app/src/test/java/dev/arkbuilders/navigator/stub/StatsStorageStub.kt b/app/src/test/java/dev/arkbuilders/navigator/stub/StatsStorageStub.kt index f142a05b..5d2f0f04 100644 --- a/app/src/test/java/dev/arkbuilders/navigator/stub/StatsStorageStub.kt +++ b/app/src/test/java/dev/arkbuilders/navigator/stub/StatsStorageStub.kt @@ -1,8 +1,8 @@ package dev.arkbuilders.navigator.stub -import space.taran.arklib.domain.stats.StatsEvent +import dev.arkbuilders.arklib.data.stats.StatsEvent import dev.arkbuilders.navigator.data.stats.StatsStorage -import space.taran.arklib.domain.tags.Tag +import dev.arkbuilders.arklib.user.tags.Tag class StatsStorageStub : StatsStorage { override suspend fun init() {} diff --git a/app/src/test/java/dev/arkbuilders/navigator/stub/TagsStorageStub.kt b/app/src/test/java/dev/arkbuilders/navigator/stub/TagsStorageStub.kt index 0d98f3c9..8c213fb7 100644 --- a/app/src/test/java/dev/arkbuilders/navigator/stub/TagsStorageStub.kt +++ b/app/src/test/java/dev/arkbuilders/navigator/stub/TagsStorageStub.kt @@ -1,8 +1,8 @@ package dev.arkbuilders.navigator.stub -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.tags.TagStorage -import space.taran.arklib.domain.tags.Tags +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.user.tags.TagStorage +import dev.arkbuilders.arklib.user.tags.Tags class TagsStorageStub : TagStorage { private val tagsById = TestData.tagsById().toMutableMap() diff --git a/app/src/test/java/dev/arkbuilders/navigator/stub/TestData.kt b/app/src/test/java/dev/arkbuilders/navigator/stub/TestData.kt index 2359fff7..53359096 100644 --- a/app/src/test/java/dev/arkbuilders/navigator/stub/TestData.kt +++ b/app/src/test/java/dev/arkbuilders/navigator/stub/TestData.kt @@ -1,7 +1,7 @@ package dev.arkbuilders.navigator.stub -import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.Resource +import dev.arkbuilders.arklib.ResourceId +import dev.arkbuilders.arklib.data.index.Resource import java.nio.file.attribute.FileTime import java.util.Date diff --git a/build.gradle b/build.gradle index 19b83ee5..09a52db8 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ buildscript { mavenCentral() maven { url "https://plugins.gradle.org/m2/" } - maven { url 'https://jitpack.io' } gradlePluginPortal() } dependencies {