Skip to content

Commit

Permalink
Updates primarily for view style support
Browse files Browse the repository at this point in the history
  • Loading branch information
hmlongco committed Dec 9, 2021
1 parent 5a9afe8 commit 2dbc315
Show file tree
Hide file tree
Showing 31 changed files with 903 additions and 35 deletions.
60 changes: 58 additions & 2 deletions Builder.xcodeproj/project.pbxproj
Expand Up @@ -22,6 +22,7 @@
4C2D812025E408B300E2EBD7 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 4C2D811F25E408B300E2EBD7 /* RxSwift */; };
4C2D812425E408B300E2EBD7 /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 4C2D812325E408B300E2EBD7 /* RxRelay */; };
4C2D812625E408B300E2EBD7 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 4C2D812525E408B300E2EBD7 /* RxCocoa */; };
4C3D9C2D27556081007CE720 /* Builder+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D9C2C27556081007CE720 /* Builder+Styles.swift */; };
4C40B2B226E2E07100598D9E /* Builder+Constraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C40B2B126E2E07100598D9E /* Builder+Constraints.swift */; };
4C40B2B426E4212700598D9E /* Builder+Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C40B2B326E4212700598D9E /* Builder+Context.swift */; };
4C47033226CB17EE006B6DEC /* Builder+Padding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C47033126CB17EE006B6DEC /* Builder+Padding.swift */; };
Expand All @@ -48,6 +49,17 @@
4C65867325ED32150073003C /* StandardErrorPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C65866525ED30280073003C /* StandardErrorPage.swift */; };
4C8221C626DC458A00BDD349 /* MainUsersTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8221C526DC458A00BDD349 /* MainUsersTableView.swift */; };
4C878EDF25C38C8A004D7216 /* UserImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C878EDE25C38C8A004D7216 /* UserImageCache.swift */; };
4C8B50AE275FA656004FFC15 /* MaxWidthTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50A8275FA656004FFC15 /* MaxWidthTextField.swift */; };
4C8B50AF275FA656004FFC15 /* CurrencyTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50A9275FA656004FFC15 /* CurrencyTextField.swift */; };
4C8B50B0275FA656004FFC15 /* TextFieldBehaviorAggregator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50AA275FA656004FFC15 /* TextFieldBehaviorAggregator.swift */; };
4C8B50B1275FA656004FFC15 /* BuilderInternalTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50AB275FA656004FFC15 /* BuilderInternalTextField.swift */; };
4C8B50B2275FA656004FFC15 /* MaskedTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50AC275FA656004FFC15 /* MaskedTextField.swift */; };
4C8B50B3275FA656004FFC15 /* NextAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50AD275FA656004FFC15 /* NextAccessoryView.swift */; };
4C8B50B5275FA879004FFC15 /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50B4275FA879004FFC15 /* String+Extensions.swift */; };
4C8B50B7275FA994004FFC15 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50B6275FA994004FFC15 /* UIView+Extensions.swift */; };
4C8B50B9275FAB94004FFC15 /* UITextField+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50B8275FAB94004FFC15 /* UITextField+Styles.swift */; };
4C8B50BB275FAC93004FFC15 /* MetaTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50BA275FAC93004FFC15 /* MetaTextField.swift */; };
4C8B50BD275FED84004FFC15 /* TextField+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B50BC275FED84004FFC15 /* TextField+Styles.swift */; };
4C9CC36525B4F078002BE06D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9CC36425B4F078002BE06D /* AppDelegate.swift */; };
4C9CC36725B4F078002BE06D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9CC36625B4F078002BE06D /* SceneDelegate.swift */; };
4C9CC36925B4F078002BE06D /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9CC36825B4F078002BE06D /* MainViewController.swift */; };
Expand Down Expand Up @@ -133,6 +145,7 @@
4C288FBA25B612F0004D54AC /* MOCK.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = MOCK.xcconfig; sourceTree = "<group>"; };
4C2A0D79268F65C800BF86ED /* Builder+With.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Builder+With.swift"; sourceTree = "<group>"; };
4C2A0D7B268F916D00BF86ED /* Builder+TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Builder+TableView.swift"; sourceTree = "<group>"; };
4C3D9C2C27556081007CE720 /* Builder+Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Builder+Styles.swift"; sourceTree = "<group>"; };
4C40B2B126E2E07100598D9E /* Builder+Constraints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Builder+Constraints.swift"; sourceTree = "<group>"; };
4C40B2B326E4212700598D9E /* Builder+Context.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Builder+Context.swift"; sourceTree = "<group>"; };
4C47033126CB17EE006B6DEC /* Builder+Padding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Builder+Padding.swift"; sourceTree = "<group>"; };
Expand All @@ -159,6 +172,17 @@
4C65866B25ED30A20073003C /* StandardEmptyPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StandardEmptyPage.swift; sourceTree = "<group>"; };
4C8221C526DC458A00BDD349 /* MainUsersTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainUsersTableView.swift; sourceTree = "<group>"; };
4C878EDE25C38C8A004D7216 /* UserImageCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserImageCache.swift; sourceTree = "<group>"; };
4C8B50A8275FA656004FFC15 /* MaxWidthTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaxWidthTextField.swift; sourceTree = "<group>"; };
4C8B50A9275FA656004FFC15 /* CurrencyTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencyTextField.swift; sourceTree = "<group>"; };
4C8B50AA275FA656004FFC15 /* TextFieldBehaviorAggregator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldBehaviorAggregator.swift; sourceTree = "<group>"; };
4C8B50AB275FA656004FFC15 /* BuilderInternalTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BuilderInternalTextField.swift; sourceTree = "<group>"; };
4C8B50AC275FA656004FFC15 /* MaskedTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaskedTextField.swift; sourceTree = "<group>"; };
4C8B50AD275FA656004FFC15 /* NextAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextAccessoryView.swift; sourceTree = "<group>"; };
4C8B50B4275FA879004FFC15 /* String+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
4C8B50B6275FA994004FFC15 /* UIView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; };
4C8B50B8275FAB94004FFC15 /* UITextField+Styles.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextField+Styles.swift"; sourceTree = "<group>"; };
4C8B50BA275FAC93004FFC15 /* MetaTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaTextField.swift; sourceTree = "<group>"; };
4C8B50BC275FED84004FFC15 /* TextField+Styles.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TextField+Styles.swift"; sourceTree = "<group>"; };
4C9CC36125B4F078002BE06D /* Builder.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Builder.app; sourceTree = BUILT_PRODUCTS_DIR; };
4C9CC36425B4F078002BE06D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4C9CC36625B4F078002BE06D /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -252,6 +276,7 @@
children = (
4C1F921726E94BFE0075A5F4 /* ButtonView+Styles.swift */,
4C1F921926E94C140075A5F4 /* LabelView+Styles.swift */,
4C8B50BC275FED84004FFC15 /* TextField+Styles.swift */,
);
path = Styles;
sourceTree = "<group>";
Expand Down Expand Up @@ -308,13 +333,27 @@
isa = PBXGroup;
children = (
4CF9644F274BE2CB00C0824C /* DLSCardView.swift */,
4C8B50BA275FAC93004FFC15 /* MetaTextField.swift */,
4C65866525ED30280073003C /* StandardErrorPage.swift */,
4C65866B25ED30A20073003C /* StandardEmptyPage.swift */,
4C65866625ED30800073003C /* StandardLoadingPage.swift */,
);
path = Views;
sourceTree = "<group>";
};
4C8B50A7275FA61C004FFC15 /* Fields */ = {
isa = PBXGroup;
children = (
4C8B50AB275FA656004FFC15 /* BuilderInternalTextField.swift */,
4C8B50A9275FA656004FFC15 /* CurrencyTextField.swift */,
4C8B50AC275FA656004FFC15 /* MaskedTextField.swift */,
4C8B50A8275FA656004FFC15 /* MaxWidthTextField.swift */,
4C8B50AD275FA656004FFC15 /* NextAccessoryView.swift */,
4C8B50AA275FA656004FFC15 /* TextFieldBehaviorAggregator.swift */,
);
path = Fields;
sourceTree = "<group>";
};
4C9CC35825B4F078002BE06D = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -404,6 +443,7 @@
children = (
4C9CC3B225B4F2D4002BE06D /* Builder */,
4C9CC3E425B4F47C002BE06D /* Extensions */,
4C8B50A7275FA61C004FFC15 /* Fields */,
4C9CC3D225B4F2DF002BE06D /* Networking */,
4C1F921626E94BE50075A5F4 /* Styles */,
);
Expand Down Expand Up @@ -434,6 +474,7 @@
4C9CC3B425B4F2D4002BE06D /* Builder+ScrollView.swift */,
4C9CC3B925B4F2D4002BE06D /* Builder+Spacer.swift */,
4C9CC3C025B4F2D4002BE06D /* Builder+Stack.swift */,
4C3D9C2C27556081007CE720 /* Builder+Styles.swift */,
4C9CC3B325B4F2D4002BE06D /* Builder+Switch.swift */,
4C2A0D7B268F916D00BF86ED /* Builder+TableView.swift */,
4CF9644D274B0B1600C0824C /* Builder+TextField.swift */,
Expand Down Expand Up @@ -461,10 +502,13 @@
4C9CC3E425B4F47C002BE06D /* Extensions */ = {
isa = PBXGroup;
children = (
4CF1A64226B399D800E26446 /* Functions+Extensions.swift */,
4C57859625CAEA60005D42BB /* Rx+Extensions.swift */,
4C8B50B4275FA879004FFC15 /* String+Extensions.swift */,
4C4AD76F2751881700EF12C6 /* UIColor+Extensions.swift */,
4C9CC3E525B4F499002BE06D /* UIImage+Extensions.swift */,
4C57859625CAEA60005D42BB /* Rx+Extensions.swift */,
4CF1A64226B399D800E26446 /* Functions+Extensions.swift */,
4C8B50B8275FAB94004FFC15 /* UITextField+Styles.swift */,
4C8B50B6275FA994004FFC15 /* UIView+Extensions.swift */,
4CCB61D026C36F0C0011BD44 /* UIViewController+Extensions.swift */,
);
path = Extensions;
Expand Down Expand Up @@ -690,19 +734,24 @@
4C4AD7702751881700EF12C6 /* UIColor+Extensions.swift in Sources */,
4C4AD77627542E5300EF12C6 /* Builder+Gestures.swift in Sources */,
4C9CC3EC25B4F627002BE06D /* User.swift in Sources */,
4C3D9C2D27556081007CE720 /* Builder+Styles.swift in Sources */,
4C8B50B7275FA994004FFC15 /* UIView+Extensions.swift in Sources */,
4C249B6825C656AF00EAA1E9 /* Builder+ZStack.swift in Sources */,
4C9CC3CA25B4F2D4002BE06D /* Builder+View.swift in Sources */,
4C2A0D7C268F916D00BF86ED /* Builder+TableView.swift in Sources */,
4CD0524825B7AECC0099B277 /* DetailCardView.swift in Sources */,
4C9CC3FE25B5099D002BE06D /* UserService.swift in Sources */,
4C8B50B0275FA656004FFC15 /* TextFieldBehaviorAggregator.swift in Sources */,
4CC5D7A2270D1A80003137BD /* TestServices.swift in Sources */,
4CF1A64326B399D800E26446 /* Functions+Extensions.swift in Sources */,
4C9CC3C225B4F2D4002BE06D /* Builder+ScrollView.swift in Sources */,
4C47033226CB17EE006B6DEC /* Builder+Padding.swift in Sources */,
4C57859725CAEA60005D42BB /* Rx+Extensions.swift in Sources */,
4C8B50B1275FA656004FFC15 /* BuilderInternalTextField.swift in Sources */,
4C57859225CA2958005D42BB /* DetailViewController.swift in Sources */,
4C4AD772275189E000EF12C6 /* TestViews.swift in Sources */,
4C9CC3E625B4F499002BE06D /* UIImage+Extensions.swift in Sources */,
4C8B50BD275FED84004FFC15 /* TextField+Styles.swift in Sources */,
4C9CC36925B4F078002BE06D /* MainViewController.swift in Sources */,
4CF9644C274B0A1500C0824C /* LoginViewController.swift in Sources */,
4C4AD76E27513CFF00EF12C6 /* Builder+ForEach.swift in Sources */,
Expand Down Expand Up @@ -733,9 +782,12 @@
4C9CC3E025B4F2DF002BE06D /* URLSessionManager.swift in Sources */,
4C9CC3C925B4F2D4002BE06D /* Builder+Dynamic.swift in Sources */,
4C1F571E25CE344600B6086F /* Dismissible.swift in Sources */,
4C8B50B9275FAB94004FFC15 /* UITextField+Styles.swift in Sources */,
4C9CC3C625B4F2D4002BE06D /* Builder+Navigation.swift in Sources */,
4C8B50B5275FA879004FFC15 /* String+Extensions.swift in Sources */,
4C9CC3C525B4F2D4002BE06D /* Builder+Button.swift in Sources */,
4C249B1025C5CE5900EAA1E9 /* DetailViewModel.swift in Sources */,
4C8B50B2275FA656004FFC15 /* MaskedTextField.swift in Sources */,
4C4AD734274DEC9700EF12C6 /* Builder+Extensions.swift in Sources */,
4CA19EE8273E108700EE7433 /* MainStackViewController.swift in Sources */,
4C65866125ED23040073003C /* MainUsersStackView.swift in Sources */,
Expand All @@ -748,18 +800,22 @@
4CEE4D5A2695DD7E00312FD1 /* Builder+Group.swift in Sources */,
4C4AD76A274FF3AF00EF12C6 /* Builder+Controls.swift in Sources */,
4C65864925E9CB8D0073003C /* SessionLoggingInterceptorr.swift in Sources */,
4C8B50B3275FA656004FFC15 /* NextAccessoryView.swift in Sources */,
4C65864825E9CB8D0073003C /* StandardHeadersInterceptor.swift in Sources */,
4CF96450274BE2CB00C0824C /* DLSCardView.swift in Sources */,
4C9E51232708AB4200795D2F /* MockDelayInterceptor.swift in Sources */,
4C249B1825C5CEE500EAA1E9 /* _Details+Injection.swift in Sources */,
4C8B50AE275FA656004FFC15 /* MaxWidthTextField.swift in Sources */,
4C9CC3DF25B4F2DF002BE06D /* ClientSessionManager.swift in Sources */,
4C8B50AF275FA656004FFC15 /* CurrencyTextField.swift in Sources */,
4C9CC3DC25B4F2DF002BE06D /* ClientRequestBuilder+RxSwift.swift in Sources */,
4C65867325ED32150073003C /* StandardErrorPage.swift in Sources */,
4C9CC3DA25B4F2DF002BE06D /* ClientRequestBuilder.swift in Sources */,
4C9CC3CC25B4F2D4002BE06D /* Builder+ViewController.swift in Sources */,
4C9CC3C125B4F2D4002BE06D /* Builder+Switch.swift in Sources */,
4C9CC3CE25B4F2D4002BE06D /* Builder+Stack.swift in Sources */,
4C65866C25ED30A20073003C /* StandardEmptyPage.swift in Sources */,
4C8B50BB275FAC93004FFC15 /* MetaTextField.swift in Sources */,
4C40B2B426E4212700598D9E /* Builder+Context.swift in Sources */,
4C65862B25E9892C0073003C /* _Networking+Injection.swift in Sources */,
4CD0521F25B5433D0099B277 /* _Application+Injection.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Builder/AppDelegate.swift
Expand Up @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

// _ = TestVariable().test()

ViewBuilderEnvironment.defaultLabelFont = UIFont.preferredFont(forTextStyle: .callout)
ViewBuilderEnvironment.defaultLabelFont = UIFont.preferredFont(forTextStyle: .body)
}

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
Expand Down
23 changes: 23 additions & 0 deletions Builder/Assets.xcassets/checkboxCheckedBlue.imageset/Contents.json
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "checkboxCheckedBlue.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "checkboxCheckedBlue@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "checkboxCheckedBlue@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Builder/Assets.xcassets/checkboxEmptyBlue.imageset/Contents.json
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "checkboxEmptyBlue.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "checkboxEmptyBlue@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "checkboxEmptyBlue@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Builder/Details/DetailViewController.swift
Expand Up @@ -48,13 +48,13 @@ class DetailViewController: UIViewController {

ButtonView("Submit")
.enabled(bind: viewModel.$accepted)
.style(.filled)
.style(StyleButtonFilled())
.onTap { [weak dismissible] _ in
dismissible?.dismiss()
}

LabelView("Inforamtion presented above is not repesentative of any person, living, dead, undead, or fictional.")
.style(.footnote)
.style(StyleLabelFootnote())

SpacerView()
}
Expand Down
2 changes: 1 addition & 1 deletion Builder/Login/LoginViewController.swift
Expand Up @@ -94,7 +94,7 @@ struct LoginView: ViewBuilder {

VStackView {
ButtonView("Login")
.style(.filled)
.style(StyleButtonFilled())
.onTap { [weak viewModel] _ in
UIView.animate(withDuration: 0.3) {
viewModel?.login()
Expand Down
5 changes: 5 additions & 0 deletions Builder/Menu/MenuViewController.swift
Expand Up @@ -20,6 +20,8 @@ class MenuViewController: UIViewController {
title = "Builder Demo"
view.backgroundColor = .systemBackground
view.embed(MenuTableView())

// push(ContactInformationViewController())
}

}
Expand All @@ -36,6 +38,9 @@ struct MenuTableView: ViewBuilder {
Option(name: "Login View Test", description: "A basic login field.") {
LoginViewController()
},
// Option(name: "Contact View Test", description: "A basic contact us screen with a few twists.") {
// ContactInformationViewController()
// },
Option(name: "Table View Test", description: "A basic master/detail table view with user data pulled from an API.") {
MainViewController()
},
Expand Down
1 change: 1 addition & 0 deletions Builder/Menu/_Application+Injection.swift
Expand Up @@ -14,5 +14,6 @@ extension Resolver: ResolverRegistering {
registerServices()
registerMain()
registerDetails()
// registerContactInformation()
}
}
9 changes: 0 additions & 9 deletions Builder/Shared/Builder/Builder+Button.swift
Expand Up @@ -13,10 +13,6 @@ import RxCocoa

public struct ButtonView: ModifiableView {

public struct Style {
public let style: (_ button: ViewModifier<UIButton>) -> ()
}

public let modifiableView = Modified(UIButton()) {
$0.setTitleColor(ViewBuilderEnvironment.defaultButtonColor ?? $0.tintColor, for: .normal)
$0.titleLabel?.font = ViewBuilderEnvironment.defaultButtonFont ?? .preferredFont(forTextStyle: .headline)
Expand Down Expand Up @@ -76,11 +72,6 @@ extension ModifiableView where Base: UIButton {
}
}

@discardableResult
public func style(_ style: ButtonView.Style) -> ViewModifier<Base> {
ViewModifier(modifiableView) { style.style(ViewModifier($0)) }
}

}

extension UIButton: ViewBuilderPaddable {
Expand Down

0 comments on commit 2dbc315

Please sign in to comment.