diff --git a/dydx/dydxViews/dydxViews/Shared/LeverageRisk.swift b/dydx/dydxViews/dydxViews/Shared/LeverageRisk.swift index ad64dfba..e32d5447 100644 --- a/dydx/dydxViews/dydxViews/Shared/LeverageRisk.swift +++ b/dydx/dydxViews/dydxViews/Shared/LeverageRisk.swift @@ -122,7 +122,7 @@ public class LeverageRiskModel: PlatformViewModel { .themeColor(foreground: self.level.foregroundColor) .padding(.horizontal, 6) .padding(.vertical, 4) - .background(self.level.backgroundColor.color.opacity(0.3)) + .background(self.level.backgroundColor.color.opacity(0.1)) .cornerRadius(6, corners: .allCorners) .themeStyle(style: style) .lineLimit(1) diff --git a/dydx/dydxViews/dydxViews/_v4/Search/dydxLineChartView.swift b/dydx/dydxViews/dydxViews/_v4/Search/dydxLineChartView.swift index 82d99337..e2b44420 100644 --- a/dydx/dydxViews/dydxViews/_v4/Search/dydxLineChartView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Search/dydxLineChartView.swift @@ -83,7 +83,7 @@ public class dydxLineChartViewModel: PlatformViewModel { } private var chartGradient: Gradient { - Gradient(colors: [lineColor.opacity(0.5), + Gradient(colors: [lineColor.opacity(0.3), lineColor.opacity(0)]) } } diff --git a/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIMarketsHeaderView.swift b/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIMarketsHeaderView.swift index 1e37320d..95e55dd7 100644 --- a/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIMarketsHeaderView.swift +++ b/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIMarketsHeaderView.swift @@ -72,7 +72,7 @@ public class dydxSimpleUIMarketsHeaderViewModel: PlatformViewModel { PlatformView(viewModel: self, parentStyle: parentStyle, styleKey: styleKey) { [weak self] style in guard let self = self else { return AnyView(PlatformView.nilView) } - let view = HStack(alignment: .center) { + let view = HStack(alignment: .center, spacing: 16) { Spacer() if self.depositAction != nil { @@ -85,6 +85,7 @@ public class dydxSimpleUIMarketsHeaderViewModel: PlatformViewModel { self.createMenuButton(parentStyle: style) } + return AnyView(view) } } @@ -92,8 +93,9 @@ public class dydxSimpleUIMarketsHeaderViewModel: PlatformViewModel { private func createDepositButton(parentStyle: ThemeStyle) -> some View { let iconName = "icon_transfer_deposit" let content = PlatformIconViewModel(type: .asset(name: iconName, bundle: .dydxView), - clip: .circle(background: .layer4, spacing: 16), - size: CGSize(width: 36, height: 36)) + clip: .circle(background: .layer5, spacing: 16, borderColor: .layer6), + size: CGSize(width: 36, height: 36), + templateColor: .textPrimary) return PlatformButtonViewModel(content: content, type: .iconType) { [weak self] in self?.depositAction?() @@ -104,8 +106,9 @@ public class dydxSimpleUIMarketsHeaderViewModel: PlatformViewModel { private func createWithdrawButton(parentStyle: ThemeStyle) -> some View { let iconName = "icon_transfer_withdrawal" let content = PlatformIconViewModel(type: .asset(name: iconName, bundle: .dydxView), - clip: .circle(background: .layer4, spacing: 16), - size: CGSize(width: 36, height: 36)) + clip: .circle(background: .layer5, spacing: 16, borderColor: .layer6), + size: CGSize(width: 36, height: 36), + templateColor: .textPrimary) return PlatformButtonViewModel(content: content, type: .iconType) { [weak self] in self?.withdrawAction?() @@ -116,8 +119,9 @@ public class dydxSimpleUIMarketsHeaderViewModel: PlatformViewModel { private func createMenuButton(parentStyle: ThemeStyle) -> some View { let iconName = "icon_list" let content = PlatformIconViewModel(type: .asset(name: iconName, bundle: .dydxView), - clip: .circle(background: .layer4, spacing: 16), - size: CGSize(width: 36, height: 36)) + clip: .circle(background: .layer5, spacing: 16, borderColor: .layer6), + size: CGSize(width: 36, height: 36), + templateColor: .textPrimary) return PlatformButtonViewModel(content: content, type: .iconType) { [weak self] in withAnimation(Animation.easeInOut) { diff --git a/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioPeriodView.swift b/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioPeriodView.swift index 5b4748c8..38821f1a 100644 --- a/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioPeriodView.swift +++ b/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioPeriodView.swift @@ -76,7 +76,7 @@ public class dydxSimpleUIPortfolioPeriodViewModel: PlatformViewModel { .themeColor(foreground: .textPrimary) .padding(.horizontal, 8) .padding(.vertical, 4) - .themeColor(background: .layer4) + .themeColor(background: .layer5) .cornerRadius(7, corners: .allCorners) } }) diff --git a/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioView.swift b/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioView.swift index 0f820aa5..d7c5618f 100644 --- a/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioView.swift +++ b/dydx/dydxViews/dydxViews/_v4/SimpleUI/Markets/components/dydxSimpleUIPortfolioView.swift @@ -89,6 +89,7 @@ public class dydxSimpleUIPortfolioViewModel: PlatformViewModel { private func createPortfolioView(style: ThemeStyle) -> some View { ZStack { chart.createView(parentStyle: style) + .opacity(0.6) .padding(.top, 78) VStack(spacing: 16) { @@ -115,7 +116,7 @@ public class dydxSimpleUIPortfolioViewModel: PlatformViewModel { Spacer() HStack(alignment: .center, spacing: 16) { - HStack(alignment: .center, spacing: 16) { + HStack(alignment: .center, spacing: 8) { Text(DataLocalizer.localize(path: "APP.GENERAL.BUYING_POWER")) .themeColor(foreground: .textTertiary) Text(sharedAccountViewModel?.buyingPower ?? "-") @@ -123,8 +124,6 @@ public class dydxSimpleUIPortfolioViewModel: PlatformViewModel { } .themeFont(fontSize: .small) - Spacer() - DividerModel().createView(parentStyle: style) Spacer() HStack(alignment: .center, spacing: 8) { diff --git a/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Contents.json b/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Contents.json index 9270f8ef..104ae867 100644 --- a/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Contents.json +++ b/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Splash.svg", + "filename" : "dYdX Logo (3) 1.svg", "idiom" : "universal" } ], diff --git a/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Splash.svg b/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Splash.svg deleted file mode 100644 index 76ae423d..00000000 --- a/dydxV4/dydxV4/Assets.xcassets/splash.imageset/Splash.svg +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dydxV4/dydxV4/Assets.xcassets/splash.imageset/dYdX Logo (3) 1.svg b/dydxV4/dydxV4/Assets.xcassets/splash.imageset/dYdX Logo (3) 1.svg new file mode 100644 index 00000000..a62d354d --- /dev/null +++ b/dydxV4/dydxV4/Assets.xcassets/splash.imageset/dYdX Logo (3) 1.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dydxV4/dydxV4/Launch Screen.storyboard b/dydxV4/dydxV4/Launch Screen.storyboard index c643be38..c3e7c66c 100644 --- a/dydxV4/dydxV4/Launch Screen.storyboard +++ b/dydxV4/dydxV4/Launch Screen.storyboard @@ -4,6 +4,7 @@ + @@ -17,18 +18,18 @@ - + + - + - @@ -39,9 +40,9 @@ - - - - + + + +