From d5bb741ed7a45d135d266d41ee3f05904c6cdecd Mon Sep 17 00:00:00 2001 From: Josh Holtz Date: Mon, 13 Jan 2025 06:33:02 -0600 Subject: [PATCH] Fixed some rebase things --- RevenueCat.xcodeproj/project.pbxproj | 4 ++-- .../TabControlToggleComponentViewModel.swift | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/RevenueCat.xcodeproj/project.pbxproj b/RevenueCat.xcodeproj/project.pbxproj index 8e95dd5236..74f368fc86 100644 --- a/RevenueCat.xcodeproj/project.pbxproj +++ b/RevenueCat.xcodeproj/project.pbxproj @@ -16,12 +16,12 @@ 03A98D322D2441B8009BCA61 /* PaywallDataDecodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03A98D312D2441B2009BCA61 /* PaywallDataDecodingTests.swift */; }; 03A98D362D244329009BCA61 /* UIConfigDecodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03A98D352D244321009BCA61 /* UIConfigDecodingTests.swift */; }; 03A98D382D2AC63B009BCA61 /* UIConfigProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03A98D372D2AC637009BCA61 /* UIConfigProvider.swift */; }; - 03C72F8D2D3311E300297FEC /* DisplayableColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F8C2D3311D500297FEC /* DisplayableColor.swift */; }; 03C72F652D32184900297FEC /* TabControlButtonComponentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F642D32184900297FEC /* TabControlButtonComponentViewModel.swift */; }; 03C72F672D32184F00297FEC /* TabControlToggleComponentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F662D32184F00297FEC /* TabControlToggleComponentViewModel.swift */; }; 03C72F692D32185B00297FEC /* TabControlButtonComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F682D32185B00297FEC /* TabControlButtonComponentView.swift */; }; 03C72F6B2D32186700297FEC /* TabControlToggleComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F6A2D32186700297FEC /* TabControlToggleComponentView.swift */; }; 03C72F6D2D32CDFB00297FEC /* FamilySharingTogglePreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F6C2D32CDFB00297FEC /* FamilySharingTogglePreview.swift */; }; + 03C72F8D2D3311E300297FEC /* DisplayableColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C72F8C2D3311D500297FEC /* DisplayableColor.swift */; }; 03E37BEA2D30B32200CD9678 /* PaywallTabsComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E37BE92D30B32200CD9678 /* PaywallTabsComponent.swift */; }; 03E37BED2D30B73400CD9678 /* TabsComponentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E37BEC2D30B72E00CD9678 /* TabsComponentViewModel.swift */; }; 03E37BEF2D30B73A00CD9678 /* TabsComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E37BEE2D30B73800CD9678 /* TabsComponentView.swift */; }; @@ -1264,12 +1264,12 @@ 03A98D312D2441B2009BCA61 /* PaywallDataDecodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaywallDataDecodingTests.swift; sourceTree = ""; }; 03A98D352D244321009BCA61 /* UIConfigDecodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIConfigDecodingTests.swift; sourceTree = ""; }; 03A98D372D2AC637009BCA61 /* UIConfigProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIConfigProvider.swift; sourceTree = ""; }; - 03C72F8C2D3311D500297FEC /* DisplayableColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayableColor.swift; sourceTree = ""; }; 03C72F642D32184900297FEC /* TabControlButtonComponentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlButtonComponentViewModel.swift; sourceTree = ""; }; 03C72F662D32184F00297FEC /* TabControlToggleComponentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlToggleComponentViewModel.swift; sourceTree = ""; }; 03C72F682D32185B00297FEC /* TabControlButtonComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlButtonComponentView.swift; sourceTree = ""; }; 03C72F6A2D32186700297FEC /* TabControlToggleComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlToggleComponentView.swift; sourceTree = ""; }; 03C72F6C2D32CDFB00297FEC /* FamilySharingTogglePreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FamilySharingTogglePreview.swift; sourceTree = ""; }; + 03C72F8C2D3311D500297FEC /* DisplayableColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayableColor.swift; sourceTree = ""; }; 03E37BE92D30B32200CD9678 /* PaywallTabsComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaywallTabsComponent.swift; sourceTree = ""; }; 03E37BEC2D30B72E00CD9678 /* TabsComponentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsComponentViewModel.swift; sourceTree = ""; }; 03E37BEE2D30B73800CD9678 /* TabsComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsComponentView.swift; sourceTree = ""; }; diff --git a/RevenueCatUI/Templates/V2/Components/Tabs/TabControlToggleComponentViewModel.swift b/RevenueCatUI/Templates/V2/Components/Tabs/TabControlToggleComponentViewModel.swift index 97ea2ed0e4..dbc512e48b 100644 --- a/RevenueCatUI/Templates/V2/Components/Tabs/TabControlToggleComponentViewModel.swift +++ b/RevenueCatUI/Templates/V2/Components/Tabs/TabControlToggleComponentViewModel.swift @@ -35,19 +35,27 @@ class TabControlToggleComponentViewModel { } var thumbColorOn: Color { - return self.component.thumbColorOn.toDynamicColor(uiConfigProvider: uiConfigProvider) + return self.component.thumbColorOn + .asDisplayable(uiConfigProvider: uiConfigProvider) + .toDynamicColor() } var thumbColorOff: Color { - return self.component.thumbColorOff.toDynamicColor(uiConfigProvider: uiConfigProvider) + return self.component.thumbColorOff + .asDisplayable(uiConfigProvider: uiConfigProvider) + .toDynamicColor() } var trackColorOn: Color { - return self.component.trackColorOn.toDynamicColor(uiConfigProvider: uiConfigProvider) + return self.component.trackColorOn + .asDisplayable(uiConfigProvider: uiConfigProvider) + .toDynamicColor() } var trackColorOff: Color { - return self.component.trackColorOff.toDynamicColor(uiConfigProvider: uiConfigProvider) + return self.component.trackColorOff + .asDisplayable(uiConfigProvider: uiConfigProvider) + .toDynamicColor() } }