Skip to content

Moved SegmentedControl component to Design module. #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukepistrol merged 2 commits into from
Apr 13, 2022
Merged

Moved SegmentedControl component to Design module. #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee448b3
removed `Introspect` dependency, Added `SegmentedControl` component t…
lukepistrol Apr 13, 2022
00831ee
added docs
lukepistrol Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CodeEdit/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
</dict>
</array>
<key>GitHash</key>
<string>34d4572419ade3087bf6531df560021b18d57209</string>
<string>439a479db852314b49ca26938203f792cd03c83f</string>
</dict>
</plist>
1 change: 1 addition & 0 deletions ...itModules/Modules/AppPreferences/src/Sections/ThemePreferences/ThemePreferencesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import FontPicker
import SwiftUI
import Preferences
import Design

/// A view that implements the `Theme` preference section
public struct ThemePreferencesView: View {
Expand Down
21 changes: 0 additions & 21 deletions CodeEditModules/Modules/Design/src/Extensions/List+RemoveBackground.swift
View file
Open in desktop

This file was deleted.

11 changes: 8 additions & 3 deletions ...es/src/HelperViews/SegmentedControl.swift → ...Modules/Design/src/SegmentedControl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,22 @@

import SwiftUI

struct SegmentedControl: View {
/// A view that creates a segmented control from an array of text labels.
public struct SegmentedControl: View {

init(_ selection: Binding<Int>, options: [String]) {
/// A view that creates a segmented control from an array of text labels.
/// - Parameters:
/// - selection: The index of the current selected item.
/// - options: the options to display as an array of strings.
public init(_ selection: Binding<Int>, options: [String]) {
self._preselectedIndex = selection
self.options = options
}

@Binding var preselectedIndex: Int
var options: [String]
let color = Color.accentColor
var body: some View {
public var body: some View {
HStack(spacing: 0) {
ForEach(options.indices, id: \.self) { index in
Text(options[index])
Expand Down
3 changes: 1 addition & 2 deletions CodeEditModules/Modules/QuickOpen/src/QuickOpenView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ public struct QuickOpenView: View {
self.selectedItem = file
}
}
.removeBackground()
.frame(minWidth: 250, maxWidth: 250)
.frame(minWidth: 250, maxWidth: 250)
if state.openQuicklyFiles.isEmpty {
EmptyView()
} else {
Expand Down
3 changes: 2 additions & 1 deletion CodeEditModules/Modules/WelcomeModule/src/RecentProjectsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ public struct RecentProjectsView: View {
.buttonStyle(.borderless)
.keyboardShortcut(.defaultAction)
}
}.removeBackground()
}
.listStyle(.sidebar)
} else {
emptyView
}
Expand Down
9 changes: 1 addition & 8 deletions CodeEditModules/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ let package = Package(
url: "https://github.com/sindresorhus/Preferences.git",
from: "2.5.0"
),
.package(
name: "Introspect",
url: "https://github.com/siteline/SwiftUI-Introspect",
from: "0.1.4"
),
.package(
name: "CodeEditKit",
url: "https://github.com/CodeEditApp/CodeEditKit",
Expand Down Expand Up @@ -221,6 +216,7 @@ let package = Package(
name: "AppPreferences",
dependencies: [
"Preferences",
"Design",
"FontPicker",
],
path: "Modules/AppPreferences/src"
Expand All @@ -244,9 +240,6 @@ let package = Package(
),
.target(
name: "Design",
dependencies: [
"Introspect",
],
path: "Modules/Design/src"
),
.target(
Expand Down