Fix examples #major

oversizedev · Nov 9, 2024 · 703fff7 · 703fff7
1 parent d14b9e9
commit 703fff7
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 254 deletions.
diff --git a/Example/Example WatchKit App/Info.plist b/Example/Example WatchKit App/Info.plist
@@ -20,12 +20,16 @@
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>CLKComplicationPrincipalClass</key>
+	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>WKWatchKitApp</key>
+	<key>WKApplication</key>
+	<true/>
+	<key>WKWatchOnly</key>
 	<true/>
 </dict>
 </plist>
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example (iOS).xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example (iOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example (macOS).xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example (macOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/Shared/ComponentsList.swift b/Example/Shared/ComponentsList.swift
@@ -48,7 +48,6 @@ struct ComponentsList: View {
                 }
             }
         }
-        .navigationable()
         #else
         Text("Support will be in the future")
         #endif

diff --git a/Example/Shared/DemoPages/SegmentedControlDemo.swift b/Example/Shared/DemoPages/SegmentedControlDemo.swift
@@ -62,7 +62,7 @@ struct SegmentedControlDemo: View {
                         Text(item)
                         Text("Subtitle")
                             .subheadline()
-                            .onSurfaceHighEmphasisForegroundColor()
+                            .onSurfacePrimaryForeground()
                     }
                 }
                 .segmentedControlStyle(SelectionOnlySegmentedControlStyle())

