Rename package from space.taran to dev.arkbuilders (#36)

Also update `arklib` and `arkfilepicker` versions
ARK-Builders · Nov 3, 2023 · be78e26 · be78e26
1 parent 02c20c2
commit be78e26
Show file tree

Hide file tree

Showing 28 changed files with 94 additions and 106 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     compileSdk 32
 
     defaultConfig {
-        applicationId "space.taran.arkshelf"
+        applicationId "dev.arkbuilders.arkshelf"
         minSdk 26
         targetSdk 32
         versionCode 1
@@ -67,7 +67,7 @@ android {
 }
 
 dependencies {
-    implementation "space.taran:arklib:0.1.0-SNAPSHOT-f81e34a657"
+    implementation "dev.arkbuilders:arklib:0.3.3"
 
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
@@ -90,7 +90,7 @@ dependencies {
     implementation "org.orbit-mvi:orbit-viewmodel:4.3.2"
     implementation "com.ericktijerou.koleton:koleton:1.0.0-beta01"
 
-    implementation 'com.github.ARK-Builders:ark-filepicker:c6d66141c1'
+    implementation 'dev.arkbuilders:arkfilepicker:0.1.1'
 
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/...taran/arkshelf/ExampleInstrumentedTest.kt → ...lders/arkshelf/ExampleInstrumentedTest.kt b/...taran/arkshelf/ExampleInstrumentedTest.kt → ...lders/arkshelf/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf
+package dev.arkbuilders.arkshelf
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("space.taran.arkshelf", appContext.packageName)
+        assertEquals("dev.arkbuilders.arkshelf", appContext.packageName)
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="space.taran.arkshelf">
+    package="dev.arkbuilders.arkshelf">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/...aran/arkshelf/data/LinkLocalDataSource.kt → ...ders/arkshelf/data/LinkLocalDataSource.kt b/...aran/arkshelf/data/LinkLocalDataSource.kt → ...ders/arkshelf/data/LinkLocalDataSource.kt
@@ -1,17 +1,17 @@
-package space.taran.arkshelf.data
+package dev.arkbuilders.arkshelf.data
 
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.withContext
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arklib.arkFolder
-import space.taran.arklib.arkPreviews
-import space.taran.arklib.getLinkHash
-import space.taran.arklib.loadLinkFile
-import space.taran.arkshelf.domain.Link
-import space.taran.arkshelf.domain.UserPreferences
-import space.taran.arkshelf.presentation.listChildren
+import dev.arkbuilders.arklib.arkFolder
+import dev.arkbuilders.arklib.arkPreviews
+import dev.arkbuilders.arklib.getLinkHash
+import dev.arkbuilders.arklib.loadLinkFile
+import dev.arkbuilders.arkshelf.domain.Link
+import dev.arkbuilders.arkshelf.domain.UserPreferences
+import dev.arkbuilders.arkshelf.presentation.listChildren
 import timber.log.Timber
 import java.nio.file.Path
 import javax.inject.Inject
@@ -21,7 +21,7 @@ import kotlin.io.path.exists
 import kotlin.io.path.extension
 import kotlin.io.path.getLastModifiedTime
 import kotlin.io.path.isDirectory
-import space.taran.arklib.createLinkFile as createLinkFileN
+import dev.arkbuilders.arklib.createLinkFile as createLinkFileN
 
 
 class LinkLocalDataSource @Inject constructor(

diff --git a/...ran/arkshelf/data/LinkRemoteDataSource.kt → ...ers/arkshelf/data/LinkRemoteDataSource.kt b/...ran/arkshelf/data/LinkRemoteDataSource.kt → ...ers/arkshelf/data/LinkRemoteDataSource.kt
@@ -1,10 +1,10 @@
-package space.taran.arkshelf.data
+package dev.arkbuilders.arkshelf.data
 
 import android.content.Context
 import android.graphics.Bitmap
 import com.bumptech.glide.Glide
-import space.taran.arklib.fetchLinkData
-import space.taran.arkshelf.domain.Link
+import dev.arkbuilders.arklib.fetchLinkData
+import dev.arkbuilders.arkshelf.domain.Link
 import java.nio.file.Path
 import javax.inject.Inject
 import kotlin.io.path.createTempFile

diff --git a/...space/taran/arkshelf/data/LinkRepoImpl.kt → ...arkbuilders/arkshelf/data/LinkRepoImpl.kt b/...space/taran/arkshelf/data/LinkRepoImpl.kt → ...arkbuilders/arkshelf/data/LinkRepoImpl.kt
@@ -1,11 +1,11 @@
-package space.taran.arkshelf.data
+package dev.arkbuilders.arkshelf.data
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import space.taran.arkshelf.data.network.NetworkStatus
-import space.taran.arkshelf.domain.Link
-import space.taran.arkshelf.domain.LinkRepo
-import space.taran.arkshelf.domain.NoInternetException
+import dev.arkbuilders.arkshelf.data.network.NetworkStatus
+import dev.arkbuilders.arkshelf.domain.Link
+import dev.arkbuilders.arkshelf.domain.LinkRepo
+import dev.arkbuilders.arkshelf.domain.NoInternetException
 import java.nio.file.Path
 import javax.inject.Inject
 

diff --git a/...aran/arkshelf/data/UserPreferencesImpl.kt → ...ders/arkshelf/data/UserPreferencesImpl.kt b/...aran/arkshelf/data/UserPreferencesImpl.kt → ...ders/arkshelf/data/UserPreferencesImpl.kt
@@ -1,8 +1,7 @@
-package space.taran.arkshelf.data
+package dev.arkbuilders.arkshelf.data
 
 import android.content.Context
-import android.os.Environment
-import space.taran.arkshelf.domain.UserPreferences
+import dev.arkbuilders.arkshelf.domain.UserPreferences
 import java.nio.file.Path
 import javax.inject.Inject
 import kotlin.io.path.Path

diff --git a/...an/arkshelf/data/network/NetworkStatus.kt → ...rs/arkshelf/data/network/NetworkStatus.kt b/...an/arkshelf/data/network/NetworkStatus.kt → ...rs/arkshelf/data/network/NetworkStatus.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.data.network
+package dev.arkbuilders.arkshelf.data.network
 
 interface NetworkStatus {
     fun isOnline(): Boolean

diff --git a/...rkshelf/data/network/NetworkStatusImpl.kt → ...rkshelf/data/network/NetworkStatusImpl.kt b/...rkshelf/data/network/NetworkStatusImpl.kt → ...rkshelf/data/network/NetworkStatusImpl.kt
@@ -1,10 +1,9 @@
-package space.taran.arkshelf.data.network
+package dev.arkbuilders.arkshelf.data.network
 
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
 import android.os.Build
 import javax.inject.Inject
 

diff --git a/...a/space/taran/arkshelf/di/AppComponent.kt → ...v/arkbuilders/arkshelf/di/AppComponent.kt b/...a/space/taran/arkshelf/di/AppComponent.kt → ...v/arkbuilders/arkshelf/di/AppComponent.kt
@@ -1,12 +1,12 @@
-package space.taran.arkshelf.di
+package dev.arkbuilders.arkshelf.di
 
 import android.app.Application
 import android.content.Context
 import dagger.BindsInstance
 import dagger.Component
-import space.taran.arkshelf.di.module.RepoModule
-import space.taran.arkshelf.presentation.searchedit.SearchEditFragment
-import space.taran.arkshelf.presentation.settings.SettingsFragment
+import dev.arkbuilders.arkshelf.di.module.RepoModule
+import dev.arkbuilders.arkshelf.presentation.searchedit.SearchEditFragment
+import dev.arkbuilders.arkshelf.presentation.settings.SettingsFragment
 import javax.inject.Singleton
 
 @Singleton

diff --git a/...java/space/taran/arkshelf/di/DIManager.kt → .../dev/arkbuilders/arkshelf/di/DIManager.kt b/...java/space/taran/arkshelf/di/DIManager.kt → .../dev/arkbuilders/arkshelf/di/DIManager.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.di
+package dev.arkbuilders.arkshelf.di
 
 import android.app.Application
 

diff --git a/...ce/taran/arkshelf/di/module/RepoModule.kt → ...builders/arkshelf/di/module/RepoModule.kt b/...ce/taran/arkshelf/di/module/RepoModule.kt → ...builders/arkshelf/di/module/RepoModule.kt
@@ -1,13 +1,13 @@
-package space.taran.arkshelf.di.module
+package dev.arkbuilders.arkshelf.di.module
 
 import dagger.Binds
 import dagger.Module
-import space.taran.arkshelf.data.LinkRepoImpl
-import space.taran.arkshelf.data.UserPreferencesImpl
-import space.taran.arkshelf.data.network.NetworkStatus
-import space.taran.arkshelf.data.network.NetworkStatusImpl
-import space.taran.arkshelf.domain.LinkRepo
-import space.taran.arkshelf.domain.UserPreferences
+import dev.arkbuilders.arkshelf.data.LinkRepoImpl
+import dev.arkbuilders.arkshelf.data.UserPreferencesImpl
+import dev.arkbuilders.arkshelf.data.network.NetworkStatus
+import dev.arkbuilders.arkshelf.data.network.NetworkStatusImpl
+import dev.arkbuilders.arkshelf.domain.LinkRepo
+import dev.arkbuilders.arkshelf.domain.UserPreferences
 import javax.inject.Singleton
 
 @Module

diff --git a/.../java/space/taran/arkshelf/domain/Link.kt → ...a/dev/arkbuilders/arkshelf/domain/Link.kt b/.../java/space/taran/arkshelf/domain/Link.kt → ...a/dev/arkbuilders/arkshelf/domain/Link.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.domain
+package dev.arkbuilders.arkshelf.domain
 
 import java.nio.file.Path
 

diff --git a/...a/space/taran/arkshelf/domain/LinkRepo.kt → ...v/arkbuilders/arkshelf/domain/LinkRepo.kt b/...a/space/taran/arkshelf/domain/LinkRepo.kt → ...v/arkbuilders/arkshelf/domain/LinkRepo.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.domain
+package dev.arkbuilders.arkshelf.domain
 
 import java.nio.file.Path
 

diff --git a/app/src/main/java/dev/arkbuilders/arkshelf/domain/NoInternetException.kt b/app/src/main/java/dev/arkbuilders/arkshelf/domain/NoInternetException.kt
@@ -0,0 +1,3 @@
+package dev.arkbuilders.arkshelf.domain
+
+class NoInternetException: Exception()
diff --git a/.../taran/arkshelf/domain/UserPreferences.kt → ...ilders/arkshelf/domain/UserPreferences.kt b/.../taran/arkshelf/domain/UserPreferences.kt → ...ilders/arkshelf/domain/UserPreferences.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.domain
+package dev.arkbuilders.arkshelf.domain
 
 import java.nio.file.Path
 

diff --git a/.../space/taran/arkshelf/presentation/App.kt → .../arkbuilders/arkshelf/presentation/App.kt b/.../space/taran/arkshelf/presentation/App.kt → .../arkbuilders/arkshelf/presentation/App.kt
@@ -1,13 +1,10 @@
-package space.taran.arkshelf.presentation
+package dev.arkbuilders.arkshelf.presentation
 
 import android.app.Application
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import space.taran.arkfilepicker.folders.FoldersRepo
-import space.taran.arklib.initArkLib
-import space.taran.arklib.initRustLogger
-import space.taran.arkshelf.di.DIManager
+import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
+import dev.arkbuilders.arklib.initArkLib
+import dev.arkbuilders.arklib.initRustLogger
+import dev.arkbuilders.arkshelf.di.DIManager
 import timber.log.Timber
 
 class App : Application() {

diff --git a/...ce/taran/arkshelf/presentation/LogTags.kt → ...builders/arkshelf/presentation/LogTags.kt b/...ce/taran/arkshelf/presentation/LogTags.kt → ...builders/arkshelf/presentation/LogTags.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.presentation
+package dev.arkbuilders.arkshelf.presentation
 
 object LogTags {
     const val OKHTTP: String = "okhttp"

diff --git a/...presentation/RelaxedTransitionListener.kt → ...presentation/RelaxedTransitionListener.kt b/...presentation/RelaxedTransitionListener.kt → ...presentation/RelaxedTransitionListener.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.presentation
+package dev.arkbuilders.arkshelf.presentation
 
 import androidx.constraintlayout.motion.widget.MotionLayout
 

diff --git a/...pace/taran/arkshelf/presentation/Utils.kt → ...rkbuilders/arkshelf/presentation/Utils.kt b/...pace/taran/arkshelf/presentation/Utils.kt → ...rkbuilders/arkshelf/presentation/Utils.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.presentation
+package dev.arkbuilders.arkshelf.presentation
 
 import android.Manifest
 import android.content.Intent
@@ -18,12 +18,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import space.taran.arkshelf.BuildConfig
-import space.taran.arkshelf.R
-import space.taran.arkshelf.presentation.main.MainActivity
+import dev.arkbuilders.arkshelf.BuildConfig
+import dev.arkbuilders.arkshelf.presentation.main.MainActivity
 import java.nio.file.Path
 import java.nio.file.Paths
-import java.text.DecimalFormat
 import kotlin.coroutines.CoroutineContext
 import kotlin.io.path.Path
 import kotlin.io.path.isHidden

diff --git a/...rkshelf/presentation/main/MainActivity.kt → ...rkshelf/presentation/main/MainActivity.kt b/...rkshelf/presentation/main/MainActivity.kt → ...rkshelf/presentation/main/MainActivity.kt
@@ -1,15 +1,13 @@
-package space.taran.arkshelf.presentation.main
+package dev.arkbuilders.arkshelf.presentation.main
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import by.kirich1409.viewbindingdelegate.viewBinding
-import space.taran.arklib.initRustLogger
-import space.taran.arkshelf.R
-import space.taran.arkshelf.databinding.ActivityMainBinding
-import space.taran.arkshelf.presentation.searchedit.SearchEditFragment
-import space.taran.arkshelf.presentation.settings.SettingsFragment
+import dev.arkbuilders.arkshelf.R
+import dev.arkbuilders.arkshelf.databinding.ActivityMainBinding
+import dev.arkbuilders.arkshelf.presentation.searchedit.SearchEditFragment
+import dev.arkbuilders.arkshelf.presentation.settings.SettingsFragment
 
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
     private val binding by viewBinding(ActivityMainBinding::bind)

diff --git a/...resentation/searchedit/LinkListAdapter.kt → ...resentation/searchedit/LinkListAdapter.kt b/...resentation/searchedit/LinkListAdapter.kt → ...resentation/searchedit/LinkListAdapter.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.presentation.searchedit
+package dev.arkbuilders.arkshelf.presentation.searchedit
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -8,16 +8,14 @@ import android.net.Uri
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import kotlinx.coroutines.CoroutineScope
-import space.taran.arkshelf.R
-import space.taran.arkshelf.databinding.ItemLinkBinding
-import space.taran.arkshelf.domain.Link
+import dev.arkbuilders.arkshelf.R
+import dev.arkbuilders.arkshelf.databinding.ItemLinkBinding
+import dev.arkbuilders.arkshelf.domain.Link
 
 class LinkListAdapter(
     private val context: Context,

diff --git a/...entation/searchedit/SearchEditFragment.kt → ...entation/searchedit/SearchEditFragment.kt b/...entation/searchedit/SearchEditFragment.kt → ...entation/searchedit/SearchEditFragment.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.presentation.searchedit
+package dev.arkbuilders.arkshelf.presentation.searchedit
 
 import android.content.Context
 import android.os.Bundle
@@ -12,28 +12,27 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
-import androidx.paging.LoadState
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import dev.arkbuilders.arkfilepicker.ArkFilePickerConfig
+import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragment
+import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode
+import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
 import koleton.api.hideSkeleton
 import koleton.api.loadSkeleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.orbitmvi.orbit.viewmodel.observe
-import space.taran.arkfilepicker.ArkFilePickerConfig
-import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment
-import space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerMode
-import space.taran.arkfilepicker.presentation.onArkPathPicked
-import space.taran.arkshelf.R
-import space.taran.arkshelf.databinding.FragmentSearchEditBinding
-import space.taran.arkshelf.di.DIManager
-import space.taran.arkshelf.domain.NoInternetException
-import space.taran.arkshelf.presentation.askWritePermissions
-import space.taran.arkshelf.presentation.hideKeyboard
-import space.taran.arkshelf.presentation.isWritePermGranted
-import space.taran.arkshelf.presentation.main.MainActivity
+import dev.arkbuilders.arkshelf.R
+import dev.arkbuilders.arkshelf.databinding.FragmentSearchEditBinding
+import dev.arkbuilders.arkshelf.di.DIManager
+import dev.arkbuilders.arkshelf.domain.NoInternetException
+import dev.arkbuilders.arkshelf.presentation.askWritePermissions
+import dev.arkbuilders.arkshelf.presentation.hideKeyboard
+import dev.arkbuilders.arkshelf.presentation.isWritePermGranted
+import dev.arkbuilders.arkshelf.presentation.main.MainActivity
 import java.net.UnknownHostException
 import javax.inject.Inject
 
@@ -58,7 +57,7 @@ class SearchEditFragment : Fragment(R.layout.fragment_search_edit) {
         initUI()
         initResultListener()
         checkWritePermissions()
-        viewModel.observe(this, ::render, ::handleSideEffect)
+        viewModel.observe(lifecycleOwner = this, state = ::render, sideEffect = ::handleSideEffect)
         handleShareIntent()
     }
 

diff --git a/...ntation/searchedit/SearchEditViewModel.kt → ...ntation/searchedit/SearchEditViewModel.kt b/...ntation/searchedit/SearchEditViewModel.kt → ...ntation/searchedit/SearchEditViewModel.kt
@@ -1,4 +1,4 @@
-package space.taran.arkshelf.presentation.searchedit
+package dev.arkbuilders.arkshelf.presentation.searchedit
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -14,9 +14,9 @@ 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.arkshelf.domain.Link
-import space.taran.arkshelf.domain.LinkRepo
-import space.taran.arkshelf.domain.UserPreferences
+import dev.arkbuilders.arkshelf.domain.Link
+import dev.arkbuilders.arkshelf.domain.LinkRepo
+import dev.arkbuilders.arkshelf.domain.UserPreferences
 import java.nio.file.Path
 
 data class SearchEditState(