Updated segmented control demo

tapptitude · Mar 16, 2023 · f42fe49 · f42fe49
1 parent 6cbe53e
commit f42fe49
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 173 deletions.
diff --git a/...gmentedControlExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...gmentedControlExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,7 +6,7 @@
       "location" : "https://github.com/dumitruigor/TTSegmentedControl",
       "state" : {
         "branch" : "swiftPackage",
-        "revision" : "e22859b9ab5b2a9a4aef934eaedcbe76ed80dcf9"
+        "revision" : "6cbe53e32fe5fe722020cb833d5bc7f3721314d1"
       }
     }
   ],

diff --git a/.../facebook_selected.imageset/Contents.json → ...ts/billling_normal.imageset/Contents.json b/.../facebook_selected.imageset/Contents.json → ...ts/billling_normal.imageset/Contents.json
@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "facebook_selected.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "billling_normal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "billling_normal@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...dControlExample/Assets.xcassets/billling_normal.imageset/billling_normal@2x.png b/...dControlExample/Assets.xcassets/billling_normal.imageset/billling_normal@2x.png
diff --git a/...dControlExample/Assets.xcassets/billling_normal.imageset/billling_normal@3x.png b/...dControlExample/Assets.xcassets/billling_normal.imageset/billling_normal@3x.png
diff --git a/...ControlExample/Assets.xcassets/facebook_selected.imageset/facebook_selected.png b/...ControlExample/Assets.xcassets/facebook_selected.imageset/facebook_selected.png
diff --git a/...mple/TTSegmentedControlExample/Assets.xcassets/facebook_unselected.imageset/Contents.json b/...mple/TTSegmentedControlExample/Assets.xcassets/facebook_unselected.imageset/Contents.json
diff --git a/...rolExample/Assets.xcassets/facebook_unselected.imageset/facebook_unselected.png b/...rolExample/Assets.xcassets/facebook_unselected.imageset/facebook_unselected.png
diff --git a/...s/twitter_selected.imageset/Contents.json → ...ts/settings_normal.imageset/Contents.json b/...s/twitter_selected.imageset/Contents.json → ...ts/settings_normal.imageset/Contents.json
@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "twitter_selected.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "settings_normal@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "settings_normal@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...dControlExample/Assets.xcassets/settings_normal.imageset/settings_normal@2x.png b/...dControlExample/Assets.xcassets/settings_normal.imageset/settings_normal@2x.png
diff --git a/...dControlExample/Assets.xcassets/settings_normal.imageset/settings_normal@3x.png b/...dControlExample/Assets.xcassets/settings_normal.imageset/settings_normal@3x.png
diff --git a/...edControlExample/Assets.xcassets/twitter_selected.imageset/twitter_selected.svg b/...edControlExample/Assets.xcassets/twitter_selected.imageset/twitter_selected.svg
diff --git a/...ample/TTSegmentedControlExample/Assets.xcassets/twitter_unselected.imageset/Contents.json b/...ample/TTSegmentedControlExample/Assets.xcassets/twitter_unselected.imageset/Contents.json
diff --git a/...ntrolExample/Assets.xcassets/twitter_unselected.imageset/twitter_unselected.png b/...ntrolExample/Assets.xcassets/twitter_unselected.imageset/twitter_unselected.png
diff --git a/...Example/TTSegmentedControlExample/Assets.xcassets/youtube_selected.imageset/Contents.json b/...Example/TTSegmentedControlExample/Assets.xcassets/youtube_selected.imageset/Contents.json
diff --git a/...edControlExample/Assets.xcassets/youtube_selected.imageset/youtube_selected.png b/...edControlExample/Assets.xcassets/youtube_selected.imageset/youtube_selected.png
diff --git a/...ample/TTSegmentedControlExample/Assets.xcassets/youtube_unselected.imageset/Contents.json b/...ample/TTSegmentedControlExample/Assets.xcassets/youtube_unselected.imageset/Contents.json
diff --git a/...ntrolExample/Assets.xcassets/youtube_unselected.imageset/youtube_unselected.png b/...ntrolExample/Assets.xcassets/youtube_unselected.imageset/youtube_unselected.png
diff --git a/Example/TTSegmentedControlExample/TTSegmentedControlExample/Extensions/UIFont+Name.swift b/Example/TTSegmentedControlExample/TTSegmentedControlExample/Extensions/UIFont+Name.swift
@@ -6,7 +6,7 @@
 //
 
 import UIKit
-
+import SwiftUI
 extension UIFont {
     struct SFProText {
         static func medium(size: CGFloat) -> UIFont {
@@ -32,3 +32,11 @@ extension UIFont {
         }
     }
 }
+
+extension Font {
+    struct SFProText {
+        static func medium(size: CGFloat) -> Font {
+            Font.custom("SFProText-Medium", size: size)
+        }
+    }
+}