From d1ce8824d3ba57cbd626e4355f6d9bc55f0e8516 Mon Sep 17 00:00:00 2001 From: adenuga558 Date: Tue, 17 Aug 2021 19:35:35 +0100 Subject: [PATCH 1/3] fix sliding tab bar wrong state --- Sources/SlidingTabView/SlidingTabView.swift | 33 +++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Sources/SlidingTabView/SlidingTabView.swift b/Sources/SlidingTabView/SlidingTabView.swift index cfd54f6..47af518 100644 --- a/Sources/SlidingTabView/SlidingTabView.swift +++ b/Sources/SlidingTabView/SlidingTabView.swift @@ -25,7 +25,7 @@ import SwiftUI @available(iOS 13.0, *) -public struct SlidingTabView : View { +public struct SlidingTabView1 : View { // MARK: Internal State @@ -90,6 +90,7 @@ public struct SlidingTabView : View { selectionBarHeight: CGFloat = 2, selectionBarBackgroundColor: Color = Color.gray.opacity(0.2), selectionBarBackgroundHeight: CGFloat = 1) { + self.selectionState = selection.wrappedValue self._selection = selection self.tabs = tabs self.font = font @@ -123,14 +124,14 @@ public struct SlidingTabView : View { } } .padding(.vertical, 16) - .accentColor( - self.isSelected(tabIdentifier: tab) - ? self.activeAccentColor - : self.inactiveAccentColor) - .background( - self.isSelected(tabIdentifier: tab) - ? self.activeTabColor - : self.inactiveTabColor) + .accentColor( + self.isSelected(tabIdentifier: tab) + ? self.activeAccentColor + : self.inactiveAccentColor) + .background( + self.isSelected(tabIdentifier: tab) + ? self.activeTabColor + : self.inactiveTabColor) } } GeometryReader { geometry in @@ -168,20 +169,20 @@ public struct SlidingTabView : View { @available(iOS 13.0, *) struct SlidingTabConsumerView : View { - @State private var selectedTabIndex = 0 + @State private var selectedTabIndex = 1 var body: some View { VStack(alignment: .leading) { - SlidingTabView(selection: self.$selectedTabIndex, - tabs: ["First", "Second"], - font: .body, - activeAccentColor: Color.blue, - selectionBarColor: Color.blue) + SlidingTabView1(selection: self.$selectedTabIndex, + tabs: ["First", "Second"], + font: .body, + activeAccentColor: Color.blue, + selectionBarColor: Color.blue) (selectedTabIndex == 0 ? Text("First View") : Text("Second View")).padding() Spacer() } .padding(.top, 50) - .animation(.none) + .animation(.none) } } From 2af74ba6924b496e0e2f8f176c4011c59437a4c4 Mon Sep 17 00:00:00 2001 From: adenuga558 Date: Tue, 17 Aug 2021 19:40:24 +0100 Subject: [PATCH 2/3] change struct name --- Sources/SlidingTabView/SlidingTabView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/SlidingTabView/SlidingTabView.swift b/Sources/SlidingTabView/SlidingTabView.swift index 47af518..f8c1220 100644 --- a/Sources/SlidingTabView/SlidingTabView.swift +++ b/Sources/SlidingTabView/SlidingTabView.swift @@ -25,7 +25,7 @@ import SwiftUI @available(iOS 13.0, *) -public struct SlidingTabView1 : View { +public struct SlidingTabView : View { // MARK: Internal State @@ -173,7 +173,7 @@ struct SlidingTabConsumerView : View { var body: some View { VStack(alignment: .leading) { - SlidingTabView1(selection: self.$selectedTabIndex, + SlidingTabView(selection: self.$selectedTabIndex, tabs: ["First", "Second"], font: .body, activeAccentColor: Color.blue, From 5b5a8baea17065fb625be820bcfd428c9e876607 Mon Sep 17 00:00:00 2001 From: adenuga558 Date: Mon, 30 Aug 2021 20:39:32 +0100 Subject: [PATCH 3/3] update --- .../UserInterfaceState.xcuserstate | Bin 0 -> 11609 bytes .../xcschemes/xcschememanagement.plist | 27 ++++++++++++++++++ Package.swift | 5 ++++ 3 files changed, 32 insertions(+) create mode 100644 .swiftpm/xcode/package.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 .swiftpm/xcode/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..db85dcf58056552c13a9f37ddb48549e8a5af9ca GIT binary patch literal 11609 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 LEOrq;U9JBQPJE67 literal 0 HcmV?d00001 diff --git a/.swiftpm/xcode/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..4dab9f5 --- /dev/null +++ b/.swiftpm/xcode/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + SlidingTabView.xcscheme_^#shared#^_ + + orderHint + 0 + + + SuppressBuildableAutocreation + + SlidingTabView + + primary + + + SlidingTabViewTests + + primary + + + + + diff --git a/Package.swift b/Package.swift index 0b07719..eab5dfb 100644 --- a/Package.swift +++ b/Package.swift @@ -5,6 +5,11 @@ import PackageDescription let package = Package( name: "SlidingTabView", + platforms: [ + .iOS(.v13), + .macOS(.v10_15), + .tvOS(.v13) + ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library(