Skip to content

Commit

Permalink
Feat: Better create document picker
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhanghai
zhanghai committed Apr 16, 2024
1 parent 1169cb6 commit f0a451b
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 54 deletions.
87 changes: 39 additions & 48 deletions app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,12 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
overlayActionMode.title = getString(R.string.file_list_select_title_format, files.size)
overlayActionMode.setMenuResource(R.menu.file_list_pick)
val menu = overlayActionMode.menu
val isOpen = when (pickOptions.mode) {
PickOptions.Mode.OPEN_FILE, PickOptions.Mode.OPEN_DIRECTORY -> true
PickOptions.Mode.CREATE_FILE -> false
}
menu.findItem(R.id.action_open).isVisible = isOpen
menu.findItem(R.id.action_create).isVisible = !isOpen
menu.findItem(R.id.action_select_all).isVisible = pickOptions.allowMultiple
} else {
overlayActionMode.title = getString(R.string.file_list_select_title_format, files.size)
Expand Down Expand Up @@ -909,13 +915,12 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.

private fun onOverlayActionModeMenuItemClicked(item: MenuItem): Boolean =
when (item.itemId) {
R.id.action_pick -> {
when (viewModel.pickOptions!!.mode) {
PickOptions.Mode.OPEN_FILE,
PickOptions.Mode.OPEN_DIRECTORY -> pickFiles(viewModel.selectedFiles)
PickOptions.Mode.CREATE_FILE ->
confirmReplaceFile(viewModel.selectedFiles.single())
}
R.id.action_open -> {
pickFiles(viewModel.selectedFiles)
true
}
R.id.action_create -> {
confirmReplaceFile(viewModel.selectedFiles.single())
true
}
R.id.action_cut -> {
Expand Down Expand Up @@ -1021,13 +1026,11 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
val menu = bottomActionMode.menu
when (pickOptions.mode) {
PickOptions.Mode.CREATE_FILE -> {
bottomActionMode.setNavigationIcon(
R.drawable.check_icon_control_normal_24dp, R.string.save
)
bottomActionMode.title = null
binding.bottomCreateFileNameEdit.isVisible = true
val createMenuItem = menu.findItem(R.id.action_create)
binding.bottomCreateFileNameEdit.setOnEditorConfirmActionListener {
onBottomActionModeNavigationIconClicked()
onBottomActionModeMenuItemClicked(createMenuItem)
}
if (!viewModel.isCreateFileNameEditInitialized) {
val fileName = pickOptions.fileName!!
Expand All @@ -1038,19 +1041,18 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
binding.bottomCreateFileNameEdit.requestFocus()
viewModel.isCreateFileNameEditInitialized = true
}
menu.findItem(R.id.action_reset).isVisible = true
menu.findItem(R.id.action_open).isVisible = false
createMenuItem.isVisible = true
}
PickOptions.Mode.OPEN_DIRECTORY -> {
bottomActionMode.setNavigationIcon(
R.drawable.check_icon_control_normal_24dp, R.string.select
)
val path = viewModel.currentPath
val navigationRoot = NavigationRootMapLiveData.valueCompat[path]
val name = navigationRoot?.getName(requireContext()) ?: path.name
bottomActionMode.title =
getString(R.string.file_list_open_current_directory_format, name)
binding.bottomCreateFileNameEdit.isVisible = false
menu.findItem(R.id.action_reset).isVisible = false
menu.findItem(R.id.action_open).isVisible = true
menu.findItem(R.id.action_create).isVisible = false
}
else -> {
if (bottomActionMode.isActive) {
Expand All @@ -1068,9 +1070,6 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
}
return
}
bottomActionMode.setNavigationIcon(
R.drawable.close_icon_control_normal_24dp, R.string.close
)
val areAllFilesArchivePaths = files.all { it.path.isArchivePath }
bottomActionMode.title = getString(
if (pasteState.copy) {
Expand All @@ -1095,7 +1094,7 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
if (!bottomActionMode.isActive) {
bottomActionMode.start(object : ToolbarActionMode.Callback {
override fun onToolbarNavigationIconClicked(toolbarActionMode: ToolbarActionMode) {
onBottomActionModeNavigationIconClicked()
onBottomToolbarNavigationIconClicked()
}

override fun onToolbarActionModeMenuItemClicked(
Expand All @@ -1110,20 +1109,28 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
}
}

private fun onBottomActionModeNavigationIconClicked() {
private fun onBottomToolbarNavigationIconClicked() {
val pickOptions = viewModel.pickOptions
if (pickOptions != null) {
when (pickOptions.mode) {
PickOptions.Mode.CREATE_FILE -> {
val fileName = binding.bottomCreateFileNameEdit.text.toString()
if (fileName.isEmpty()) {
showToast(R.string.file_list_create_file_name_error_empty)
return
}
if (fileName.asFileNameOrNull() == null) {
showToast(R.string.file_list_create_file_name_error_invalid)
return
}
requireActivity().finish()
} else {
bottomActionMode.finish()
}
}

private fun onBottomActionModeMenuItemClicked(item: MenuItem): Boolean =
when (item.itemId) {
R.id.action_open -> {
pickPaths(linkedSetOf(viewModel.currentPath))
true
}
R.id.action_create -> {
val fileName = binding.bottomCreateFileNameEdit.text.toString()
if (fileName.isEmpty()) {
showToast(R.string.file_list_create_file_name_error_empty)
} else if (fileName.asFileNameOrNull() == null) {
showToast(R.string.file_list_create_file_name_error_invalid)
} else {
val file = getFileWithName(fileName)
if (file != null) {
confirmReplaceFile(file, false)
Expand All @@ -1132,22 +1139,6 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
pickPaths(linkedSetOf(path))
}
}
PickOptions.Mode.OPEN_DIRECTORY -> pickPaths(linkedSetOf(viewModel.currentPath))
else -> bottomActionMode.finish()
}
} else {
bottomActionMode.finish()
}
}

private fun onBottomActionModeMenuItemClicked(item: MenuItem): Boolean =
when (item.itemId) {
R.id.action_reset -> {
val fileName = viewModel.pickOptions!!.fileName!!
binding.bottomCreateFileNameEdit.setText(fileName)
binding.bottomCreateFileNameEdit.setSelection(
0, fileName.asFileName().baseName.length
)
true
}
R.id.action_paste -> {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/file_list_fragment_bottom_bar_include.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
android:paddingStart="@dimen/file_list_toolbar_padding_start"
android:paddingEnd="@dimen/file_list_toolbar_padding_end_no_overflow"
app:navigationIcon="@drawable/close_icon_control_normal_24dp"
app:navigationContentDescription="@string/close"
app:popupTheme="?actionBarPopupTheme">

<EditText
Expand Down
12 changes: 10 additions & 2 deletions app/src/main/res/menu/file_list_pick.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@
tools:ignore="AlwaysShowAction">

<item
android:id="@+id/action_pick"
android:id="@+id/action_open"
android:icon="@drawable/check_icon_control_normal_24dp"
android:orderInCategory="100"
android:title="@string/pick"
android:title="@string/select"
app:showAsAction="always" />

<item
android:id="@+id/action_create"
android:icon="@drawable/save_icon_control_normal_24dp"
android:orderInCategory="100"
android:title="@string/save"
app:showAsAction="always" />

<item
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/res/menu/file_list_pick_bottom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@
tools:ignore="AlwaysShowAction">

<item
android:id="@+id/action_reset"
android:icon="@drawable/reset_icon_white_24dp"
android:id="@+id/action_open"
android:icon="@drawable/check_icon_control_normal_24dp"
android:orderInCategory="100"
android:title="@string/reset"
android:title="@string/select"
app:showAsAction="always" />

<item
android:id="@+id/action_create"
android:icon="@drawable/save_icon_control_normal_24dp"
android:orderInCategory="100"
android:title="@string/save"
app:showAsAction="always" />
</menu>
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<string name="none">None</string>
<string name="open_navigation_drawer">Open navigation drawer</string>
<string name="paste">Paste</string>
<string name="pick" translatable="false">@string/select</string>
<string name="refresh">Refresh</string>
<string name="reload">Reload</string>
<string name="remove">Remove</string>
Expand Down

0 comments on commit f0a451b

Please sign in to comment.