forked from hbang/NewTerm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[app] General settings cleanup and tweaking
- Loading branch information
Showing
29 changed files
with
581 additions
and
411 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
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,68 @@ | ||
| // | ||
| // PreferencesGroup.swift | ||
| // NewTerm (iOS) | ||
| // | ||
| // Created by Adam Demasi on 25/9/21. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct PreferencesGroup<Header: View, Footer: View, Content: View>: View { | ||
|
|
||
| var header: Header | ||
| var footer: Footer | ||
| var content: Content | ||
|
|
||
| init(header: Header, footer: Footer, @ViewBuilder content: () -> Content) { | ||
| self.header = header | ||
| self.footer = footer | ||
| self.content = content() | ||
| } | ||
|
|
||
| var body: some View { | ||
| #if targetEnvironment(macCatalyst) | ||
| VStack(alignment: .leading, spacing: 6) { | ||
| GroupBox(label: header) { | ||
| VStack(alignment: .leading, spacing: 0) { | ||
| content | ||
| .padding([.leading, .trailing], 6) | ||
| .padding([.top, .bottom], 4) | ||
| .frame(maxWidth: .infinity, minHeight: 0, alignment: .leading) | ||
| } | ||
| } | ||
| footer | ||
| .font(.caption) | ||
| .padding([.leading, .trailing], 10) | ||
| .foregroundColor(.secondary) | ||
| } | ||
| .pickerStyle(InlinePickerStyle()) | ||
| #else | ||
| Section( | ||
| header: header, | ||
| footer: footer | ||
| ) { | ||
| content | ||
| } | ||
| .pickerStyle(InlinePickerStyle()) | ||
| #endif | ||
| } | ||
|
|
||
| } | ||
|
|
||
| extension PreferencesGroup where Header == EmptyView, Footer: View, Content: View { | ||
| init(footer: Footer, @ViewBuilder content: () -> Content) { | ||
| self.init(header: EmptyView(), footer: footer, content: content) | ||
| } | ||
| } | ||
|
|
||
| extension PreferencesGroup where Header: View, Footer == EmptyView, Content: View { | ||
| init(header: Header, @ViewBuilder content: () -> Content) { | ||
| self.init(header: header, footer: EmptyView(), content: content) | ||
| } | ||
| } | ||
|
|
||
| extension PreferencesGroup where Header == EmptyView, Footer == EmptyView, Content: View { | ||
| init(@ViewBuilder content: () -> Content) { | ||
| self.init(header: EmptyView(), footer: EmptyView(), content: content) | ||
| } | ||
| } |
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,37 @@ | ||
| // | ||
| // PreferencesList.swift | ||
| // NewTerm (iOS) | ||
| // | ||
| // Created by Adam Demasi on 25/9/21. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct PreferencesList<Content: View>: View { | ||
|
|
||
| var content: Content | ||
|
|
||
| init(@ViewBuilder content: () -> Content) { | ||
| self.content = content() | ||
| } | ||
|
|
||
| var body: some View { | ||
| #if targetEnvironment(macCatalyst) | ||
| ScrollView { | ||
| VStack(alignment: .leading, spacing: 10) { | ||
| content | ||
| } | ||
| .padding([.top, .bottom], 16) | ||
| .padding([.leading, .trailing], 20) | ||
| } | ||
| .navigationBarTitleDisplayMode(.inline) | ||
| #else | ||
| List { | ||
| content | ||
| } | ||
| .listStyle(InsetGroupedListStyle()) | ||
| .navigationBarTitleDisplayMode(.inline) | ||
| #endif | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.