diff --git a/app/build.gradle b/app/build.gradle index ef9a0011..a9dfa624 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,7 @@ android { def password = System.getenv("ACRA_PASS") ?: "" def uri = System.getenv("ACRA_URI") ?: "" def appVersionName = System.getenv("BRANCH_NAME") ?: "1.0" - applicationId "space.taran.arknavigator" + applicationId "dev.arkbuilders.navigator" minSdkVersion 26 targetSdkVersion 32 versionCode 1 diff --git a/app/src/androidTest/java/space/taran/arknavigator/ExampleInstrumentedTest.kt b/app/src/androidTest/java/space/taran/arknavigator/ExampleInstrumentedTest.kt index e6a388cf..696a5d01 100644 --- a/app/src/androidTest/java/space/taran/arknavigator/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/space/taran/arknavigator/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator +package dev.arkbuilders.navigator import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -17,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("space.taran.arknavigator", appContext.packageName) + assertEquals("dev.arkbuilders.navigator", appContext.packageName) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dfa1bb72..2270585d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="dev.arkbuilders.navigator"> @@ -11,7 +11,7 @@ tools:ignore="ScopedStorage" /> @@ -32,7 +32,7 @@ diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/PlainScoreStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/PlainScoreStorage.kt index cd4549e4..29e4273c 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/PlainScoreStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/PlainScoreStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.scores +package dev.arkbuilders.navigator.mvp.model.repo.scores import android.util.Log import kotlinx.coroutines.Dispatchers @@ -6,8 +6,8 @@ import kotlinx.coroutines.withContext import space.taran.arklib.arkFolder import space.taran.arklib.arkScores import space.taran.arklib.ResourceId -import space.taran.arknavigator.utils.LogTags.SCORES_STORAGE -import space.taran.arknavigator.utils.Score +import dev.arkbuilders.navigator.utils.LogTags.SCORES_STORAGE +import dev.arkbuilders.navigator.utils.Score import java.nio.charset.StandardCharsets.UTF_8 import java.nio.file.Files import java.nio.file.Path diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorage.kt index 79a81ade..3caa84f5 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorage.kt @@ -1,7 +1,7 @@ -package space.taran.arknavigator.mvp.model.repo.scores +package dev.arkbuilders.navigator.mvp.model.repo.scores import space.taran.arklib.ResourceId -import space.taran.arknavigator.utils.Score +import dev.arkbuilders.navigator.utils.Score interface ScoreStorage { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorageRepo.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorageRepo.kt index 1a231386..bc75d301 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorageRepo.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/scores/ScoreStorageRepo.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.scores +package dev.arkbuilders.navigator.mvp.model.repo.scores import space.taran.arklib.domain.index.ResourceIndex import space.taran.arklib.domain.index.RootIndex diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/AggregatedStatsStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/AggregatedStatsStorage.kt index e51a45d2..0e415e60 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/AggregatedStatsStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/AggregatedStatsStorage.kt @@ -1,10 +1,10 @@ -package space.taran.arknavigator.mvp.model.repo.stats +package dev.arkbuilders.navigator.mvp.model.repo.stats import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.joinAll import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.utils.Tag class AggregatedStatsStorage(val shards: List) : StatsStorage { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/PlainStatsStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/PlainStatsStorage.kt index 1f478b27..0528435f 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/PlainStatsStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/PlainStatsStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.stats +package dev.arkbuilders.navigator.mvp.model.repo.stats import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -11,14 +11,14 @@ import kotlinx.coroutines.withContext import space.taran.arklib.arkFolder import space.taran.arklib.arkStats import space.taran.arklib.domain.index.RootIndex -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.stats.category.StatsCategoryStorage -import space.taran.arknavigator.mvp.model.repo.stats.category.TagLabeledNStorage -import space.taran.arknavigator.mvp.model.repo.stats.category.TagLabeledTSStorage -import space.taran.arknavigator.mvp.model.repo.stats.category.TagQueriedNStorage -import space.taran.arknavigator.mvp.model.repo.stats.category.TagQueriedTSStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.stats.category.StatsCategoryStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.category.TagLabeledNStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.category.TagLabeledTSStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.category.TagQueriedNStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.category.TagQueriedTSStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage import timber.log.Timber import kotlin.io.path.createDirectories diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorage.kt index b6e1b19d..24447c07 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorage.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.mvp.model.repo.stats +package dev.arkbuilders.navigator.mvp.model.repo.stats import space.taran.arklib.ResourceId import space.taran.arklib.domain.meta.Kind -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.Tags +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.Tags sealed class StatsEvent { data class TagsChanged( diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorageRepo.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorageRepo.kt index baa47a30..61c4968f 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorageRepo.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/StatsStorageRepo.kt @@ -1,10 +1,10 @@ -package space.taran.arknavigator.mvp.model.repo.stats +package dev.arkbuilders.navigator.mvp.model.repo.stats import space.taran.arklib.domain.index.ResourceIndex import space.taran.arklib.domain.index.RootIndex -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.tags.PlainTagsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorageRepo +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.tags.PlainTagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorageRepo import java.nio.file.Path import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/StatsCategoryStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/StatsCategoryStorage.kt index 6cab98b3..19674405 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/StatsCategoryStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/StatsCategoryStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.stats.category +package dev.arkbuilders.navigator.mvp.model.repo.stats.category import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow @@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import space.taran.arklib.arkFolder import space.taran.arklib.arkStats -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent import timber.log.Timber import java.nio.file.Path diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledNStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledNStorage.kt index 873c00a6..b76e3ec2 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledNStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledNStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.stats.category +package dev.arkbuilders.navigator.mvp.model.repo.stats.category import kotlinx.coroutines.CoroutineScope import kotlinx.serialization.Serializable @@ -6,9 +6,9 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.utils.Tag import timber.log.Timber import java.nio.file.Path import kotlin.io.path.exists diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledTSStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledTSStorage.kt index 2deb3ace..d0014e84 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledTSStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagLabeledTSStorage.kt @@ -1,12 +1,12 @@ -package space.taran.arknavigator.mvp.model.repo.stats.category +package dev.arkbuilders.navigator.mvp.model.repo.stats.category import kotlinx.coroutines.CoroutineScope import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.utils.Tag import timber.log.Timber import java.nio.file.Path import kotlin.io.path.inputStream diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedNStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedNStorage.kt index 9523484b..9041ee6e 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedNStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedNStorage.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalSerializationApi::class) -package space.taran.arknavigator.mvp.model.repo.stats.category +package dev.arkbuilders.navigator.mvp.model.repo.stats.category import kotlinx.coroutines.CoroutineScope import kotlinx.serialization.ExperimentalSerializationApi @@ -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.arknavigator.mvp.model.repo.stats.StatsEvent -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.utils.Tag import timber.log.Timber import java.nio.file.Path import kotlin.io.path.inputStream diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedTSStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedTSStorage.kt index 7f6052e5..66b1f351 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedTSStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/stats/category/TagQueriedTSStorage.kt @@ -1,12 +1,12 @@ -package space.taran.arknavigator.mvp.model.repo.stats.category +package dev.arkbuilders.navigator.mvp.model.repo.stats.category import kotlinx.coroutines.CoroutineScope import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.utils.Tag import timber.log.Timber import java.nio.file.Path import kotlin.io.path.inputStream diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/AggregatedTagsStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/AggregatedTagsStorage.kt index 350c14cb..908c89d0 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/AggregatedTagsStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/AggregatedTagsStorage.kt @@ -1,7 +1,7 @@ -package space.taran.arknavigator.mvp.model.repo.tags +package dev.arkbuilders.navigator.mvp.model.repo.tags import space.taran.arklib.ResourceId -import space.taran.arknavigator.utils.Tags +import dev.arkbuilders.navigator.utils.Tags class AggregatedTagsStorage( val shards: Collection diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/PlainTagsStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/PlainTagsStorage.kt index a110b1ad..2cd6178d 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/PlainTagsStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/PlainTagsStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.tags +package dev.arkbuilders.navigator.mvp.model.repo.tags import android.util.Log import kotlinx.coroutines.CoroutineScope @@ -10,14 +10,14 @@ import kotlinx.coroutines.withContext import space.taran.arklib.ResourceId import space.taran.arklib.arkFolder import space.taran.arklib.arkTags -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent -import space.taran.arknavigator.utils.Constants.Companion.NO_TAGS -import space.taran.arknavigator.utils.Converters.Companion.stringFromTags -import space.taran.arknavigator.utils.Converters.Companion.tagsFromString -import space.taran.arknavigator.utils.LogTags.TAGS_STORAGE -import space.taran.arknavigator.utils.Tags +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.utils.Constants.Companion.NO_TAGS +import dev.arkbuilders.navigator.utils.Converters.Companion.stringFromTags +import dev.arkbuilders.navigator.utils.Converters.Companion.tagsFromString +import dev.arkbuilders.navigator.utils.LogTags.TAGS_STORAGE +import dev.arkbuilders.navigator.utils.Tags import java.io.StreamCorruptedException import java.nio.charset.StandardCharsets import java.nio.file.Files diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorage.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorage.kt index 6ae32197..befe5c65 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorage.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorage.kt @@ -1,7 +1,7 @@ -package space.taran.arknavigator.mvp.model.repo.tags +package dev.arkbuilders.navigator.mvp.model.repo.tags import space.taran.arklib.ResourceId -import space.taran.arknavigator.utils.Tags +import dev.arkbuilders.navigator.utils.Tags interface TagsStorage { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorageRepo.kt b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorageRepo.kt index e606a25c..c4368967 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorageRepo.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/model/repo/tags/TagsStorageRepo.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.model.repo.tags +package dev.arkbuilders.navigator.mvp.model.repo.tags import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -6,8 +6,8 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import space.taran.arklib.domain.index.ResourceIndex import space.taran.arklib.domain.index.RootIndex -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent import java.nio.file.Path class TagsStorageRepo( diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/FoldersPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/FoldersPresenter.kt index b60f3867..9b750af0 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/FoldersPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/FoldersPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter +package dev.arkbuilders.navigator.mvp.presenter import android.util.Log import kotlinx.coroutines.NonCancellable @@ -18,15 +18,15 @@ import space.taran.arklib.domain.Message import space.taran.arklib.domain.index.ResourceIndexRepo import space.taran.arklib.domain.preview.PreviewStorageRepo import space.taran.arklib.utils.Constants -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.view.FoldersView -import space.taran.arknavigator.navigation.AppRouter -import space.taran.arknavigator.navigation.Screens -import space.taran.arknavigator.ui.resource.StringProvider -import space.taran.arknavigator.utils.LogTags.FOLDERS_SCREEN -import space.taran.arknavigator.utils.LogTags.FOLDERS_TREE -import space.taran.arknavigator.utils.listDevices +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.view.FoldersView +import dev.arkbuilders.navigator.navigation.AppRouter +import dev.arkbuilders.navigator.navigation.Screens +import dev.arkbuilders.navigator.ui.resource.StringProvider +import dev.arkbuilders.navigator.utils.LogTags.FOLDERS_SCREEN +import dev.arkbuilders.navigator.utils.LogTags.FOLDERS_TREE +import dev.arkbuilders.navigator.utils.listDevices import java.nio.file.Path import javax.inject.Inject import javax.inject.Named diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/GalleryPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/GalleryPresenter.kt index 91bdef2a..3963c007 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/GalleryPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/GalleryPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter +package dev.arkbuilders.navigator.mvp.presenter import android.util.Log import androidx.recyclerview.widget.DiffUtil @@ -28,24 +28,24 @@ import space.taran.arklib.domain.tags.Tags import space.taran.arklib.utils.Constants import space.taran.arklib.utils.ImageUtils import space.taran.arklib.utils.extension -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.scores.ScoreStorage -import space.taran.arknavigator.mvp.model.repo.scores.ScoreStorageRepo -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorage -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorageRepo -import space.taran.arknavigator.mvp.model.repo.tags.PlainTagsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorageRepo -import space.taran.arknavigator.mvp.presenter.adapter.ResourceDiffUtilCallback -import space.taran.arknavigator.mvp.view.GalleryView -import space.taran.arknavigator.navigation.AppRouter -import space.taran.arknavigator.navigation.Screens -import space.taran.arknavigator.ui.adapter.previewpager.PreviewItemView -import space.taran.arknavigator.ui.adapter.previewpager.PreviewPlainTextItemView -import space.taran.arknavigator.utils.LogTags.GALLERY_SCREEN -import space.taran.arknavigator.utils.Score -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.scores.ScoreStorage +import dev.arkbuilders.navigator.mvp.model.repo.scores.ScoreStorageRepo +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorageRepo +import dev.arkbuilders.navigator.mvp.model.repo.tags.PlainTagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorageRepo +import dev.arkbuilders.navigator.mvp.presenter.adapter.ResourceDiffUtilCallback +import dev.arkbuilders.navigator.mvp.view.GalleryView +import dev.arkbuilders.navigator.navigation.AppRouter +import dev.arkbuilders.navigator.navigation.Screens +import dev.arkbuilders.navigator.ui.adapter.previewpager.PreviewItemView +import dev.arkbuilders.navigator.ui.adapter.previewpager.PreviewPlainTextItemView +import dev.arkbuilders.navigator.utils.LogTags.GALLERY_SCREEN +import dev.arkbuilders.navigator.utils.Score +import dev.arkbuilders.navigator.utils.Tag import java.io.FileNotFoundException import java.io.FileReader import java.lang.IllegalStateException diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/MainPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/MainPresenter.kt index 8f5366e7..ada41676 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/MainPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/MainPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter +package dev.arkbuilders.navigator.mvp.presenter import android.util.Log import kotlinx.coroutines.launch @@ -6,10 +6,10 @@ import moxy.MvpPresenter import moxy.presenterScope import space.taran.arkfilepicker.folders.FoldersRepo import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arknavigator.mvp.view.MainView -import space.taran.arknavigator.navigation.AppRouter -import space.taran.arknavigator.navigation.Screens -import space.taran.arknavigator.utils.LogTags.MAIN +import dev.arkbuilders.navigator.mvp.view.MainView +import dev.arkbuilders.navigator.navigation.AppRouter +import dev.arkbuilders.navigator.navigation.Screens +import dev.arkbuilders.navigator.utils.LogTags.MAIN import javax.inject.Inject class MainPresenter : MvpPresenter() { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/ResourcesPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/ResourcesPresenter.kt index d62b2a38..11d3feda 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/ResourcesPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/ResourcesPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter +package dev.arkbuilders.navigator.mvp.presenter import android.util.Log import kotlinx.coroutines.Dispatchers @@ -22,23 +22,23 @@ import space.taran.arklib.domain.meta.MetadataStorageRepo import space.taran.arklib.domain.preview.PreviewStorage import space.taran.arklib.domain.preview.PreviewStorageRepo import space.taran.arklib.utils.Constants -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.scores.ScoreStorage -import space.taran.arknavigator.mvp.model.repo.scores.ScoreStorageRepo -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorage -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorageRepo -import space.taran.arknavigator.mvp.model.repo.tags.PlainTagsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorageRepo -import space.taran.arknavigator.mvp.presenter.adapter.ResourcesGridPresenter -import space.taran.arknavigator.mvp.presenter.adapter.tagsselector.TagsSelectorPresenter -import space.taran.arknavigator.mvp.view.ResourcesView -import space.taran.arknavigator.navigation.AppRouter -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.utils.LogTags.RESOURCES_SCREEN -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.findNotExistCopyName +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.scores.ScoreStorage +import dev.arkbuilders.navigator.mvp.model.repo.scores.ScoreStorageRepo +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorageRepo +import dev.arkbuilders.navigator.mvp.model.repo.tags.PlainTagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorageRepo +import dev.arkbuilders.navigator.mvp.presenter.adapter.ResourcesGridPresenter +import dev.arkbuilders.navigator.mvp.presenter.adapter.tagsselector.TagsSelectorPresenter +import dev.arkbuilders.navigator.mvp.view.ResourcesView +import dev.arkbuilders.navigator.navigation.AppRouter +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.utils.LogTags.RESOURCES_SCREEN +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.findNotExistCopyName import timber.log.Timber import java.nio.file.Path import javax.inject.Inject diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/FoldersGridPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/FoldersGridPresenter.kt index 692084eb..ce3af9f3 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/FoldersGridPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/FoldersGridPresenter.kt @@ -1,8 +1,8 @@ -package space.taran.arknavigator.mvp.presenter.adapter +package dev.arkbuilders.navigator.mvp.presenter.adapter -import space.taran.arknavigator.mvp.view.dialog.FolderPickerDialogView -import space.taran.arknavigator.mvp.view.item.FileItemView -import space.taran.arknavigator.utils.findLongestCommonPrefix +import dev.arkbuilders.navigator.mvp.view.dialog.FolderPickerDialogView +import dev.arkbuilders.navigator.mvp.view.item.FileItemView +import dev.arkbuilders.navigator.utils.findLongestCommonPrefix import space.taran.arklib.utils.listChildren import java.nio.file.Files import java.nio.file.Path diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourceDiffUtilCallback.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourceDiffUtilCallback.kt index b29e82f3..a16e3048 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourceDiffUtilCallback.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourceDiffUtilCallback.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.adapter +package dev.arkbuilders.navigator.mvp.presenter.adapter import androidx.recyclerview.widget.DiffUtil import space.taran.arklib.ResourceId diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourcesGridPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourcesGridPresenter.kt index 155a0f55..6160e7a4 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourcesGridPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/ResourcesGridPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.adapter +package dev.arkbuilders.navigator.mvp.presenter.adapter import android.util.Log import kotlinx.coroutines.CoroutineScope @@ -14,20 +14,20 @@ 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.MetadataStorage -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences import space.taran.arklib.domain.preview.PreviewStorage -import space.taran.arknavigator.mvp.model.repo.scores.ScoreStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.mvp.presenter.ResourcesPresenter -import space.taran.arknavigator.mvp.view.ResourcesView -import space.taran.arknavigator.mvp.view.item.FileItemView -import space.taran.arknavigator.navigation.AppRouter -import space.taran.arknavigator.navigation.Screens -import space.taran.arknavigator.utils.LogTags.RESOURCES_SCREEN -import space.taran.arknavigator.utils.Sorting -import space.taran.arknavigator.utils.reifySorting -import space.taran.arknavigator.utils.unequalCompareBy +import dev.arkbuilders.navigator.mvp.model.repo.scores.ScoreStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.presenter.ResourcesPresenter +import dev.arkbuilders.navigator.mvp.view.ResourcesView +import dev.arkbuilders.navigator.mvp.view.item.FileItemView +import dev.arkbuilders.navigator.navigation.AppRouter +import dev.arkbuilders.navigator.navigation.Screens +import dev.arkbuilders.navigator.utils.LogTags.RESOURCES_SCREEN +import dev.arkbuilders.navigator.utils.Sorting +import dev.arkbuilders.navigator.utils.reifySorting +import dev.arkbuilders.navigator.utils.unequalCompareBy import java.nio.file.Files import javax.inject.Inject import kotlin.io.path.notExists diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorAction.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorAction.kt index b0371b86..4695df98 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorAction.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorAction.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.adapter.tagsselector +package dev.arkbuilders.navigator.mvp.presenter.adapter.tagsselector sealed class TagsSelectorAction { data class Include(val item: TagItem) : TagsSelectorAction() diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorPresenter.kt index 79a178d9..a8880bcd 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/adapter/tagsselector/TagsSelectorPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.adapter.tagsselector +package dev.arkbuilders.navigator.mvp.presenter.adapter.tagsselector import android.util.Log import kotlinx.coroutines.CoroutineScope @@ -9,17 +9,17 @@ import space.taran.arklib.ResourceId import space.taran.arklib.domain.index.ResourceIndex import space.taran.arklib.domain.meta.Kind import space.taran.arklib.domain.meta.MetadataStorage -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.stats.StatsEvent -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.mvp.presenter.dialog.TagsSorting -import space.taran.arknavigator.mvp.view.ResourcesView -import space.taran.arknavigator.ui.resource.StringProvider -import space.taran.arknavigator.utils.LogTags.TAGS_SELECTOR -import space.taran.arknavigator.utils.Popularity -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsEvent +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.presenter.dialog.TagsSorting +import dev.arkbuilders.navigator.mvp.view.ResourcesView +import dev.arkbuilders.navigator.ui.resource.StringProvider +import dev.arkbuilders.navigator.utils.LogTags.TAGS_SELECTOR +import dev.arkbuilders.navigator.utils.Popularity +import dev.arkbuilders.navigator.utils.Tag import javax.inject.Inject sealed class TagItem { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/EditTagsDialogPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/EditTagsDialogPresenter.kt index 3d0a273a..777c3774 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/EditTagsDialogPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/EditTagsDialogPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.dialog +package dev.arkbuilders.navigator.mvp.presenter.dialog import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -12,16 +12,16 @@ 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.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorage -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorageRepo -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorageRepo -import space.taran.arknavigator.mvp.view.dialog.EditTagsDialogView -import space.taran.arknavigator.utils.Popularity -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.TagUtils +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorage +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorageRepo +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorageRepo +import dev.arkbuilders.navigator.mvp.view.dialog.EditTagsDialogView +import dev.arkbuilders.navigator.utils.Popularity +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.TagUtils import javax.inject.Inject sealed class EditTagsAction { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/RootsScanDialogPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/RootsScanDialogPresenter.kt index 5e2f68ee..ce3b8b23 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/RootsScanDialogPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/RootsScanDialogPresenter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.dialog +package dev.arkbuilders.navigator.mvp.presenter.dialog import android.util.Log import kotlinx.coroutines.Dispatchers @@ -8,9 +8,9 @@ import kotlinx.coroutines.withContext import moxy.MvpPresenter import moxy.presenterScope import space.taran.arklib.arkFolder -import space.taran.arknavigator.mvp.view.dialog.RootsScanView -import space.taran.arknavigator.utils.LogTags -import space.taran.arknavigator.utils.listDevices +import dev.arkbuilders.navigator.mvp.view.dialog.RootsScanView +import dev.arkbuilders.navigator.utils.LogTags +import dev.arkbuilders.navigator.utils.listDevices import java.nio.file.Path import java.util.LinkedList import java.util.Queue diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/SortDialogPresenter.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/SortDialogPresenter.kt index bdd90440..931bafe9 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/SortDialogPresenter.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/SortDialogPresenter.kt @@ -1,12 +1,12 @@ -package space.taran.arknavigator.mvp.presenter.dialog +package dev.arkbuilders.navigator.mvp.presenter.dialog import kotlinx.coroutines.launch import moxy.MvpPresenter import moxy.presenterScope -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.mvp.view.dialog.SortDialogView -import space.taran.arknavigator.utils.Sorting +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.view.dialog.SortDialogView +import dev.arkbuilders.navigator.utils.Sorting import javax.inject.Inject class SortDialogPresenter : MvpPresenter() { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/TagsSortViewModel.kt b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/TagsSortViewModel.kt index 49541646..140d21de 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/TagsSortViewModel.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/presenter/dialog/TagsSortViewModel.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.presenter.dialog +package dev.arkbuilders.navigator.mvp.presenter.dialog import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -14,8 +14,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.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences sealed class TagsSortState { object Loading : TagsSortState() diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/CommonMvpView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/CommonMvpView.kt index 9e02c5a4..5bb649e2 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/CommonMvpView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/CommonMvpView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view +package dev.arkbuilders.navigator.mvp.view import java.nio.file.Path import moxy.MvpView diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/FoldersView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/FoldersView.kt index 42fcfa91..8d7e64f0 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/FoldersView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/FoldersView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view +package dev.arkbuilders.navigator.mvp.view import moxy.viewstate.strategy.AddToEndSingleStrategy import moxy.viewstate.strategy.SkipStrategy diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/GalleryView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/GalleryView.kt index 771c56ce..55523137 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/GalleryView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/GalleryView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view +package dev.arkbuilders.navigator.mvp.view import moxy.viewstate.strategy.AddToEndSingleStrategy import moxy.viewstate.strategy.SkipStrategy @@ -6,8 +6,8 @@ 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.arknavigator.utils.Score -import space.taran.arknavigator.utils.Tags +import dev.arkbuilders.navigator.utils.Score +import dev.arkbuilders.navigator.utils.Tags import java.nio.file.Path @StateStrategyType(AddToEndSingleStrategy::class) diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/MainView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/MainView.kt index a4be71b8..ce70fc94 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/MainView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/MainView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view +package dev.arkbuilders.navigator.mvp.view import moxy.MvpView import moxy.viewstate.strategy.AddToEndSingleStrategy diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/ResourcesView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/ResourcesView.kt index 8c92261c..dea9bfdd 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/ResourcesView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/ResourcesView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view +package dev.arkbuilders.navigator.mvp.view import moxy.viewstate.strategy.AddToEndSingleStrategy import moxy.viewstate.strategy.SkipStrategy diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/EditTagsDialogView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/EditTagsDialogView.kt index bb7427c3..684c2524 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/EditTagsDialogView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/EditTagsDialogView.kt @@ -1,11 +1,11 @@ -package space.taran.arknavigator.mvp.view.dialog +package dev.arkbuilders.navigator.mvp.view.dialog import moxy.MvpView import moxy.viewstate.strategy.AddToEndSingleStrategy import moxy.viewstate.strategy.SkipStrategy import moxy.viewstate.strategy.StateStrategyType -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.Tags +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.Tags @StateStrategyType(AddToEndSingleStrategy::class) interface EditTagsDialogView : MvpView { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/FolderPickerDialogView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/FolderPickerDialogView.kt index 46abe72e..5c54a3dc 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/FolderPickerDialogView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/FolderPickerDialogView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view.dialog +package dev.arkbuilders.navigator.mvp.view.dialog import moxy.MvpView import moxy.viewstate.strategy.AddToEndSingleStrategy diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/RootsScanView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/RootsScanView.kt index 425e228d..fc5afa23 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/RootsScanView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/RootsScanView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.mvp.view.dialog +package dev.arkbuilders.navigator.mvp.view.dialog import moxy.MvpView import moxy.viewstate.strategy.AddToEndSingleStrategy diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/SortDialogView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/SortDialogView.kt index 27b8003c..f0ec1e14 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/SortDialogView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/dialog/SortDialogView.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.mvp.view.dialog +package dev.arkbuilders.navigator.mvp.view.dialog import moxy.MvpView import moxy.viewstate.strategy.AddToEndSingleStrategy import moxy.viewstate.strategy.StateStrategyType -import space.taran.arknavigator.utils.Sorting +import dev.arkbuilders.navigator.utils.Sorting @StateStrategyType(AddToEndSingleStrategy::class) interface SortDialogView : MvpView { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemView.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemView.kt index 6d83eb6e..af0fe497 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemView.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemView.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.mvp.view.item +package dev.arkbuilders.navigator.mvp.view.item import space.taran.arklib.ResourceId import space.taran.arklib.domain.meta.Metadata import space.taran.arklib.domain.preview.PreviewLocator -import space.taran.arknavigator.utils.Score +import dev.arkbuilders.navigator.utils.Score import java.nio.file.Path interface FileItemView { diff --git a/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemViewHolder.kt b/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemViewHolder.kt index cdca1776..84a7d3a9 100644 --- a/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemViewHolder.kt +++ b/app/src/main/java/space/taran/arknavigator/mvp/view/item/FileItemViewHolder.kt @@ -1,19 +1,19 @@ -package space.taran.arknavigator.mvp.view.item +package dev.arkbuilders.navigator.mvp.view.item import android.animation.ValueAnimator import android.view.View import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import space.taran.arklib.ResourceId -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.ItemFileGridBinding +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.ItemFileGridBinding 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.arknavigator.ui.extra.ExtraLoader -import space.taran.arknavigator.utils.Score -import space.taran.arknavigator.utils.dpToPx +import dev.arkbuilders.navigator.ui.extra.ExtraLoader +import dev.arkbuilders.navigator.utils.Score +import dev.arkbuilders.navigator.utils.dpToPx import space.taran.arklib.utils.extension import java.nio.file.Path diff --git a/app/src/main/java/space/taran/arknavigator/navigation/AppNavigator.kt b/app/src/main/java/space/taran/arknavigator/navigation/AppNavigator.kt index c15af109..5c1ea9e9 100644 --- a/app/src/main/java/space/taran/arknavigator/navigation/AppNavigator.kt +++ b/app/src/main/java/space/taran/arknavigator/navigation/AppNavigator.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.navigation +package dev.arkbuilders.navigator.navigation import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/space/taran/arknavigator/navigation/AppRouter.kt b/app/src/main/java/space/taran/arknavigator/navigation/AppRouter.kt index 60667dfa..2b3b1e13 100644 --- a/app/src/main/java/space/taran/arknavigator/navigation/AppRouter.kt +++ b/app/src/main/java/space/taran/arknavigator/navigation/AppRouter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.navigation +package dev.arkbuilders.navigator.navigation import ru.terrakok.cicerone.Router import ru.terrakok.cicerone.Screen diff --git a/app/src/main/java/space/taran/arknavigator/navigation/FragmentForwardAdd.kt b/app/src/main/java/space/taran/arknavigator/navigation/FragmentForwardAdd.kt index c006df95..395060ae 100644 --- a/app/src/main/java/space/taran/arknavigator/navigation/FragmentForwardAdd.kt +++ b/app/src/main/java/space/taran/arknavigator/navigation/FragmentForwardAdd.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.navigation +package dev.arkbuilders.navigator.navigation import ru.terrakok.cicerone.Screen import ru.terrakok.cicerone.commands.Command diff --git a/app/src/main/java/space/taran/arknavigator/navigation/Screens.kt b/app/src/main/java/space/taran/arknavigator/navigation/Screens.kt index 2b1b9b11..496dcea1 100644 --- a/app/src/main/java/space/taran/arknavigator/navigation/Screens.kt +++ b/app/src/main/java/space/taran/arknavigator/navigation/Screens.kt @@ -1,13 +1,13 @@ -package space.taran.arknavigator.navigation +package dev.arkbuilders.navigator.navigation import ru.terrakok.cicerone.android.support.SupportAppScreen import space.taran.arkfilepicker.folders.RootAndFav import space.taran.arklib.ResourceId -import space.taran.arknavigator.ui.fragments.FoldersFragment -import space.taran.arknavigator.ui.fragments.GalleryFragment -import space.taran.arknavigator.ui.fragments.ResourcesFragment -import space.taran.arknavigator.ui.fragments.SettingsFragment -import space.taran.arknavigator.utils.Tag +import dev.arkbuilders.navigator.ui.fragments.FoldersFragment +import dev.arkbuilders.navigator.ui.fragments.GalleryFragment +import dev.arkbuilders.navigator.ui.fragments.ResourcesFragment +import dev.arkbuilders.navigator.ui.fragments.SettingsFragment +import dev.arkbuilders.navigator.utils.Tag class Screens { class FoldersScreen : SupportAppScreen() { diff --git a/app/src/main/java/space/taran/arknavigator/ui/App.kt b/app/src/main/java/space/taran/arknavigator/ui/App.kt index f941c766..63ca9cf4 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/App.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/App.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui +package dev.arkbuilders.navigator.ui import android.app.Application import android.os.StrictMode @@ -13,11 +13,11 @@ import org.acra.sender.HttpSender import space.taran.arkfilepicker.folders.FoldersRepo import space.taran.arklib.initArkLib import space.taran.arklib.initRustLogger -import space.taran.arknavigator.BuildConfig -import space.taran.arknavigator.R -import space.taran.arknavigator.di.AppComponent -import space.taran.arknavigator.di.DaggerAppComponent -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.BuildConfig +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.di.AppComponent +import dev.arkbuilders.navigator.di.DaggerAppComponent +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey import timber.log.Timber class App : Application() { diff --git a/app/src/main/java/space/taran/arknavigator/ui/activity/MainActivity.kt b/app/src/main/java/space/taran/arknavigator/ui/activity/MainActivity.kt index 5884de03..68aa0f8a 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/activity/MainActivity.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/activity/MainActivity.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.activity +package dev.arkbuilders.navigator.ui.activity import android.Manifest import android.content.Intent @@ -17,16 +17,16 @@ import androidx.core.view.isVisible import moxy.MvpAppCompatActivity import moxy.ktx.moxyPresenter import ru.terrakok.cicerone.NavigatorHolder -import space.taran.arknavigator.BuildConfig -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.ActivityMainBinding -import space.taran.arknavigator.mvp.presenter.MainPresenter -import space.taran.arknavigator.mvp.view.MainView -import space.taran.arknavigator.navigation.AppNavigator -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.ui.fragments.utils.toast -import space.taran.arknavigator.utils.LogTags.MAIN -import space.taran.arknavigator.utils.LogTags.PERMISSIONS +import dev.arkbuilders.navigator.BuildConfig +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.ActivityMainBinding +import dev.arkbuilders.navigator.mvp.presenter.MainPresenter +import dev.arkbuilders.navigator.mvp.view.MainView +import dev.arkbuilders.navigator.navigation.AppNavigator +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.utils.LogTags.MAIN +import dev.arkbuilders.navigator.utils.LogTags.PERMISSIONS import javax.inject.Inject class MainActivity : MvpAppCompatActivity(), MainView { diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/ResourcesRVAdapter.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/ResourcesRVAdapter.kt index 5e41a77c..8b6ad726 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/ResourcesRVAdapter.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/ResourcesRVAdapter.kt @@ -1,12 +1,12 @@ -package space.taran.arknavigator.ui.adapter +package dev.arkbuilders.navigator.ui.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import space.taran.arknavigator.databinding.ItemFileGridBinding -import space.taran.arknavigator.mvp.presenter.adapter.ResourcesGridPresenter -import space.taran.arknavigator.mvp.view.item.FileItemViewHolder -import space.taran.arknavigator.ui.App +import dev.arkbuilders.navigator.databinding.ItemFileGridBinding +import dev.arkbuilders.navigator.mvp.presenter.adapter.ResourcesGridPresenter +import dev.arkbuilders.navigator.mvp.view.item.FileItemViewHolder +import dev.arkbuilders.navigator.ui.App class ResourcesRVAdapter( private val presenter: ResourcesGridPresenter diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/TagsSelectorAdapter.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/TagsSelectorAdapter.kt index e8eeeeb3..a23d264c 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/TagsSelectorAdapter.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/TagsSelectorAdapter.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.adapter +package dev.arkbuilders.navigator.ui.adapter import android.content.Context import android.content.res.ColorStateList @@ -13,14 +13,14 @@ import com.google.android.flexbox.FlexboxLayoutManager import com.mikepenz.fastadapter.FastAdapter import com.mikepenz.fastadapter.adapters.ItemAdapter import com.mikepenz.fastadapter.binding.AbstractBindingItem -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.FragmentResourcesBinding -import space.taran.arknavigator.databinding.ItemTagBinding -import space.taran.arknavigator.databinding.PopupResourcesTagMenuBinding -import space.taran.arknavigator.mvp.presenter.adapter.tagsselector.TagItem -import space.taran.arknavigator.mvp.presenter.adapter.tagsselector.TagsSelectorPresenter -import space.taran.arknavigator.ui.resource.StringProvider -import space.taran.arknavigator.ui.view.DefaultPopup +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.FragmentResourcesBinding +import dev.arkbuilders.navigator.databinding.ItemTagBinding +import dev.arkbuilders.navigator.databinding.PopupResourcesTagMenuBinding +import dev.arkbuilders.navigator.mvp.presenter.adapter.tagsselector.TagItem +import dev.arkbuilders.navigator.mvp.presenter.adapter.tagsselector.TagsSelectorPresenter +import dev.arkbuilders.navigator.ui.resource.StringProvider +import dev.arkbuilders.navigator.ui.view.DefaultPopup import javax.inject.Inject class TagsSelectorAdapter( diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewImageViewHolder.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewImageViewHolder.kt index dc7ec5cf..6ebac55a 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewImageViewHolder.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewImageViewHolder.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.adapter.previewpager +package dev.arkbuilders.navigator.ui.adapter.previewpager import android.annotation.SuppressLint import androidx.core.view.GestureDetectorCompat @@ -7,15 +7,15 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.ortiz.touchview.OnTouchImageViewListener -import space.taran.arknavigator.databinding.ItemImageBinding +import dev.arkbuilders.navigator.databinding.ItemImageBinding 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.arknavigator.mvp.presenter.GalleryPresenter +import dev.arkbuilders.navigator.mvp.presenter.GalleryPresenter import space.taran.arklib.utils.ImageUtils.loadGlideZoomImage import space.taran.arklib.utils.ImageUtils.loadSubsamplingImage -import space.taran.arknavigator.utils.extensions.makeVisibleAndSetOnClickListener +import dev.arkbuilders.navigator.utils.extensions.makeVisibleAndSetOnClickListener @SuppressLint("ClickableViewAccessibility") class PreviewImageViewHolder( diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewItemView.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewItemView.kt index 1084ec07..623afa26 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewItemView.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewItemView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.adapter.previewpager +package dev.arkbuilders.navigator.ui.adapter.previewpager import space.taran.arklib.ResourceId import space.taran.arklib.domain.meta.Metadata diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextItemView.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextItemView.kt index ed9712e6..1cbea24c 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextItemView.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextItemView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.adapter.previewpager +package dev.arkbuilders.navigator.ui.adapter.previewpager interface PreviewPlainTextItemView { var pos: Int diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextViewHolder.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextViewHolder.kt index 217c4dc8..2025a4ae 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextViewHolder.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewPlainTextViewHolder.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.ui.adapter.previewpager +package dev.arkbuilders.navigator.ui.adapter.previewpager import android.annotation.SuppressLint import androidx.core.view.GestureDetectorCompat import androidx.recyclerview.widget.RecyclerView -import space.taran.arknavigator.databinding.ItemPreviewPlainTextBinding +import dev.arkbuilders.navigator.databinding.ItemPreviewPlainTextBinding @SuppressLint("ClickableViewAccessibility") class PreviewPlainTextViewHolder( diff --git a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewsPager.kt b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewsPager.kt index 2eb5694b..bb4a9798 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewsPager.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/adapter/previewpager/PreviewsPager.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.adapter.previewpager +package dev.arkbuilders.navigator.ui.adapter.previewpager import android.annotation.SuppressLint import android.content.Context @@ -9,9 +9,9 @@ import android.view.ViewGroup import androidx.core.view.GestureDetectorCompat import androidx.recyclerview.widget.RecyclerView import space.taran.arklib.domain.meta.Kind -import space.taran.arknavigator.databinding.ItemImageBinding -import space.taran.arknavigator.databinding.ItemPreviewPlainTextBinding -import space.taran.arknavigator.mvp.presenter.GalleryPresenter +import dev.arkbuilders.navigator.databinding.ItemImageBinding +import dev.arkbuilders.navigator.databinding.ItemPreviewPlainTextBinding +import dev.arkbuilders.navigator.mvp.presenter.GalleryPresenter class PreviewsPager( val context: Context, diff --git a/app/src/main/java/space/taran/arknavigator/ui/extra/DocumentExtraLoader.kt b/app/src/main/java/space/taran/arknavigator/ui/extra/DocumentExtraLoader.kt index fc086562..e272a5ec 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/extra/DocumentExtraLoader.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/extra/DocumentExtraLoader.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.ui.extra +package dev.arkbuilders.navigator.ui.extra import android.widget.TextView -import space.taran.arknavigator.R +import dev.arkbuilders.navigator.R import space.taran.arklib.domain.meta.Metadata -import space.taran.arknavigator.utils.extensions.textOrGone +import dev.arkbuilders.navigator.utils.extensions.textOrGone object DocumentExtraLoader { fun load(document: Metadata.Document, pagesTV: TextView, verbose: Boolean) { diff --git a/app/src/main/java/space/taran/arknavigator/ui/extra/ExtraLoader.kt b/app/src/main/java/space/taran/arknavigator/ui/extra/ExtraLoader.kt index e65a0fe6..b3480316 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/extra/ExtraLoader.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/extra/ExtraLoader.kt @@ -1,8 +1,8 @@ -package space.taran.arknavigator.ui.extra +package dev.arkbuilders.navigator.ui.extra import android.widget.TextView import space.taran.arklib.domain.meta.Metadata -import space.taran.arknavigator.utils.extensions.makeGone +import dev.arkbuilders.navigator.utils.extensions.makeGone object ExtraLoader { fun load(meta: Metadata, extraTVs: List, verbose: Boolean) { diff --git a/app/src/main/java/space/taran/arknavigator/ui/extra/LinkExtraLoader.kt b/app/src/main/java/space/taran/arknavigator/ui/extra/LinkExtraLoader.kt index 974ff384..7e3346fe 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/extra/LinkExtraLoader.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/extra/LinkExtraLoader.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.ui.extra +package dev.arkbuilders.navigator.ui.extra import android.widget.TextView -import space.taran.arknavigator.R +import dev.arkbuilders.navigator.R import space.taran.arklib.domain.meta.Metadata -import space.taran.arknavigator.utils.extensions.textOrGone +import dev.arkbuilders.navigator.utils.extensions.textOrGone object LinkExtraLoader { fun load(link: Metadata.Link, titleTV: TextView, verbose: Boolean) { diff --git a/app/src/main/java/space/taran/arknavigator/ui/extra/VideoExtraLoader.kt b/app/src/main/java/space/taran/arknavigator/ui/extra/VideoExtraLoader.kt index 15e2e104..714a1f92 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/extra/VideoExtraLoader.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/extra/VideoExtraLoader.kt @@ -1,9 +1,9 @@ -package space.taran.arknavigator.ui.extra +package dev.arkbuilders.navigator.ui.extra import android.widget.TextView -import space.taran.arknavigator.R +import dev.arkbuilders.navigator.R import space.taran.arklib.domain.meta.Metadata -import space.taran.arknavigator.utils.extensions.textOrGone +import dev.arkbuilders.navigator.utils.extensions.textOrGone object VideoExtraLoader { fun load( diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/FoldersFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/FoldersFragment.kt index 104d0edc..def8a866 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/FoldersFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/FoldersFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments +package dev.arkbuilders.navigator.ui.fragments import android.os.Bundle import android.util.Log @@ -22,21 +22,21 @@ import space.taran.arkfilepicker.presentation.folderstree.DeviceNode import space.taran.arkfilepicker.presentation.folderstree.RootNode import space.taran.arkfilepicker.presentation.folderstree.FavoriteNode import space.taran.arkfilepicker.presentation.folderstree.FolderTreeView -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.FragmentFoldersBinding -import space.taran.arknavigator.mvp.presenter.FoldersPresenter -import space.taran.arknavigator.mvp.view.FoldersView -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.ui.activity.MainActivity -import space.taran.arknavigator.ui.fragments.dialog.ConfirmationDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.RootPickerDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.RootsScanDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.onRootOrFavPicked -import space.taran.arknavigator.ui.fragments.utils.toast -import space.taran.arknavigator.ui.fragments.utils.toastFailedPaths -import space.taran.arknavigator.ui.view.StackedToasts -import space.taran.arknavigator.utils.FullscreenHelper -import space.taran.arknavigator.utils.LogTags.FOLDERS_SCREEN +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.FragmentFoldersBinding +import dev.arkbuilders.navigator.mvp.presenter.FoldersPresenter +import dev.arkbuilders.navigator.mvp.view.FoldersView +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.ui.activity.MainActivity +import dev.arkbuilders.navigator.ui.fragments.dialog.ConfirmationDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.RootPickerDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.RootsScanDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.onRootOrFavPicked +import dev.arkbuilders.navigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.ui.fragments.utils.toastFailedPaths +import dev.arkbuilders.navigator.ui.view.StackedToasts +import dev.arkbuilders.navigator.utils.FullscreenHelper +import dev.arkbuilders.navigator.utils.LogTags.FOLDERS_SCREEN import java.nio.file.Path import kotlin.io.path.Path diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/GalleryFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/GalleryFragment.kt index 29f7743a..bfe68b31 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/GalleryFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/GalleryFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments +package dev.arkbuilders.navigator.ui.fragments import android.annotation.SuppressLint import android.content.ActivityNotFoundException @@ -26,33 +26,33 @@ import kotlinx.coroutines.launch import moxy.MvpAppCompatFragment import moxy.ktx.moxyPresenter import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arknavigator.BuildConfig -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.FragmentGalleryBinding -import space.taran.arknavigator.databinding.PopupGalleryTagMenuBinding +import dev.arkbuilders.navigator.BuildConfig +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.FragmentGalleryBinding +import dev.arkbuilders.navigator.databinding.PopupGalleryTagMenuBinding import space.taran.arklib.ResourceId import space.taran.arklib.domain.index.Resource import space.taran.arklib.domain.meta.Metadata -import space.taran.arknavigator.mvp.presenter.GalleryPresenter -import space.taran.arknavigator.mvp.view.GalleryView -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.ui.activity.MainActivity -import space.taran.arknavigator.ui.adapter.previewpager.PreviewsPager -import space.taran.arknavigator.ui.extra.ExtraLoader -import space.taran.arknavigator.ui.fragments.dialog.DetailsAlertDialog -import space.taran.arknavigator.ui.fragments.dialog.EditTagsDialogFragment -import space.taran.arknavigator.ui.view.DefaultPopup -import space.taran.arknavigator.ui.view.DepthPageTransformer -import space.taran.arknavigator.ui.view.StackedToasts -import space.taran.arknavigator.utils.FullscreenHelper -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.Tags -import space.taran.arknavigator.utils.Score +import dev.arkbuilders.navigator.mvp.presenter.GalleryPresenter +import dev.arkbuilders.navigator.mvp.view.GalleryView +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.ui.activity.MainActivity +import dev.arkbuilders.navigator.ui.adapter.previewpager.PreviewsPager +import dev.arkbuilders.navigator.ui.extra.ExtraLoader +import dev.arkbuilders.navigator.ui.fragments.dialog.DetailsAlertDialog +import dev.arkbuilders.navigator.ui.fragments.dialog.EditTagsDialogFragment +import dev.arkbuilders.navigator.ui.view.DefaultPopup +import dev.arkbuilders.navigator.ui.view.DepthPageTransformer +import dev.arkbuilders.navigator.ui.view.StackedToasts +import dev.arkbuilders.navigator.utils.FullscreenHelper +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.Tags +import dev.arkbuilders.navigator.utils.Score import space.taran.arklib.utils.extension -import space.taran.arknavigator.ui.fragments.dialog.StorageCorruptionNotificationDialogFragment -import space.taran.arknavigator.utils.LogTags.GALLERY_SCREEN -import space.taran.arknavigator.utils.extensions.makeGone -import space.taran.arknavigator.utils.extensions.makeVisible +import dev.arkbuilders.navigator.ui.fragments.dialog.StorageCorruptionNotificationDialogFragment +import dev.arkbuilders.navigator.utils.LogTags.GALLERY_SCREEN +import dev.arkbuilders.navigator.utils.extensions.makeGone +import dev.arkbuilders.navigator.utils.extensions.makeVisible import timber.log.Timber import java.nio.file.Path import kotlin.system.measureTimeMillis diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragment.kt index c42909c7..1f4938d6 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments +package dev.arkbuilders.navigator.ui.fragments import android.content.Intent import android.os.Bundle @@ -25,29 +25,29 @@ import moxy.presenterScope import space.taran.arkfilepicker.folders.RootAndFav import space.taran.arkfilepicker.presentation.onArkPathPicked import space.taran.arklib.ResourceId -import space.taran.arknavigator.BuildConfig -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.FragmentResourcesBinding -import space.taran.arknavigator.mvp.presenter.ResourcesPresenter -import space.taran.arknavigator.mvp.presenter.adapter.tagsselector.QueryMode -import space.taran.arknavigator.mvp.view.ResourcesView -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.ui.activity.MainActivity -import space.taran.arknavigator.ui.adapter.ResourcesRVAdapter -import space.taran.arknavigator.ui.adapter.TagsSelectorAdapter -import space.taran.arknavigator.ui.fragments.dialog.ConfirmationDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.StorageCorruptionNotificationDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.SortDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.TagsSortDialogFragment -import space.taran.arknavigator.ui.fragments.utils.toast -import space.taran.arknavigator.ui.fragments.utils.toastFailedPaths -import space.taran.arknavigator.ui.view.StackedToasts -import space.taran.arknavigator.utils.FullscreenHelper -import space.taran.arknavigator.utils.LogTags.RESOURCES_SCREEN -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.extensions.closeKeyboard -import space.taran.arknavigator.utils.extensions.placeCursorToEnd -import space.taran.arknavigator.utils.extensions.showKeyboard +import dev.arkbuilders.navigator.BuildConfig +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.FragmentResourcesBinding +import dev.arkbuilders.navigator.mvp.presenter.ResourcesPresenter +import dev.arkbuilders.navigator.mvp.presenter.adapter.tagsselector.QueryMode +import dev.arkbuilders.navigator.mvp.view.ResourcesView +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.ui.activity.MainActivity +import dev.arkbuilders.navigator.ui.adapter.ResourcesRVAdapter +import dev.arkbuilders.navigator.ui.adapter.TagsSelectorAdapter +import dev.arkbuilders.navigator.ui.fragments.dialog.ConfirmationDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.StorageCorruptionNotificationDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.SortDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.TagsSortDialogFragment +import dev.arkbuilders.navigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.ui.fragments.utils.toastFailedPaths +import dev.arkbuilders.navigator.ui.view.StackedToasts +import dev.arkbuilders.navigator.utils.FullscreenHelper +import dev.arkbuilders.navigator.utils.LogTags.RESOURCES_SCREEN +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.extensions.closeKeyboard +import dev.arkbuilders.navigator.utils.extensions.placeCursorToEnd +import dev.arkbuilders.navigator.utils.extensions.showKeyboard import java.nio.file.Path import kotlin.io.path.Path import kotlin.math.abs diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragmentHelper.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragmentHelper.kt index e80a4bda..2ac01858 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragmentHelper.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/ResourcesFragmentHelper.kt @@ -1,16 +1,16 @@ -package space.taran.arknavigator.ui.fragments +package dev.arkbuilders.navigator.ui.fragments 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 space.taran.arknavigator.R -import space.taran.arknavigator.databinding.PopupSelectedResourcesActionsBinding -import space.taran.arknavigator.ui.fragments.dialog.ConfirmationDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.EditTagsDialogFragment -import space.taran.arknavigator.ui.fragments.utils.toast -import space.taran.arknavigator.ui.view.DefaultPopup +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.PopupSelectedResourcesActionsBinding +import dev.arkbuilders.navigator.ui.fragments.dialog.ConfirmationDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.EditTagsDialogFragment +import dev.arkbuilders.navigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.ui.view.DefaultPopup fun ResourcesFragment.setupAndShowSelectedResourcesMenu(menuBtn: View) { val menuBinding = PopupSelectedResourcesActionsBinding diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/SettingsFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/SettingsFragment.kt index 44297aca..f02a3d69 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/SettingsFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/SettingsFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments +package dev.arkbuilders.navigator.ui.fragments import android.content.Context import android.os.Bundle @@ -17,19 +17,19 @@ import com.mikepenz.fastadapter.adapters.ItemAdapter import com.mikepenz.fastadapter.binding.AbstractBindingItem import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.FragmentSettingsBinding -import space.taran.arknavigator.databinding.ItemBooleanPreferenceBinding -import space.taran.arknavigator.mvp.model.repo.preferences.PreferenceKey -import space.taran.arknavigator.mvp.model.repo.preferences.Preferences -import space.taran.arknavigator.navigation.AppRouter -import space.taran.arknavigator.navigation.Screens -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.ui.activity.MainActivity -import space.taran.arknavigator.ui.fragments.dialog.ConfirmationDialogFragment -import space.taran.arknavigator.ui.fragments.dialog.InfoDialogFragment -import space.taran.arknavigator.ui.fragments.utils.toast -import space.taran.arknavigator.utils.LogTags.SETTINGS_SCREEN +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.FragmentSettingsBinding +import dev.arkbuilders.navigator.databinding.ItemBooleanPreferenceBinding +import dev.arkbuilders.navigator.mvp.model.repo.preferences.PreferenceKey +import dev.arkbuilders.navigator.mvp.model.repo.preferences.Preferences +import dev.arkbuilders.navigator.navigation.AppRouter +import dev.arkbuilders.navigator.navigation.Screens +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.ui.activity.MainActivity +import dev.arkbuilders.navigator.ui.fragments.dialog.ConfirmationDialogFragment +import dev.arkbuilders.navigator.ui.fragments.dialog.InfoDialogFragment +import dev.arkbuilders.navigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.utils.LogTags.SETTINGS_SCREEN import javax.inject.Inject class SettingsFragment : Fragment(R.layout.fragment_settings) { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/ConfirmationDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/ConfirmationDialogFragment.kt index f2d74f30..aa0a100d 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/ConfirmationDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/ConfirmationDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -13,8 +13,8 @@ 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 space.taran.arknavigator.databinding.DialogInfoBinding -import space.taran.arknavigator.utils.extensions.textOrGone +import dev.arkbuilders.navigator.databinding.DialogInfoBinding +import dev.arkbuilders.navigator.utils.extensions.textOrGone class ConfirmationDialogFragment : DialogFragment() { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/DetailsAlertDialog.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/DetailsAlertDialog.kt index fb634696..df8427c7 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/DetailsAlertDialog.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/DetailsAlertDialog.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.app.Dialog import android.content.Context @@ -8,11 +8,11 @@ import android.graphics.drawable.InsetDrawable import android.os.Bundle import android.view.WindowManager import org.apache.commons.io.FileUtils -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.DialogResourceInfoBinding +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 space.taran.arknavigator.ui.extra.ExtraLoader +import dev.arkbuilders.navigator.ui.extra.ExtraLoader import java.nio.file.Path import kotlin.io.path.absolutePathString diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/EditTagsDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/EditTagsDialogFragment.kt index cd01bcbe..05d1a8d8 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/EditTagsDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/EditTagsDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -20,19 +20,19 @@ import kotlinx.coroutines.launch import moxy.MvpAppCompatDialogFragment import moxy.ktx.moxyPresenter import space.taran.arkfilepicker.folders.RootAndFav -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.DialogEditTagsBinding +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.DialogEditTagsBinding import space.taran.arklib.ResourceId import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arknavigator.mvp.model.repo.stats.StatsStorage -import space.taran.arknavigator.mvp.model.repo.tags.TagsStorage -import space.taran.arknavigator.mvp.presenter.dialog.EditTagsDialogPresenter -import space.taran.arknavigator.mvp.view.dialog.EditTagsDialogView -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.utils.Tag -import space.taran.arknavigator.utils.Tags -import space.taran.arknavigator.utils.extensions.placeCursorToEnd -import space.taran.arknavigator.utils.extensions.showKeyboard +import dev.arkbuilders.navigator.mvp.model.repo.stats.StatsStorage +import dev.arkbuilders.navigator.mvp.model.repo.tags.TagsStorage +import dev.arkbuilders.navigator.mvp.presenter.dialog.EditTagsDialogPresenter +import dev.arkbuilders.navigator.mvp.view.dialog.EditTagsDialogView +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.utils.Tag +import dev.arkbuilders.navigator.utils.Tags +import dev.arkbuilders.navigator.utils.extensions.placeCursorToEnd +import dev.arkbuilders.navigator.utils.extensions.showKeyboard class EditTagsDialogFragment( private val index: ResourceIndex? = null, diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/InfoDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/InfoDialogFragment.kt index 256b428b..0dcc57a6 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/InfoDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/InfoDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -8,7 +8,7 @@ import android.view.View import android.view.ViewGroup import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment -import space.taran.arknavigator.databinding.DialogInfoBinding +import dev.arkbuilders.navigator.databinding.DialogInfoBinding class InfoDialogFragment : DialogFragment() { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootPickerDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootPickerDialogFragment.kt index 9296984a..59cd434b 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootPickerDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootPickerDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.content.Context import androidx.core.os.bundleOf @@ -10,7 +10,7 @@ import kotlinx.coroutines.launch import space.taran.arkfilepicker.ArkFilePickerConfig import space.taran.arkfilepicker.folders.FoldersRepo import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment -import space.taran.arknavigator.ui.App +import dev.arkbuilders.navigator.ui.App import java.nio.file.Path import javax.inject.Inject import kotlin.io.path.Path diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootsScanDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootsScanDialogFragment.kt index fe834e68..dab4b2e4 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootsScanDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/RootsScanDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.os.Bundle import android.view.LayoutInflater @@ -7,11 +7,11 @@ import android.view.ViewGroup import androidx.fragment.app.setFragmentResult import moxy.MvpBottomSheetDialogFragment import moxy.ktx.moxyPresenter -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.DialogRootsScanBinding -import space.taran.arknavigator.mvp.presenter.dialog.RootsScanDialogPresenter -import space.taran.arknavigator.mvp.view.dialog.RootsScanView -import space.taran.arknavigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.DialogRootsScanBinding +import dev.arkbuilders.navigator.mvp.presenter.dialog.RootsScanDialogPresenter +import dev.arkbuilders.navigator.mvp.view.dialog.RootsScanView +import dev.arkbuilders.navigator.ui.fragments.utils.toast import java.nio.file.Path class RootsScanDialogFragment : MvpBottomSheetDialogFragment(), RootsScanView { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/SortDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/SortDialogFragment.kt index 0c95fb02..2b5b6422 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/SortDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/SortDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -9,14 +9,14 @@ import android.view.View import android.view.ViewGroup import moxy.MvpAppCompatDialogFragment import moxy.ktx.moxyPresenter -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.DialogSortBinding -import space.taran.arknavigator.mvp.presenter.dialog.SortDialogPresenter -import space.taran.arknavigator.mvp.view.dialog.SortDialogView -import space.taran.arknavigator.ui.App -import space.taran.arknavigator.ui.fragments.utils.toast -import space.taran.arknavigator.utils.LogTags.RESOURCES_SCREEN -import space.taran.arknavigator.utils.Sorting +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.DialogSortBinding +import dev.arkbuilders.navigator.mvp.presenter.dialog.SortDialogPresenter +import dev.arkbuilders.navigator.mvp.view.dialog.SortDialogView +import dev.arkbuilders.navigator.ui.App +import dev.arkbuilders.navigator.ui.fragments.utils.toast +import dev.arkbuilders.navigator.utils.LogTags.RESOURCES_SCREEN +import dev.arkbuilders.navigator.utils.Sorting class SortDialogFragment : MvpAppCompatDialogFragment(), SortDialogView { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/StorageCorruptionNotificationDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/StorageCorruptionNotificationDialogFragment.kt index 96678131..9a23cab9 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/StorageCorruptionNotificationDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/StorageCorruptionNotificationDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.graphics.Color.TRANSPARENT import android.graphics.drawable.ColorDrawable @@ -9,8 +9,8 @@ import android.view.ViewGroup import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.DialogNotificationBinding +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.DialogNotificationBinding class StorageCorruptionNotificationDialogFragment : DialogFragment() { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/TagsSortDialogFragment.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/TagsSortDialogFragment.kt index 06d9e037..dc38e69b 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/TagsSortDialogFragment.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/dialog/TagsSortDialogFragment.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.fragments.dialog +package dev.arkbuilders.navigator.ui.fragments.dialog import android.content.Context import android.graphics.Color @@ -11,14 +11,14 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import by.kirich1409.viewbindingdelegate.viewBinding import org.orbitmvi.orbit.viewmodel.observe -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.DialogTagsSortBinding -import space.taran.arknavigator.mvp.presenter.dialog.TagsSortSideEffect -import space.taran.arknavigator.mvp.presenter.dialog.TagsSortState -import space.taran.arknavigator.mvp.presenter.dialog.TagsSortViewModel -import space.taran.arknavigator.mvp.presenter.dialog.TagsSortViewModelFactory -import space.taran.arknavigator.mvp.presenter.dialog.TagsSorting -import space.taran.arknavigator.ui.App +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.DialogTagsSortBinding +import dev.arkbuilders.navigator.mvp.presenter.dialog.TagsSortSideEffect +import dev.arkbuilders.navigator.mvp.presenter.dialog.TagsSortState +import dev.arkbuilders.navigator.mvp.presenter.dialog.TagsSortViewModel +import dev.arkbuilders.navigator.mvp.presenter.dialog.TagsSortViewModelFactory +import dev.arkbuilders.navigator.mvp.presenter.dialog.TagsSorting +import dev.arkbuilders.navigator.ui.App import javax.inject.Inject class TagsSortDialogFragment : DialogFragment(R.layout.dialog_tags_sort) { diff --git a/app/src/main/java/space/taran/arknavigator/ui/fragments/utils/ToastUtils.kt b/app/src/main/java/space/taran/arknavigator/ui/fragments/utils/ToastUtils.kt index 6dbb47c1..56ef24ac 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/fragments/utils/ToastUtils.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/fragments/utils/ToastUtils.kt @@ -1,10 +1,10 @@ -package space.taran.arknavigator.ui.fragments.utils +package dev.arkbuilders.navigator.ui.fragments.utils import android.content.Context import android.widget.Toast import androidx.annotation.StringRes import androidx.fragment.app.Fragment -import space.taran.arknavigator.R +import dev.arkbuilders.navigator.R import java.nio.file.Path fun Context.toast( diff --git a/app/src/main/java/space/taran/arknavigator/ui/resource/StringProvider.kt b/app/src/main/java/space/taran/arknavigator/ui/resource/StringProvider.kt index db41bda8..2e73d9d8 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/resource/StringProvider.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/resource/StringProvider.kt @@ -1,8 +1,8 @@ -package space.taran.arknavigator.ui.resource +package dev.arkbuilders.navigator.ui.resource import android.content.Context import androidx.annotation.StringRes -import space.taran.arknavigator.R +import dev.arkbuilders.navigator.R import space.taran.arklib.domain.meta.Kind class StringProvider(private val context: Context) { diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/DefaultPopup.kt b/app/src/main/java/space/taran/arknavigator/ui/view/DefaultPopup.kt index c3832493..e637bbef 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/DefaultPopup.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/DefaultPopup.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.graphics.Rect import android.view.Gravity @@ -9,7 +9,7 @@ import androidx.annotation.DrawableRes import androidx.annotation.StyleRes import androidx.core.content.res.ResourcesCompat import androidx.viewbinding.ViewBinding -import space.taran.arknavigator.utils.dpToPx +import dev.arkbuilders.navigator.utils.dpToPx class DefaultPopup( val binding: ViewBinding, diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/DepthPageTransformer.kt b/app/src/main/java/space/taran/arknavigator/ui/view/DepthPageTransformer.kt index 6160610a..e9b73b7f 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/DepthPageTransformer.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/DepthPageTransformer.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.view.View import androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/KeyListenEditText.kt b/app/src/main/java/space/taran/arknavigator/ui/view/KeyListenEditText.kt index d87d6ee9..fcf3ce4f 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/KeyListenEditText.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/KeyListenEditText.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/LoadingTextView.kt b/app/src/main/java/space/taran/arknavigator/ui/view/LoadingTextView.kt index 7f33d876..3ab160fc 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/LoadingTextView.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/LoadingTextView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.content.Context import android.os.Handler diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/StackedToasts.kt b/app/src/main/java/space/taran/arknavigator/ui/view/StackedToasts.kt index fc27300a..4552611e 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/StackedToasts.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/StackedToasts.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.content.Context import android.view.LayoutInflater @@ -19,8 +19,8 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import space.taran.arknavigator.R -import space.taran.arknavigator.databinding.ItemToastBinding +import dev.arkbuilders.navigator.R +import dev.arkbuilders.navigator.databinding.ItemToastBinding import space.taran.arklib.utils.tickerFlow import space.taran.arklib.utils.tryUnlock import java.nio.file.Path diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/StackedToastsRecyclerView.kt b/app/src/main/java/space/taran/arknavigator/ui/view/StackedToastsRecyclerView.kt index 02980003..67d674a9 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/StackedToastsRecyclerView.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/StackedToastsRecyclerView.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/space/taran/arknavigator/ui/view/UserSwitchMaterial.kt b/app/src/main/java/space/taran/arknavigator/ui/view/UserSwitchMaterial.kt index dfd5f0a4..37d5d53c 100644 --- a/app/src/main/java/space/taran/arknavigator/ui/view/UserSwitchMaterial.kt +++ b/app/src/main/java/space/taran/arknavigator/ui/view/UserSwitchMaterial.kt @@ -1,11 +1,11 @@ -package space.taran.arknavigator.ui.view +package dev.arkbuilders.navigator.ui.view import android.content.Context import android.util.AttributeSet import android.util.Log import android.widget.CompoundButton import com.google.android.material.switchmaterial.SwitchMaterial -import space.taran.arknavigator.utils.LogTags.SETTINGS_SCREEN +import dev.arkbuilders.navigator.utils.LogTags.SETTINGS_SCREEN class UserSwitchMaterial( context: Context, diff --git a/app/src/main/java/space/taran/arknavigator/utils/ComparatorUtils.kt b/app/src/main/java/space/taran/arknavigator/utils/ComparatorUtils.kt index 84be2d17..96ff3e85 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/ComparatorUtils.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/ComparatorUtils.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils // can be used with `toSortedMap` method which glues together values if they have equal keys // this method mocks makes comparators to return 0 only if objects are referentially equal diff --git a/app/src/main/java/space/taran/arknavigator/utils/ContextUtils.kt b/app/src/main/java/space/taran/arknavigator/utils/ContextUtils.kt index 469c782f..122c61fa 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/ContextUtils.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/ContextUtils.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils import android.content.Context import android.util.TypedValue diff --git a/app/src/main/java/space/taran/arknavigator/utils/FileUtils.kt b/app/src/main/java/space/taran/arknavigator/utils/FileUtils.kt index 6b1461e6..567e5ab9 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/FileUtils.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/FileUtils.kt @@ -1,7 +1,7 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils -import space.taran.arknavigator.mvp.presenter.adapter.ResourceItem -import space.taran.arknavigator.ui.App +import dev.arkbuilders.navigator.mvp.presenter.adapter.ResourceItem +import dev.arkbuilders.navigator.ui.App import java.nio.file.Path import java.nio.file.Paths import kotlin.io.path.exists diff --git a/app/src/main/java/space/taran/arknavigator/utils/FullscreenHelper.kt b/app/src/main/java/space/taran/arknavigator/utils/FullscreenHelper.kt index 0b229c18..5ec2686a 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/FullscreenHelper.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/FullscreenHelper.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils import android.os.Build import android.view.Window diff --git a/app/src/main/java/space/taran/arknavigator/utils/LogTags.kt b/app/src/main/java/space/taran/arknavigator/utils/LogTags.kt index e3ed280b..e077eee5 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/LogTags.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/LogTags.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils object LogTags { const val MAIN: String = "main" diff --git a/app/src/main/java/space/taran/arknavigator/utils/Popularity.kt b/app/src/main/java/space/taran/arknavigator/utils/Popularity.kt index 9bc5ed57..d9857614 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/Popularity.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/Popularity.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils class Popularity { companion object { diff --git a/app/src/main/java/space/taran/arknavigator/utils/Score.kt b/app/src/main/java/space/taran/arknavigator/utils/Score.kt index 71cdad10..f687cb93 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/Score.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/Score.kt @@ -1,3 +1,3 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils typealias Score = Int diff --git a/app/src/main/java/space/taran/arknavigator/utils/Tags.kt b/app/src/main/java/space/taran/arknavigator/utils/Tags.kt index a46204cd..da4eea2a 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/Tags.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/Tags.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils +package dev.arkbuilders.navigator.utils typealias Tag = String diff --git a/app/src/main/java/space/taran/arknavigator/utils/extensions/EditTextExt.kt b/app/src/main/java/space/taran/arknavigator/utils/extensions/EditTextExt.kt index cfbaf070..d0d839d6 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/extensions/EditTextExt.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/extensions/EditTextExt.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils.extensions +package dev.arkbuilders.navigator.utils.extensions import android.view.inputmethod.InputMethodManager import android.widget.EditText diff --git a/app/src/main/java/space/taran/arknavigator/utils/extensions/ViewExt.kt b/app/src/main/java/space/taran/arknavigator/utils/extensions/ViewExt.kt index 6961fac9..7fb4f546 100644 --- a/app/src/main/java/space/taran/arknavigator/utils/extensions/ViewExt.kt +++ b/app/src/main/java/space/taran/arknavigator/utils/extensions/ViewExt.kt @@ -1,4 +1,4 @@ -package space.taran.arknavigator.utils.extensions +package dev.arkbuilders.navigator.utils.extensions import android.view.View import android.widget.TextView @@ -10,7 +10,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob -import space.taran.arknavigator.R +import dev.arkbuilders.navigator.R fun View.changeEnabledStatus(isEnabledStatus: Boolean) { isEnabled = isEnabledStatus diff --git a/app/src/main/res/layout/dialog_edit_tags.xml b/app/src/main/res/layout/dialog_edit_tags.xml index 6bf8d3c5..281728df 100644 --- a/app/src/main/res/layout/dialog_edit_tags.xml +++ b/app/src/main/res/layout/dialog_edit_tags.xml @@ -94,7 +94,7 @@ android:layout_height="wrap_content" android:visibility="invisible" /> - - - - - - - - -