-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Select file types on iOS (#449)
This change also includes a drive-by refactor to use the `defaultFocus` modifier.
- Loading branch information
Showing
13 changed files
with
225 additions
and
45 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
Submodule interact
updated
from 3e290c to ccaf51
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // Copyright (c) 2018-2022 InSeven Limited | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE. | ||
|
|
||
| import MobileCoreServices | ||
| import SwiftUI | ||
| import UniformTypeIdentifiers | ||
|
|
||
| import Interact | ||
|
|
||
| import FileawayCore | ||
|
|
||
| struct AddFileTypeView: View { | ||
|
|
||
| enum Focus: Hashable { | ||
| case add | ||
| } | ||
|
|
||
| @Environment(\.dismiss) var dismiss | ||
|
|
||
| @ObservedObject var model: FileTypesViewModel | ||
| @FocusState private var focus: Focus? | ||
|
|
||
| var body: some View { | ||
| NavigationView { | ||
| Form { | ||
| Section { | ||
| TextField("File Extension", text: $model.newFilenameExtension) | ||
| .autocorrectionDisabled(true) | ||
| .textInputAutocapitalization(.never) | ||
| .focused($focus, equals: .add) | ||
| } | ||
| Section { | ||
| if let proposedFileType = model.proposedFileType { | ||
| Button { | ||
| model.submit() | ||
| dismiss() | ||
| } label: { | ||
| LabeledContent(proposedFileType.localizedDisplayName, | ||
| value: proposedFileType.preferredFilenameExtension ?? "") | ||
| } | ||
| .tint(.primary) | ||
| } | ||
| } | ||
| } | ||
| .defaultFocus($focus, .add) | ||
| .navigationTitle("Add File Type") | ||
| .navigationBarTitleDisplayMode(.inline) | ||
| .toolbar { | ||
|
|
||
| ToolbarItem(placement: .navigationBarLeading) { | ||
| Button("Cancel") { | ||
| dismiss() | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
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,73 @@ | ||
| // Copyright (c) 2018-2022 InSeven Limited | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in all | ||
| // copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| // SOFTWARE. | ||
|
|
||
| import MobileCoreServices | ||
| import SwiftUI | ||
| import UniformTypeIdentifiers | ||
|
|
||
| import FileawayCore | ||
|
|
||
| struct FileTypesView: View { | ||
|
|
||
| enum SheetType: Identifiable { | ||
|
|
||
| var id: Self { self } | ||
|
|
||
| case add | ||
| } | ||
|
|
||
| @StateObject var model: FileTypesViewModel | ||
| @State var sheet: SheetType? | ||
|
|
||
| init(settings: Settings) { | ||
| _model = StateObject(wrappedValue: FileTypesViewModel(settings: settings)) | ||
| } | ||
|
|
||
| var body: some View { | ||
| List { | ||
| ForEach(model.fileTypes) { fileType in | ||
| LabeledContent(fileType.localizedDisplayName, value: fileType.preferredFilenameExtension ?? "") | ||
| } | ||
| .onDelete { indexSet in | ||
| model.remove(indexSet) | ||
| } | ||
| } | ||
| .navigationTitle("File Types") | ||
| .toolbar { | ||
|
|
||
| ToolbarItem(placement: .navigationBarTrailing) { | ||
| Button { | ||
| sheet = .add | ||
| } label: { | ||
| Label("Add File Type", systemImage: "plus") | ||
| } | ||
| } | ||
|
|
||
| } | ||
| .sheet(item: $sheet) { sheet in | ||
| switch sheet { | ||
| case .add: | ||
| AddFileTypeView(model: model) | ||
| } | ||
| } | ||
| .runs(model) | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.