-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #143 from TeamAmaze/feature
Bugfixes for audio player, subtitles dialog picker
- Loading branch information
Showing
45 changed files
with
1,137 additions
and
19 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
44 changes: 44 additions & 0 deletions
44
app/src/main/java/com/amaze/fileutilities/utilis/dialog_picker/ContextExt.kt
This file contains 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,44 @@ | ||
| /* | ||
| * Copyright (C) 2021-2023 Arpit Khurana <arpitkh96@gmail.com>, Vishal Nehra <vishalmeham2@gmail.com>, | ||
| * Emmanuel Messulam<emmanuelbendavid@gmail.com>, Raymond Lai <airwave209gt at gmail.com> and Contributors. | ||
| * | ||
| * This file is part of Amaze File Utilities. | ||
| * | ||
| * Amaze File Utilities is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /** | ||
| * Designed and developed by Aidan Follestad (@afollestad) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.amaze.fileutilities.utilis.dialog_picker | ||
|
|
||
| import android.content.Context | ||
| import java.io.File | ||
|
|
||
| internal fun Context.getExternalFilesDir(): File? { | ||
| return this.getExternalFilesDir(null) | ||
| } |
184 changes: 184 additions & 0 deletions
184
app/src/main/java/com/amaze/fileutilities/utilis/dialog_picker/DialogFileChooserExt.kt
This file contains 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,184 @@ | ||
| /* | ||
| * Copyright (C) 2021-2023 Arpit Khurana <arpitkh96@gmail.com>, Vishal Nehra <vishalmeham2@gmail.com>, | ||
| * Emmanuel Messulam<emmanuelbendavid@gmail.com>, Raymond Lai <airwave209gt at gmail.com> and Contributors. | ||
| * | ||
| * This file is part of Amaze File Utilities. | ||
| * | ||
| * Amaze File Utilities is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /** | ||
| * Designed and developed by Aidan Follestad (@afollestad) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| @file:Suppress("unused") | ||
|
|
||
| package com.amaze.fileutilities.utilis.dialog_picker | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.content.Context | ||
| import android.text.InputFilter | ||
| import android.widget.EditText | ||
| import android.widget.TextView | ||
| import androidx.annotation.CheckResult | ||
| import androidx.annotation.StringRes | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| import com.afollestad.materialdialogs.MaterialDialog | ||
| import com.afollestad.materialdialogs.WhichButton.POSITIVE | ||
| import com.afollestad.materialdialogs.actions.setActionButtonEnabled | ||
| import com.afollestad.materialdialogs.customview.customView | ||
| import com.afollestad.materialdialogs.customview.getCustomView | ||
| import com.afollestad.materialdialogs.files.R | ||
| import com.afollestad.materialdialogs.input.getInputField | ||
| import com.afollestad.materialdialogs.input.input | ||
| import com.afollestad.materialdialogs.internal.list.DialogRecyclerView | ||
| import com.afollestad.materialdialogs.utils.MDUtil.maybeSetTextColor | ||
| import java.io.File | ||
|
|
||
| typealias FileFilter = ((File) -> Boolean)? | ||
| typealias FileCallback = ((dialog: MaterialDialog, file: File) -> Unit)? | ||
|
|
||
| /** Gets the selected file for the current file chooser dialog. */ | ||
| @CheckResult | ||
| fun MaterialDialog.selectedFile(): File? { | ||
| val customView = getCustomView() | ||
| val list: DialogRecyclerView = customView.findViewById(R.id.list) | ||
| return (list.adapter as? FileChooserAdapter)?.selectedFile | ||
| } | ||
|
|
||
| /** | ||
| * Shows a dialog that lets the user select a local file. | ||
| * | ||
| * @param initialDirectory The directory that is listed initially, defaults to external storage. | ||
| * @param filter A filter to apply when listing files, defaults to only show non-hidden files. | ||
| * @param waitForPositiveButton When true, the callback isn't invoked until the user selects a | ||
| * file and taps on the positive action button. Defaults to true if the dialog has buttons. | ||
| * @param emptyTextRes A string resource displayed on the empty view shown when a directory is | ||
| * empty. Defaults to "This folder's empty!". | ||
| * @param selection A callback invoked when a file is selected. | ||
| */ | ||
| @SuppressLint("CheckResult") | ||
| fun MaterialDialog.fileChooser( | ||
| context: Context, | ||
| initialDirectory: File? = context.getExternalFilesDir(), | ||
| filter: FileFilter = null, | ||
| waitForPositiveButton: Boolean = true, | ||
| emptyTextRes: Int = R.string.files_default_empty_text, | ||
| allowFolderCreation: Boolean = false, | ||
| @StringRes folderCreationLabel: Int? = null, | ||
| selection: FileCallback = null | ||
| ): MaterialDialog { | ||
| var actualFilter: FileFilter = filter | ||
|
|
||
| if (allowFolderCreation) { | ||
| // we already have permissions at app startup | ||
| // check(hasWriteStoragePermission()) { | ||
| // "You must have the WRITE_EXTERNAL_STORAGE permission first." | ||
| // } | ||
| if (filter == null) { | ||
| actualFilter = { !it.isHidden && it.canWrite() } | ||
| } | ||
| } else { | ||
| // we already have permissions at app startup | ||
| // check(hasWriteStoragePermission()) { | ||
| // "You must have the WRITE_EXTERNAL_STORAGE permission first." | ||
| // } | ||
| if (filter == null) { | ||
| actualFilter = { !it.isHidden && it.canRead() } | ||
| } | ||
| } | ||
|
|
||
| check(initialDirectory != null) { | ||
| "The initial directory is null." | ||
| } | ||
|
|
||
| customView(R.layout.md_file_chooser_base, noVerticalPadding = true) | ||
| setActionButtonEnabled(POSITIVE, false) | ||
|
|
||
| val customView = getCustomView() | ||
| val list: DialogRecyclerView = customView.findViewById(R.id.list) | ||
| val emptyText: TextView = customView.findViewById(R.id.empty_text) | ||
| emptyText.setText(emptyTextRes) | ||
| emptyText.maybeSetTextColor(windowContext, R.attr.md_color_content) | ||
|
|
||
| list.attach(this) | ||
| list.layoutManager = LinearLayoutManager(windowContext) | ||
| val adapter = FileChooserAdapter( | ||
| dialog = this, | ||
| initialFolder = initialDirectory, | ||
| waitForPositiveButton = waitForPositiveButton, | ||
| emptyView = emptyText, | ||
| onlyFolders = false, | ||
| filter = actualFilter, | ||
| allowFolderCreation = allowFolderCreation, | ||
| folderCreationLabel = folderCreationLabel, | ||
| callback = selection | ||
| ) | ||
| list.adapter = adapter | ||
|
|
||
| if (waitForPositiveButton && selection != null) { | ||
| setActionButtonEnabled(POSITIVE, false) | ||
| positiveButton { | ||
| val selectedFile = adapter.selectedFile | ||
| if (selectedFile != null) { | ||
| selection.invoke(this, selectedFile) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return this | ||
| } | ||
|
|
||
| internal fun MaterialDialog.showNewFolderCreator( | ||
| parent: File, | ||
| @StringRes folderCreationLabel: Int?, | ||
| onCreation: () -> Unit | ||
| ) { | ||
| val dialog = MaterialDialog(windowContext).show { | ||
| title(folderCreationLabel ?: R.string.files_new_folder) | ||
| input(hintRes = R.string.files_new_folder_hint) { _, input -> | ||
| File(parent, input.toString().trim()).mkdir() | ||
| onCreation() | ||
| } | ||
| } | ||
| dialog.getInputField() | ||
| .blockReservedCharacters() | ||
| } | ||
|
|
||
| private fun EditText.blockReservedCharacters() { | ||
| filters += InputFilter { source, _, _, _, _, _ -> | ||
| if (source.isEmpty()) { | ||
| return@InputFilter null | ||
| } | ||
| val last = source[source.length - 1] | ||
| val reservedChars = "?:\"*|/\\<>" | ||
| if (reservedChars.indexOf(last) > -1) { | ||
| source.subSequence(0, source.length - 1) | ||
| } else { | ||
| null | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.