Merge pull request #28 from oversizedev/develop

Develop
oversizedev · May 30, 2023 · 2987a96 · 2987a96
2 parents 05bb860 + 873a1d9
commit 2987a96
Show file tree

Hide file tree

Showing 846 changed files with 1,931 additions and 3,059 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -1,3 +1,3 @@
---swiftversion 5.8
+--swiftversion 5.7
 --disable preferKeyPath
 --ifdef no-indent
diff --git a/Example/Shared/DemoPages/GridSelectDemo.swift b/Example/Shared/DemoPages/GridSelectDemo.swift
@@ -20,7 +20,7 @@ struct GridSelectDemo: View {
                     GridSelect(items, selection: $selection,
                                content: { item, _ in
                                    VStack {
-                                       Icon(.circle)
+                                       IconDeprecated(.circle)
                                        Text(item)
                                    }.padding()
                                })
@@ -29,7 +29,7 @@ struct GridSelectDemo: View {
                 GridSelect(items2, selection: $selection,
                            content: { item, _ in
                                VStack {
-                                   Icon(.circle)
+                                   IconDeprecated(.circle)
                                    Text(item)
                                }.padding()
                            })

diff --git a/Example/Shared/DemoPages/IconsDemo.swift b/Example/Shared/DemoPages/IconsDemo.swift
@@ -18,7 +18,7 @@ struct IconsDemo: View {
         PageView("Icons") {
             LazyVGrid(columns: grid) {
                 ForEach(IconsNames.allCases, id: \.self) { icon in
-                    Icon(icon)
+                    IconDeprecated(icon)
                         .padding(.vertical)
                 }
             }

diff --git a/Example/Shared/DemoPages/SegmentedControlDemo.swift b/Example/Shared/DemoPages/SegmentedControlDemo.swift
@@ -57,7 +57,7 @@ struct SegmentedControlDemo: View {
 
                 SegmentedPickerSelector(items, selection: $selection) { item, _ in
                     VStack(spacing: Space.xxxSmall.rawValue) {
-                        Icon(.circle)
+                        IconDeprecated(.circle)
                             .padding(.xxSmall)
                         Text(item)
                         Text("Subtitle")

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Colors, Typography, Spacing and other styles in [core folder](Sources/OversizeUI
 - Add `https://github.com/oversizedev/OversizeUI.git`
 - Select "Up to Next Major" with "3.0.3"
 
-### Import and use OversizeUI
+#### Import and use OversizeUI
 After the framework has been added you can import the module to use it:
 
 ```swift
@@ -92,7 +92,7 @@ var items = ["One", "Two", "Three", "Four"]
 GridSelect(items, selection: $selection,
            content: { item, _ in
                VStack {
-                   Icon(.circle)
+                   IconDeprecated(.circle)
                    Text(item)
                }.padding()
            })
@@ -101,7 +101,7 @@ GridSelect(items, selection: $selection,
 
 ### Icon
 ```swift
-Icon(.activity)
+IconDeprecated(.activity)
 
 ```
 
@@ -141,12 +141,14 @@ TextField("Text", text: $placeholder))
 }
 ```
 
+## More
+
 More information on in the [DocC documentation](https://oversizedev.github.io/OversizeUI/documentation/oversizeui/)
 
 #### Swift Lint
 This project uses [SwiftLint](https://github.com/realm/SwiftLint) to automatically lint our Swift code for common errors. Please install it when developing in this repo by following the [SwiftLint Installation Instructions](https://realm.github.io/SwiftLint/).
 
 
-### License
+#### License
 
 OversizeUI is released under the MIT license. See LICENSE for details.
diff --git a/Sources/OversizeUI/Controls/Button/BarButton.swift b/Sources/OversizeUI/Controls/Button/BarButton.swift
@@ -123,27 +123,27 @@ public struct BarButton: View {
     private var label: some View {
         switch type {
         case .close:
-            Icon(.xMini)
+            IconDeprecated(.xMini)
         case .back:
-            Icon(.arrowLeft)
+            IconDeprecated(.arrowLeft)
         case let .secondary(text, _):
             Text(text)
         case let .accent(text, _):
             Text(text)
         case let .primary(text, _):
             Text(text)
         case .closeAction:
-            Icon(.xMini, color: .onSurfaceMediumEmphasis)
+            IconDeprecated(.xMini, color: .onSurfaceMediumEmphasis)
         case .backAction:
-            Icon(.arrowLeft, color: .onSurfaceMediumEmphasis)
+            IconDeprecated(.arrowLeft, color: .onSurfaceMediumEmphasis)
         case let .disabled(text):
             Text(text)
         case let .image(image, _):
             image
                 .renderingMode(.template)
                 .onSurfaceHighEmphasisForegroundColor()
         case let .icon(icon, _):
-            Icon(icon, color: .onSurfaceMediumEmphasis)
+            IconDeprecated(icon, color: .onSurfaceMediumEmphasis)
         }
     }
 }
diff --git a/Sources/OversizeUI/Controls/ContentView/ContentView.swift b/Sources/OversizeUI/Controls/ContentView/ContentView.swift
@@ -76,14 +76,14 @@ extension ContentView {
         case .close:
 
             Button(action: { dismiss() }) {
-                Icon(.xMini)
+                IconDeprecated(.xMini)
             }
             .buttonStyle(.secondary)
 
         case .back:
 
             Button(action: { dismiss() }) {
-                Icon(.arrowLeft)
+                IconDeprecated(.arrowLeft)
             }
             .buttonStyle(.secondary)
 
@@ -112,14 +112,14 @@ extension ContentView {
         case let .closeAction(action: action):
 
             Button(action: action) {
-                Icon(.xMini)
+                IconDeprecated(.xMini)
             }
             .buttonStyle(.secondary)
 
         case let .backAction(action: action):
 
             Button(action: action) {
-                Icon(.arrowLeft)
+                IconDeprecated(.arrowLeft)
             }
             .buttonStyle(.secondary)
 
@@ -142,14 +142,14 @@ extension ContentView {
         case .close:
 
             Button(action: { dismiss() }) {
-                Icon(.xMini)
+                IconDeprecated(.xMini)
             }
             .buttonStyle(.secondary)
 
         case .back:
 
             Button(action: { dismiss() }) {
-                Icon(.arrowLeft)
+                IconDeprecated(.arrowLeft)
             }
             .buttonStyle(.secondary)
 
@@ -179,14 +179,14 @@ extension ContentView {
         case let .closeAction(action: action):
 
             Button(action: action) {
-                Icon(.xMini)
+                IconDeprecated(.xMini)
             }
             .buttonStyle(.secondary)
 
         case let .backAction(action: action):
 
             Button(action: action) {
-                Icon(.arrowLeft)
+                IconDeprecated(.arrowLeft)
             }
             .buttonStyle(.secondary)
 

diff --git a/Sources/OversizeUI/Controls/GridSelect/GridSelect.swift b/Sources/OversizeUI/Controls/GridSelect/GridSelect.swift
@@ -98,7 +98,7 @@ public struct GridSelect<Element: Equatable, Content, Selection>: View
     private var itemBackground: some View {
         ZStack {
             getSelection(selectionStyle: style.seletionStyle)
-            getSelectionIcon(icon: style.icon)
+            getSelectionIconDeprecated(icon: style.icon)
             selectionView()
         }
     }
@@ -151,7 +151,7 @@ public struct GridSelect<Element: Equatable, Content, Selection>: View
     }
 
     @ViewBuilder
-    private func getSelectionIcon(icon: GridSelectSeletionIconStyle) -> some View {
+    private func getSelectionIconDeprecated(icon: GridSelectSeletionIconStyle) -> some View {
         switch icon {
         case .none:
             EmptyView()
@@ -163,7 +163,7 @@ public struct GridSelect<Element: Equatable, Content, Selection>: View
                     Circle()
                         .foregroundColor(Color.surfacePrimary)
                         .shadowElevaton(.z2)
-                    Icon(.checkMini, color: .onSurfaceHighEmphasis)
+                    IconDeprecated(.checkMini, color: .onSurfaceHighEmphasis)
                 }.frame(width: Space.large.rawValue, height: Space.large.rawValue)
                     .padding(.small)
             }
@@ -218,7 +218,7 @@ struct GridSelect_Preview: PreviewProvider {
                 GridSelect(items, selection: $selection,
                            content: { item, _ in
                                VStack {
-                                   Icon(.circle)
+                                   IconDeprecated(.circle)
                                    Text(item)
                                }.padding()
                            })
@@ -227,7 +227,7 @@ struct GridSelect_Preview: PreviewProvider {
                 GridSelect(items, selection: $selection,
                            content: { item, _ in
                                VStack {
-                                   Icon(.circle)
+                                   IconDeprecated(.circle)
                                    Text(item)
                                }.padding()
                            })