Skip to content

Add macOS support implement #46 #85

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

Open
jevonmao wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add macOS support implement #46 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
461a7e4
Add macOS support
jevonmao Jun 19, 2021
967c42c
Update podspec
jevonmao Jun 19, 2021
70d86fd
Adopt example views for cross-platform and macOS
jevonmao Jun 19, 2021
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
8 changes: 4 additions & 4 deletions Example/StepperView/ExampleView11.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import SwiftUI
import UIKit
import StepperView

let customGreen = UIColor(red: 0.00, green: 0.80, blue: 0.66, alpha: 1.00)
let customGreen = Color(red: 0.00, green: 0.80, blue: 0.66, alpha: 1.00)

@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
struct ExampleView11: View {
Expand Down Expand Up @@ -47,7 +47,7 @@ struct ExampleView11: View {
StepperIndicationType.custom(IndicatorImageView(name:"pending"))
])
.stepIndicatorMode(StepperMode.horizontal)
.lineOptions(StepperLineOptions.rounded(4, 8, Color(customGreen)))
.lineOptions(StepperLineOptions.rounded(4, 8, customGreen))
.stepLifeCycles([StepLifeCycle.completed, .completed, .completed, .completed, .completed ])
.spacing(70)
.padding(.all, 40)
Expand All @@ -58,7 +58,7 @@ struct ExampleView11: View {
.addSteps(cells)
.indicators(indicators)
.stepIndicatorMode(StepperMode.horizontal)
.lineOptions(StepperLineOptions.rounded(4, 8, Color(customGreen)))
.lineOptions(StepperLineOptions.rounded(4, 8, customGreen))
.stepLifeCycles([StepLifeCycle.completed, .completed, .pending, .pending])
.spacing(70)
.padding(.all, 40)
Expand All @@ -74,7 +74,7 @@ struct ExampleView11: View {
StepperIndicationType.custom(IndicatorImageView(name: "completed"))
])
.stepIndicatorMode(StepperMode.horizontal)
.lineOptions(StepperLineOptions.rounded(4, 8, Color(customGreen)))
.lineOptions(StepperLineOptions.rounded(4, 8, customGreen))
.stepLifeCycles([StepLifeCycle.completed, .completed ])
.spacing(70)
.padding(.all, 40)
Expand Down
4 changes: 2 additions & 2 deletions Example/StepperView/ExampleView6.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct ExampleView6: View {
StepperIndicationType<AnyView>.custom(NumberedCircleView(text: "1", width: 40).eraseToAnyView()),
StepperIndicationType.custom(CircledIconView(image: Image("like"),
width: 40,
strokeColor: Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)))
strokeColor: Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))
.eraseToAnyView()),
StepperIndicationType.custom(CircledIconView(image: Image("flag"),
width: 40,
Expand All @@ -43,7 +43,7 @@ struct ExampleView6: View {

let pitStopLines = [
StepperLineOptions.custom(1, Colors.teal.rawValue),
StepperLineOptions.custom(1, Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))),
StepperLineOptions.custom(1, Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)),
StepperLineOptions.custom(1, Color.red),
StepperLineOptions.custom(1, Colors.gray(.darkSilver).rawValue)
]
Expand Down
4 changes: 2 additions & 2 deletions Example/StepperView/ImageTextRowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ struct ImageTextRowView: View {
RoundedRectangle(cornerRadius: 8.0)
.stroke(Color.gray, lineWidth: 0.5)
.foregroundColor(Color.white)
.shadow(color: Color(UIColor.black).opacity(0.03), radius: 8, x: 5, y: -5)
.shadow(color: Color(UIColor.black).opacity(0.03), radius: 8, y: 5))
.shadow(color: Color(.black).opacity(0.03), radius: 8, x: 5, y: -5)
.shadow(color: Color(.black).opacity(0.03), radius: 8, y: 5))

}
}
Expand Down
4 changes: 2 additions & 2 deletions Example/StepperView/StepperContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ struct StepperContentView: View {
.overlay(RoundedRectangle(cornerRadius: 8)
.frame(width: 300)
.foregroundColor(Color.clear)
.shadow(color: Color(UIColor.black).opacity(0.03), radius: 8, x: 5, y: -5)
.shadow(color: Color(UIColor.black).opacity(0.03), radius: 8, y: 5)
.shadow(color: Color(.black).opacity(0.03), radius: 8, x: 5, y: -5)
.shadow(color: Color(.black).opacity(0.03), radius: 8, y: 5)
.border(Color.gray))
}

Expand Down
2 changes: 1 addition & 1 deletion Example/StepperView_Watch Extension/Views/WatchExampleView3.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct WatchExampleView3: View {
let indicators = [
StepperIndicationType.custom(CircledIconView(image: Image("like"),
width: 30,
strokeColor: Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)))
strokeColor: Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))
.eraseToAnyView()),
StepperIndicationType.custom(CircledIconView(image: Image("flag"),
width: 30,
Expand Down
4 changes: 2 additions & 2 deletions Example/StepperView_Watch Extension/Views/WatchExampleView4.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct WatchExampleView4: View {
let indicators = [
StepperIndicationType.custom(CircledIconView(image: Image("like"),
width: 25,
strokeColor: Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)))
strokeColor: Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))
.eraseToAnyView()),
StepperIndicationType.custom(CircledIconView(image: Image("star"),
width: 25,
Expand All @@ -37,7 +37,7 @@ struct WatchExampleView4: View {
]

let pitStopLineOptions = [
StepperLineOptions.custom(1, Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))),
StepperLineOptions.custom(1, Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)),
StepperLineOptions.custom(1, Colors.red(.normal).rawValue),
StepperLineOptions.custom(1, Colors.gray(.light).rawValue)]

Expand Down
4 changes: 2 additions & 2 deletions Example/Tests/StepperViewTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class StepperViewTests: XCTestCase {
let indicators = [
StepperIndicationType<AnyView>.custom(NumberedCircleView(text: "1", width: 40).eraseToAnyView()),
.custom(CircledIconView(image: Image("like"), width: 40,
strokeColor: Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)))
strokeColor: Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))
.eraseToAnyView()),
.custom(CircledIconView(image: Image("flag"), width: 40,
strokeColor: Color.red).eraseToAnyView()),
Expand All @@ -147,7 +147,7 @@ class StepperViewTests: XCTestCase {

let pitStopLineOptions = [
StepperLineOptions.custom(1, Colors.teal.rawValue),
StepperLineOptions.custom(1, Color(UIColor(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0))),
StepperLineOptions.custom(1, Color(red: 26/255, green: 188/255, blue: 156/255, alpha: 1.0)),
StepperLineOptions.custom(1, Color.red),
StepperLineOptions.custom(1, Colors.gray(.darkSilver).rawValue)
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "StepperView",
platforms: [
.iOS(.v11)
.iOS(.v11), .macOS(.v10_15)
],
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
Expand Down
1 change: 1 addition & 0 deletions StepperView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ Pod::Spec.new do |s|
s.social_media_url = 'https://twitter.com/badrivm'
s.ios.deployment_target = '11.0'
s.watchos.deployment_target = '6.0'
s.macos.deployment_target = '10.15'
s.source_files = 'Sources/**/*.swift'
end