Skip to content

Commit

Permalink
Fixed some rebase things
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshdholtz
joshdholtz committed Jan 13, 2025
1 parent a8f9d41 commit d5bb741
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
4 changes: 2 additions & 2 deletions RevenueCat.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -1264,12 +1264,12 @@
03A98D312D2441B2009BCA61 /* PaywallDataDecodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaywallDataDecodingTests.swift; sourceTree = "<group>"; };
03A98D352D244321009BCA61 /* UIConfigDecodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIConfigDecodingTests.swift; sourceTree = "<group>"; };
03A98D372D2AC637009BCA61 /* UIConfigProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIConfigProvider.swift; sourceTree = "<group>"; };
03C72F8C2D3311D500297FEC /* DisplayableColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayableColor.swift; sourceTree = "<group>"; };
03C72F642D32184900297FEC /* TabControlButtonComponentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlButtonComponentViewModel.swift; sourceTree = "<group>"; };
03C72F662D32184F00297FEC /* TabControlToggleComponentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlToggleComponentViewModel.swift; sourceTree = "<group>"; };
03C72F682D32185B00297FEC /* TabControlButtonComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlButtonComponentView.swift; sourceTree = "<group>"; };
03C72F6A2D32186700297FEC /* TabControlToggleComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabControlToggleComponentView.swift; sourceTree = "<group>"; };
03C72F6C2D32CDFB00297FEC /* FamilySharingTogglePreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FamilySharingTogglePreview.swift; sourceTree = "<group>"; };
03C72F8C2D3311D500297FEC /* DisplayableColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayableColor.swift; sourceTree = "<group>"; };
03E37BE92D30B32200CD9678 /* PaywallTabsComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaywallTabsComponent.swift; sourceTree = "<group>"; };
03E37BEC2D30B72E00CD9678 /* TabsComponentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsComponentViewModel.swift; sourceTree = "<group>"; };
03E37BEE2D30B73800CD9678 /* TabsComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsComponentView.swift; sourceTree = "<group>"; };
Expand Down
16 changes: 12 additions & 4 deletions RevenueCatUI/Templates/V2/Components/Tabs/TabControlToggleComponentViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

}
Expand Down

0 comments on commit d5bb741

Please sign in to comment.