diff --git a/Example/Shared/DemoPages/SurfaceDemo.swift b/Example/Shared/DemoPages/SurfaceDemo.swift
@@ -13,7 +13,7 @@ struct SurfaceDemo: View {
                 Surface {
                     Text("Text")
                         .title3()
-                        .onSurfaceHighEmphasisForegroundColor()
+                        .onSurfacePrimaryForeground()
                 }
                 .surfaceStyle(.secondary)
 

diff --git a/Sources/OversizeUI/Controls/Avatar/AvatarPreview.swift b/Sources/OversizeUI/Controls/Avatar/AvatarPreview.swift
@@ -1,6 +1,6 @@
 //
 // Copyright © 2023 Aleksandr Romanov
-// File.swift, created on 10.03.2023
+// AvatarPreview.swift, created on 10.03.2023
 //
 
 import SwiftUI

diff --git a/Sources/OversizeUI/Controls/PageView/Page.swift b/Sources/OversizeUI/Controls/PageView/Page.swift
@@ -432,7 +432,7 @@ public extension Page where LeadingBar == EmptyView, TitleLabel == EmptyView, He
         leadingBar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -454,7 +454,7 @@ public extension Page where TrailingBar == EmptyView, TitleLabel == EmptyView, H
         trailingBar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -477,7 +477,7 @@ public extension Page where TrailingBar == EmptyView, LeadingBar == EmptyView, T
         trailingBar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -501,7 +501,7 @@ public extension Page where TrailingBar == EmptyView, LeadingBar == EmptyView, T
         topToolbar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -524,7 +524,7 @@ public extension Page where LeadingBar == EmptyView, TopToolbar == EmptyView, Ti
         topToolbar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -547,7 +547,7 @@ public extension Page where TrailingBar == EmptyView, TopToolbar == EmptyView, T
         topToolbar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -569,7 +569,7 @@ public extension Page where TopToolbar == EmptyView, TitleLabel == EmptyView, He
         topToolbar = nil
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -592,7 +592,7 @@ public extension Page where TrailingBar == EmptyView, LeadingBar == EmptyView, T
         trailingBar = nil
         topToolbar = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -614,7 +614,7 @@ public extension Page where TrailingBar == EmptyView, TopToolbar == EmptyView, H
         trailingBar = nil
         topToolbar = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -636,7 +636,7 @@ public extension Page where LeadingBar == EmptyView, TopToolbar == EmptyView, He
         leadingBar = nil
         topToolbar = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -657,7 +657,7 @@ public extension Page where TrailingBar == EmptyView, Header == EmptyView {
         self.content = content()
         trailingBar = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -678,7 +678,7 @@ public extension Page where LeadingBar == EmptyView, Header == EmptyView {
         self.content = content()
         leadingBar = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -699,7 +699,7 @@ public extension Page where TopToolbar == EmptyView, Header == EmptyView {
         self.content = content()
         topToolbar = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -720,7 +720,7 @@ public extension Page where TitleLabel == EmptyView, Header == EmptyView {
         self.content = content()
         titleLabel = nil
         header = nil
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -743,7 +743,7 @@ public extension Page where LeadingBar == EmptyView, TitleLabel == EmptyView {
         leadingBar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -766,7 +766,7 @@ public extension Page where TrailingBar == EmptyView, TitleLabel == EmptyView {
         trailingBar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -790,7 +790,7 @@ public extension Page where TrailingBar == EmptyView, LeadingBar == EmptyView, T
         trailingBar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -815,7 +815,7 @@ public extension Page where TrailingBar == EmptyView, LeadingBar == EmptyView, T
         topToolbar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -839,7 +839,7 @@ public extension Page where LeadingBar == EmptyView, TopToolbar == EmptyView, Ti
         topToolbar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -863,7 +863,7 @@ public extension Page where TrailingBar == EmptyView, TopToolbar == EmptyView, T
         topToolbar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -886,7 +886,7 @@ public extension Page where TopToolbar == EmptyView, TitleLabel == EmptyView {
         topToolbar = nil
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -910,7 +910,7 @@ public extension Page where TrailingBar == EmptyView, LeadingBar == EmptyView, T
         trailingBar = nil
         topToolbar = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -933,7 +933,7 @@ public extension Page where TrailingBar == EmptyView, TopToolbar == EmptyView {
         trailingBar = nil
         topToolbar = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -956,7 +956,7 @@ public extension Page where LeadingBar == EmptyView, TopToolbar == EmptyView {
         leadingBar = nil
         topToolbar = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -978,7 +978,7 @@ public extension Page where TrailingBar == EmptyView {
         self.content = content()
         trailingBar = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -1000,7 +1000,7 @@ public extension Page where LeadingBar == EmptyView {
         self.content = content()
         leadingBar = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -1022,7 +1022,7 @@ public extension Page where TopToolbar == EmptyView {
         self.content = content()
         topToolbar = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }
@@ -1044,7 +1044,7 @@ public extension Page where TitleLabel == EmptyView {
         self.content = content()
         titleLabel = nil
         self.header = header()
-        // smallHeader = nil
+
         _searchQuery = .constant(.init())
         _displaySearchBar = .constant(false)
     }

diff --git a/Sources/OversizeUI/Controls/Row/Row.swift b/Sources/OversizeUI/Controls/Row/Row.swift
@@ -26,9 +26,6 @@ public struct Row<LeadingLabel, TrailingLabel>: View where LeadingLabel: View, T
     private let leadingLabel: LeadingLabel?
     private let trailingLabel: TrailingLabel?
 
-//    private var leadingType: RowLeadingType?
-//    private var trallingType: RowTrailingType?
-
     private let action: (() -> Void)?
 
     private var isPremiumOption = false
@@ -63,26 +60,6 @@ public struct Row<LeadingLabel, TrailingLabel>: View where LeadingLabel: View, T
         leadingRadius = nil
     }
 
-    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
-    public init(_ title: String,
-                subtitle: String? = nil,
-//                leadingType: RowLeadingType? = nil,
-//                trallingType: RowTrailingType? = nil,
-                paddingHorizontal _: Space = .medium,
-                paddingVertical _: Space = .small,
-                action: (() -> Void)? = nil)
-    {
-        self.title = title
-        self.subtitle = subtitle
-//        self.leadingType = leadingType
-//        self.trallingType = trallingType
-        self.action = action
-        leadingLabel = nil
-        trailingLabel = nil
-        leadingSize = nil
-        leadingRadius = nil
-    }
-
     public var body: some View {
         if action != nil {
             Button {
@@ -246,20 +223,6 @@ public extension Row {
         control.textColor = color
         return control
     }
-//
-//    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
-//    func rowLeading(_ leading: RowLeadingType?) -> Row {
-//        var control = self
-//        control.leadingType = leading
-//        return control
-//    }
-//
-//    @available(*, deprecated, message: "Use leading: {} and tralling: {}")
-//    func rowTrailing(_ trailing: RowTrailingType?) -> Row {
-//        var control = self
-//        control.trallingType = trailing
-//        return control
-//    }
 }
 
 public extension View {

diff --git a/Sources/OversizeUI/Controls/ScrollView/ScrollViewWithStickyHeader.swift b/Sources/OversizeUI/Controls/ScrollView/ScrollViewWithStickyHeader.swift
@@ -1,7 +1,7 @@
-////
-//// Copyright © 2023 Alexander Romanov
-//// File.swift, created on 26.11.2023
-////
+//
+// Copyright © 2023 Alexander Romanov
+// ScrollViewHeader.swift, created on 26.11.2023
+//
 //
 
 import SwiftUI
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ struct ComponentsList: View { @@
                     }
                 }
             }
-            .navigationable()
             #else
             Text("Support will be in the future")
             #endif
@@ Expand Down @@