diff --git a/secant.xcodeproj/project.pbxproj b/secant.xcodeproj/project.pbxproj index bfd9ed7..4ede061 100644 --- a/secant.xcodeproj/project.pbxproj +++ b/secant.xcodeproj/project.pbxproj @@ -69,7 +69,6 @@ 660558F7270C862F009D6954 /* Fonts+Generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 660558F5270C862F009D6954 /* Fonts+Generated.swift */; }; 660558F8270C862F009D6954 /* XCAssets+Generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 660558F6270C862F009D6954 /* XCAssets+Generated.swift */; }; 663FAB9C271D874D00E495F8 /* ActiveButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663FAB9B271D874D00E495F8 /* ActiveButton.swift */; }; - 663FAB9E271D875700E495F8 /* CreateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663FAB9D271D875700E495F8 /* CreateButton.swift */; }; 663FABA0271D876200E495F8 /* PrimaryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663FAB9F271D876200E495F8 /* PrimaryButton.swift */; }; 663FABA2271D876C00E495F8 /* SecondaryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663FABA1271D876C00E495F8 /* SecondaryButton.swift */; }; 6654C73A2715A38000901167 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = 6654C7392715A38000901167 /* ComposableArchitecture */; }; @@ -204,7 +203,6 @@ 660558F5270C862F009D6954 /* Fonts+Generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Fonts+Generated.swift"; sourceTree = ""; }; 660558F6270C862F009D6954 /* XCAssets+Generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCAssets+Generated.swift"; sourceTree = ""; }; 663FAB9B271D874D00E495F8 /* ActiveButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveButton.swift; sourceTree = ""; }; - 663FAB9D271D875700E495F8 /* CreateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateButton.swift; sourceTree = ""; }; 663FAB9F271D876200E495F8 /* PrimaryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryButton.swift; sourceTree = ""; }; 663FABA1271D876C00E495F8 /* SecondaryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryButton.swift; sourceTree = ""; }; 6654C73D2715A41300901167 /* OnboardingStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingStore.swift; sourceTree = ""; }; @@ -575,7 +573,6 @@ children = ( 66DC733E271D88CC0053CBB6 /* StandardButtonStyle.swift */, 663FAB9B271D874D00E495F8 /* ActiveButton.swift */, - 663FAB9D271D875700E495F8 /* CreateButton.swift */, 663FAB9F271D876200E495F8 /* PrimaryButton.swift */, 663FABA1271D876C00E495F8 /* SecondaryButton.swift */, 66D50667271D9B6100E51F0D /* NavigationButtonStyle.swift */, @@ -1101,7 +1098,6 @@ 2E58E73B274679F000B2B84B /* OnboardingHeaderView.swift in Sources */, 0D8A43C6272B129C005A6414 /* WordChipGrid.swift in Sources */, 66A0807B271993C500118B79 /* OnboardingProgressIndicator.swift in Sources */, - 663FAB9E271D875700E495F8 /* CreateButton.swift in Sources */, 0D7DF08C271DCC0E00530046 /* ScreenBackground.swift in Sources */, F9C165C22740403600592F76 /* CreateView.swift in Sources */, F9C165B4274031F600592F76 /* Bindings.swift in Sources */, diff --git a/secant/Colors.xcassets/Buttons/CreateButton.colorset/Contents.json b/secant/Colors.xcassets/Buttons/CreateButton.colorset/Contents.json deleted file mode 100644 index b2c9499..0000000 --- a/secant/Colors.xcassets/Buttons/CreateButton.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.341", - "green" : "0.200", - "red" : "0.149" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x00", - "green" : "0xB9", - "red" : "0xFF" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/secant/Colors.xcassets/Buttons/CreateButtonDisabled.colorset/Contents.json b/secant/Colors.xcassets/Buttons/CreateButtonDisabled.colorset/Contents.json deleted file mode 100644 index 0aabfec..0000000 --- a/secant/Colors.xcassets/Buttons/CreateButtonDisabled.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.200", - "blue" : "0x28", - "green" : "0xB7", - "red" : "0xF4" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/secant/Colors.xcassets/Buttons/CreateButtonPressed.colorset/Contents.json b/secant/Colors.xcassets/Buttons/CreateButtonPressed.colorset/Contents.json deleted file mode 100644 index b82581c..0000000 --- a/secant/Colors.xcassets/Buttons/CreateButtonPressed.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x00", - "green" : "0xD8", - "red" : "0xFF" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/secant/Generated/XCAssets+Generated.swift b/secant/Generated/XCAssets+Generated.swift index e65d9fb..d0ec72f 100644 --- a/secant/Generated/XCAssets+Generated.swift +++ b/secant/Generated/XCAssets+Generated.swift @@ -48,9 +48,6 @@ internal enum Asset { internal static let activeButtonDisabled = ColorAsset(name: "ActiveButtonDisabled") internal static let activeButtonPressed = ColorAsset(name: "ActiveButtonPressed") internal static let buttonsTitleShadow = ColorAsset(name: "ButtonsTitleShadow") - internal static let createButton = ColorAsset(name: "CreateButton") - internal static let createButtonDisabled = ColorAsset(name: "CreateButtonDisabled") - internal static let createButtonPressed = ColorAsset(name: "CreateButtonPressed") internal static let neumorphicButtonDarkSide = ColorAsset(name: "NeumorphicButtonDarkSide") internal static let neumorphicButtonLightSide = ColorAsset(name: "NeumorphicButtonLightSide") internal static let onboardingNavigation = ColorAsset(name: "OnboardingNavigation") diff --git a/secant/UIComponents/Buttons/CreateButton.swift b/secant/UIComponents/Buttons/CreateButton.swift deleted file mode 100644 index 0f38979..0000000 --- a/secant/UIComponents/Buttons/CreateButton.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// PrimaryButton.swift -// secant-testnet -// -// Created by Adam Stener on 10/14/21. -// - -import SwiftUI - -extension Button { - var createButtonStyle: some View { - buttonStyle( - StandardButtonStyle( - foregroundColor: Asset.Colors.Text.button.color, - background: Asset.Colors.Buttons.createButton.color, - pressedBackgroundColor: Asset.Colors.Buttons.createButtonPressed.color, - disabledBackgroundColor: Asset.Colors.Buttons.createButtonDisabled.color - ) - ) - } -} - -struct CreateButton_Previews: PreviewProvider { - static var previews: some View { - Button("Create Button") { dump("Create button") } - .createButtonStyle - .frame(width: 250, height: 50) - .previewLayout(.fixed(width: 300, height: 100)) - .preferredColorScheme(.light) - - Button("Create Button") { dump("Create button") } - .createButtonStyle - .frame(width: 250, height: 50) - .previewLayout(.fixed(width: 300, height: 100)) - .preferredColorScheme(.dark) - } -} diff --git a/secant/UIComponents/Buttons/StandardButtonStyle.swift b/secant/UIComponents/Buttons/StandardButtonStyle.swift index 135cc3f..d714cb1 100644 --- a/secant/UIComponents/Buttons/StandardButtonStyle.swift +++ b/secant/UIComponents/Buttons/StandardButtonStyle.swift @@ -40,9 +40,9 @@ private extension Button { buttonStyle( StandardButtonStyle( foregroundColor: Asset.Colors.Text.button.color, - background: Asset.Colors.Buttons.createButton.color, - pressedBackgroundColor: Asset.Colors.Buttons.createButtonPressed.color, - disabledBackgroundColor: Asset.Colors.Buttons.createButtonDisabled.color + background: Asset.Colors.Buttons.activeButton.color, + pressedBackgroundColor: Asset.Colors.Buttons.activeButtonPressed.color, + disabledBackgroundColor: Asset.Colors.Buttons.activeButtonDisabled.color ) ) }