Remove font provider (#418)

* Remove font provider * Change some fonts * update snapshots * Need to set Warp Theme so the font register * Fix tests * Fix tests * Update FinniversKit --------- Co-authored-by: Amir Ghoreshi <[email protected]> Co-authored-by: Milad Ajilianabbasi <[email protected]>
finn-no · Sep 11, 2024 · 79cf846 · 79cf846
1 parent 93a68c0
commit 79cf846
Show file tree

Hide file tree

Showing 35 changed files with 8 additions and 6 deletions.
diff --git a/...coalDemo/CharcoalDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...coalDemo/CharcoalDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/finn-no/FinniversKit.git",
       "state" : {
-        "branch" : "remove-font-provider",
-        "revision" : "ba6a8ee61a2838a00267cd3bf767140cba9deb19"
+        "revision" : "9233c787b97328c8f7aee455b7d3bbf180bb5643",
+        "version" : "147.0.0"
       }
     },
     {
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/warp-ds/warp-ios.git",
       "state" : {
-        "revision" : "aeb72c43f2918a290d00d9fe93035723accb876b",
-        "version" : "0.0.25"
+        "revision" : "debbf05cf26bc89f7d0f1755f4f817a398a06865",
+        "version" : "0.0.27"
       }
     }
   ],

diff --git a/CharcoalDemo/CharcoalDemo/AppDelegate.swift b/CharcoalDemo/CharcoalDemo/AppDelegate.swift
@@ -1,11 +1,13 @@
 import Charcoal
 import FinniversKit
+import Warp
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         Charcoal.setup(DemoConfig())
-
+
+        Warp.Theme = .finn
         let navigationBarAppearance = UINavigationBar.appearance()
         navigationBarAppearance.isTranslucent = false
         navigationBarAppearance.tintColor = .textLink

diff --git a/...o/SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPad_darkMode.png b/...o/SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPad_darkMode.png
diff --git a/.../SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPad_lightMode.png b/.../SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPad_lightMode.png
diff --git a/...SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPhone_darkMode.png b/...SnapshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPhone_darkMode.png
diff --git a/...napshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPhone_lightMode.png b/...napshotTests/__Snapshots__/ComponentTests/testInlineFilter.iPhone_lightMode.png
diff --git a/...mo/SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPad_darkMode.png b/...mo/SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPad_darkMode.png
diff --git a/...o/SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPad_lightMode.png b/...o/SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPad_lightMode.png
diff --git a/.../SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPhone_darkMode.png b/.../SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPhone_darkMode.png
diff --git a/...SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPhone_lightMode.png b/...SnapshotTests/__Snapshots__/ComponentTests/testRangeFilter.iPhone_lightMode.png
diff --git a/.../SnapshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPad_darkMode.png b/.../SnapshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPad_darkMode.png
diff --git a/...SnapshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPad_lightMode.png b/...SnapshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPad_lightMode.png
diff --git a/...napshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPhone_darkMode.png b/...napshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPhone_darkMode.png
diff --git a/...apshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPhone_lightMode.png b/...apshotTests/__Snapshots__/ComponentTests/testStepperFilter.iPhone_lightMode.png
diff --git a/...hotTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_darkMode.png b/...hotTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_darkMode.png
diff --git a/...otTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_lightMode.png b/...otTests/__Snapshots__/FilterContainerTests/testContextFilter.iPad_lightMode.png
diff --git a/...tTests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_darkMode.png b/...tTests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_darkMode.png
diff --git a/...Tests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_lightMode.png b/...Tests/__Snapshots__/FilterContainerTests/testContextFilter.iPhone_lightMode.png
diff --git a/.../__Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPad_darkMode.png b/.../__Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPad_darkMode.png
diff --git a/...__Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPad_lightMode.png b/...__Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPad_lightMode.png
diff --git a/..._Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPhone_darkMode.png b/..._Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPhone_darkMode.png
diff --git a/...Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPhone_lightMode.png b/...Snapshots__/FilterContainerTests/testFailedToLoadVerticals.iPhone_lightMode.png
diff --git a/...ests/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_darkMode.png b/...ests/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_darkMode.png
diff --git a/...sts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_lightMode.png b/...sts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPad_lightMode.png
diff --git a/...ts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_darkMode.png b/...ts/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_darkMode.png
diff --git a/...s/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_lightMode.png b/...s/__Snapshots__/FilterContainerTests/testMultipleVerticals.iPhone_lightMode.png
diff --git a/.../__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_darkMode.png b/.../__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_darkMode.png
diff --git a/...__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_lightMode.png b/...__Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPad_lightMode.png
diff --git a/..._Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_darkMode.png b/..._Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_darkMode.png
diff --git a/...Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_lightMode.png b/...Snapshots__/FilterContainerTests/testPolygonSearchDisabled.iPhone_lightMode.png
diff --git a/...otTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_darkMode.png b/...otTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_darkMode.png
diff --git a/...tTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_lightMode.png b/...tTests/__Snapshots__/FilterContainerTests/testSingleVertical.iPad_lightMode.png
diff --git a/...Tests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_darkMode.png b/...Tests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_darkMode.png
diff --git a/...ests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_lightMode.png b/...ests/__Snapshots__/FilterContainerTests/testSingleVertical.iPhone_lightMode.png
diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/finn-no/FinniversKit.git", branch: "remove-font-provider")
+        .package(url: "https://github.com/finn-no/FinniversKit.git", "147.0.0"..."999.0.0")
     ],
     targets: [
         .target(