Move RootPicker to filepicker module #114
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package dev.arkbuilders.components.filepicker | ||
|
|
||
| import androidx.core.os.bundleOf | ||
| import androidx.fragment.app.setFragmentResult | ||
| import androidx.lifecycle.lifecycleScope | ||
| import dev.arkbuilders.arklib.data.folders.FoldersRepo | ||
| import dev.arkbuilders.arklib.utils.INTERNAL_STORAGE | ||
| import dev.arkbuilders.components.utils.hasNestedRoot | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import java.nio.file.Path | ||
|
|
||
| class ArkRootPickerFragment : ArkFilePickerFragment() { | ||
| private var rootNotFavorite = false | ||
|
|
||
| override fun onFolderChanged(currentFolder: Path) { | ||
| lifecycleScope.launch { | ||
| val folders = FoldersRepo.instance.provideFolders() | ||
| val roots = folders.keys | ||
|
|
||
| if (currentFolder == INTERNAL_STORAGE || currentFolder.hasNestedRoot(roots)) { | ||
| rootNotFavorite = true | ||
| binding.btnPick.text = getString(R.string.ark_file_picker_root) | ||
| binding.btnPick.isEnabled = false | ||
| return@launch | ||
| } | ||
|
|
||
| val root = roots.find { root -> currentFolder.startsWith(root) } | ||
| val favorites = folders[root]?.flatten() | ||
| root?.let { | ||
| if (root == currentFolder) { | ||
| rootNotFavorite = true | ||
| binding.btnPick.text = getString(R.string.ark_file_picker_root) | ||
| binding.btnPick.isEnabled = false | ||
| } else { | ||
| val foundAsFavorite = favorites?.any { currentFolder.endsWith(it) } ?: false | ||
| rootNotFavorite = false | ||
| binding.btnPick.text = getString(R.string.ark_file_picker_favorite) | ||
| binding.btnPick.isEnabled = !foundAsFavorite | ||
| } | ||
| } ?: let { | ||
| rootNotFavorite = true | ||
| binding.btnPick.text = getString(R.string.ark_file_picker_root) | ||
| binding.btnPick.isEnabled = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onPick(pickedPath: Path) { | ||
| lifecycleScope.launch(Dispatchers.IO) { | ||
| addRootOrFavorite(pickedPath) | ||
| setFragmentResult( | ||
| ROOT_PICKED_REQUEST_KEY, | ||
| bundleOf().apply { | ||
| putString(PICKED_PATH_BUNDLE_KEY, pickedPath.toString()) | ||
| putBoolean(ROOT_NOT_FAV_BUNDLE_KEY, rootNotFavorite) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun addRootOrFavorite(pickedPath: Path) { | ||
| val folders = FoldersRepo.instance.provideFolders() | ||
| if (rootNotFavorite) { | ||
| FoldersRepo.instance.addRoot(pickedPath) | ||
| } else { | ||
| val root = folders.keys.find { pickedPath.startsWith(it) } | ||
| ?: throw IllegalStateException( | ||
| "Can't add favorite if it's root is not added" | ||
| ) | ||
| val favoriteRelativePath = root.relativize(pickedPath) | ||
| FoldersRepo.instance.addFavorite(root, favoriteRelativePath) | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val ROOT_PICKED_REQUEST_KEY = "rootPicked" | ||
| const val PICKED_PATH_BUNDLE_KEY = "pickedPath" | ||
| const val ROOT_NOT_FAV_BUNDLE_KEY = "rootNotFav" | ||
|
|
||
| fun newInstance( | ||
| config: ArkFilePickerConfig = ArkFilePickerConfig() | ||
| ) = ArkRootPickerFragment().apply { | ||
| setConfig( | ||
| config.copy( | ||
| showRoots = false, | ||
| mode = ArkFilePickerMode.FOLDER, | ||
| pathPickedRequestKey = "notUsed" | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,8 @@ | |
| <string name="ark_file_picker_pin_folder_only">Only folder can be pinned.</string> | ||
| <string name="ark_file_nested_root_inside">There\'s already nested root(s) inside.</string> | ||
| <string name="ark_file_picker_pin">Pin</string> | ||
| <string name="ark_file_picker_root">Root</string> | ||
| <string name="ark_file_picker_favorite">Favorite</string> | ||
| <plurals name="ark_file_picker_items"> | ||
| <item quantity="one">%d item</item> | ||
| <item quantity="other">%d items</item> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ import com.google.android.material.button.MaterialButton | |
| import dev.arkbuilders.components.filepicker.ArkFilePickerConfig | ||
| import dev.arkbuilders.components.filepicker.ArkFilePickerFragment | ||
| import dev.arkbuilders.components.filepicker.ArkFilePickerMode | ||
| import dev.arkbuilders.components.filepicker.ArkRootPickerFragment | ||
| import dev.arkbuilders.components.filepicker.onArkPathPicked | ||
| import dev.arkbuilders.sample.about.AboutActivity | ||
| import dev.arkbuilders.sample.storage.StorageDemoFragment | ||
|
|
@@ -39,7 +40,7 @@ class MainActivity : AppCompatActivity() { | |
|
|
||
| findViewById<MaterialButton>(R.id.btn_root_picker).setOnClickListener { | ||
| resolvePermissions() | ||
| ArkRootPickerFragment | ||
| .newInstance() | ||
| .show(supportFragmentManager, null) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,6 @@ fun Path.hasNestedOrParentalRoot(roots: Iterable<Path>): Boolean { | |
| this.startsWith(path) || path.startsWith(this) | ||
| } | ||
| return hasNestedRoot | ||
| } | ||
|
|
||
| fun Path.hasNestedRoot(roots: Iterable<Path>) = roots.any { it.startsWith(this) } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mdrlzy By checking if a folder
hasNestedOrParentalRoot, we are prohibiting pinning current folder ifor
By changing from
hasNestedOrParentalRoottohasNestedRoot, we're ignoring every root folder that mightcontaincurrently folder, and still allow pining the current folder.Is that our expectation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If folder has parental root, we should still be able to pin it as favorite. Now this is not possible, check the main branch yourself.
Sorry, my bad, I forgot about it when I was reviewing your PR