From f77cf4d13186e3323016162f7d072f1bd3a44674 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 18 Sep 2024 17:48:24 -0400 Subject: [PATCH] rename again --- .../dydxPresenters.xcodeproj/project.pbxproj | 8 ++++---- ...ProfileSecondaryButtonsViewPresenter.swift} | 10 +++++----- .../_v4/Profile/dydxProfileViewBuilder.swift | 6 +++--- .../dydxViews.xcodeproj/project.pbxproj | 8 ++++---- ...t => dydxProfileSecondaryButtonsView.swift} | 18 +++++++++--------- .../_v4/Profile/dydxProfileView.swift | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) rename dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/{dydxSettingsSecondaryActionsViewPresenter.swift => dydxProfileSecondaryButtonsViewPresenter.swift} (72%) rename dydx/dydxViews/dydxViews/_v4/Profile/Components/{dydxSettingsSecondaryActionsView.swift => dydxProfileSecondaryButtonsView.swift} (85%) diff --git a/dydx/dydxPresenters/dydxPresenters.xcodeproj/project.pbxproj b/dydx/dydxPresenters/dydxPresenters.xcodeproj/project.pbxproj index 8a375059b..19aba9416 100644 --- a/dydx/dydxPresenters/dydxPresenters.xcodeproj/project.pbxproj +++ b/dydx/dydxPresenters/dydxPresenters.xcodeproj/project.pbxproj @@ -162,7 +162,7 @@ 278EA5642BB610AC007A0E17 /* dydxNotificationsSettingsViewBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 278EA5632BB610AC007A0E17 /* dydxNotificationsSettingsViewBuilder.swift */; }; 278EA5662BB61C24007A0E17 /* KeyValueStoreProtocolStore+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 278EA5652BB61C24007A0E17 /* KeyValueStoreProtocolStore+Ext.swift */; }; 27B957ED2B97C07400EF9304 /* dydxShareActionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B957EC2B97C07400EF9304 /* dydxShareActionBuilder.swift */; }; - 27C027532AFD761300E92CCB /* dydxSettingsSecondaryActionsViewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C027522AFD761300E92CCB /* dydxSettingsSecondaryActionsViewPresenter.swift */; }; + 27C027532AFD761300E92CCB /* dydxProfileSecondaryButtonsViewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C027522AFD761300E92CCB /* dydxProfileSecondaryButtonsViewPresenter.swift */; }; 27DB2EA32AC1E7B20047BC39 /* dydxTradeRestrictedViewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27DB2EA22AC1E7B20047BC39 /* dydxTradeRestrictedViewPresenter.swift */; }; 27E0735C2C20D2470034B963 /* dydxCancelPendingIsolatedOrdersViewBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27E0735B2C20D2470034B963 /* dydxCancelPendingIsolatedOrdersViewBuilder.swift */; }; 314BBDE9F332ECA910BC414E /* Pods_iOS_dydxPresenters.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1551C00FFF41C29CFC5BD94 /* Pods_iOS_dydxPresenters.framework */; }; @@ -554,7 +554,7 @@ 278EA5632BB610AC007A0E17 /* dydxNotificationsSettingsViewBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxNotificationsSettingsViewBuilder.swift; sourceTree = ""; }; 278EA5652BB61C24007A0E17 /* KeyValueStoreProtocolStore+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyValueStoreProtocolStore+Ext.swift"; sourceTree = ""; }; 27B957EC2B97C07400EF9304 /* dydxShareActionBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = dydxShareActionBuilder.swift; sourceTree = ""; }; - 27C027522AFD761300E92CCB /* dydxSettingsSecondaryActionsViewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxSettingsSecondaryActionsViewPresenter.swift; sourceTree = ""; }; + 27C027522AFD761300E92CCB /* dydxProfileSecondaryButtonsViewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxProfileSecondaryButtonsViewPresenter.swift; sourceTree = ""; }; 27DB2EA22AC1E7B20047BC39 /* dydxTradeRestrictedViewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxTradeRestrictedViewPresenter.swift; sourceTree = ""; }; 27E0735B2C20D2470034B963 /* dydxCancelPendingIsolatedOrdersViewBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxCancelPendingIsolatedOrdersViewBuilder.swift; sourceTree = ""; }; 64487FFE2AA248340068DD87 /* dydxAlertsWorker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = dydxAlertsWorker.swift; sourceTree = ""; }; @@ -973,7 +973,7 @@ 028DB33F2A05893D0090BE58 /* dydxProfileHeaderViewPresenter.swift */, 02F95A8D2A1D6AAD00828F9A /* dydxProfileHistoryViewPresenter.swift */, 02F6E71E2A8293270018F00C /* dydxProfileFeesViewPresenter.swift */, - 27C027522AFD761300E92CCB /* dydxSettingsSecondaryActionsViewPresenter.swift */, + 27C027522AFD761300E92CCB /* dydxProfileSecondaryButtonsViewPresenter.swift */, ); path = Components; sourceTree = ""; @@ -2001,7 +2001,7 @@ 272911D62C06A628003F3EA0 /* TransferAnalytics.swift in Sources */, 0257C78E2A00485500F6160B /* SparklineDataPoint.swift in Sources */, 028DB3402A05893D0090BE58 /* dydxProfileHeaderViewPresenter.swift in Sources */, - 27C027532AFD761300E92CCB /* dydxSettingsSecondaryActionsViewPresenter.swift in Sources */, + 27C027532AFD761300E92CCB /* dydxProfileSecondaryButtonsViewPresenter.swift in Sources */, 02EF485629F732C600C97746 /* dydxFavoriteStore.swift in Sources */, 0208627C28F4DAC000C9D3A0 /* dydxMarketInfoPagingViewPresenter.swift in Sources */, 0238FECB2970D681002E1C1A /* SharedAccountPresenter.swift in Sources */, diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxSettingsSecondaryActionsViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileSecondaryButtonsViewPresenter.swift similarity index 72% rename from dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxSettingsSecondaryActionsViewPresenter.swift rename to dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileSecondaryButtonsViewPresenter.swift index 415281ec7..44c015202 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxSettingsSecondaryActionsViewPresenter.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileSecondaryButtonsViewPresenter.swift @@ -1,5 +1,5 @@ // -// dydxSettingsHelpRowViewPresenter.swift +// dydxProfileSecondaryButtonsViewPresenter.swift // dydxPresenters // // Created by Michael Maguire on 11/9/23. @@ -14,12 +14,12 @@ import PlatformUI import dydxStateManager import dydxFormatter -protocol dydxSettingsHelpRowViewPresenterProtocol: HostedViewPresenterProtocol { - var viewModel: dydxSettingsSecondaryActionsViewModel? { get } +protocol dydxProfileSecondaryButtonsViewPresenterProtocol: HostedViewPresenterProtocol { + var viewModel: dydxProfileSecondaryButtonsViewModel? { get } } -class dydxSettingsHelpRowViewPresenter: HostedViewPresenter, dydxSettingsHelpRowViewPresenterProtocol { - init(viewModel: dydxSettingsSecondaryActionsViewModel) { +class dydxProfileSecondaryButtonsViewPresenter: HostedViewPresenter, dydxProfileSecondaryButtonsViewPresenterProtocol { + init(viewModel: dydxProfileSecondaryButtonsViewModel) { super.init() self.viewModel = viewModel diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/dydxProfileViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/dydxProfileViewBuilder.swift index 82102177e..38d60f7eb 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/dydxProfileViewBuilder.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/dydxProfileViewBuilder.swift @@ -41,7 +41,7 @@ private protocol dydxProfileViewPresenterProtocol: HostedViewPresenterProtocol { private class dydxProfileViewPresenter: HostedViewPresenter, dydxProfileViewPresenterProtocol { private let buttonsPresenter: dydxProfileButtonsViewPresenter - private let settingsHelpRowPresenter: dydxSettingsHelpRowViewPresenter + private let secondaryButtonsPresenter: dydxProfileSecondaryButtonsViewPresenter private let headerPresenter: dydxProfileHeaderViewPresenter private let historyPresenter: dydxProfileHistoryViewPresenter private let feesPresenter: dydxProfileFeesViewPresenter @@ -50,7 +50,7 @@ private class dydxProfileViewPresenter: HostedViewPresenter Void)? @Published public var helpAction: (() -> Void)? @Published public var alertsAction: (() -> Void)? public init() { } - public static var previewValue: dydxSettingsSecondaryActionsViewModel { - let vm = dydxSettingsSecondaryActionsViewModel() + public static var previewValue: dydxProfileSecondaryButtonsViewModel { + let vm = dydxProfileSecondaryButtonsViewModel() return vm } @@ -41,7 +41,7 @@ public class dydxSettingsSecondaryActionsViewModel: PlatformViewModel { if let alertsAction { self.createButton(imageName: "icon_alerts", title: DataLocalizer.localize(path: "APP.GENERAL.ALERTS"), - action: self.alertsAction) + action: alertsAction) } } @@ -84,26 +84,26 @@ public class dydxSettingsSecondaryActionsViewModel: PlatformViewModel { } #if DEBUG -struct dydxSettingsSecondaryActionsViewModel_Previews_Dark: PreviewProvider { +struct dydxProfileSecondaryButtonsViewModel_Previews_Dark: PreviewProvider { @StateObject static var themeSettings = ThemeSettings.shared static var previews: some View { ThemeSettings.applyDarkTheme() ThemeSettings.applyStyles() - return dydxSettingsSecondaryActionsViewModel.previewValue + return dydxProfileSecondaryButtonsViewModel.previewValue .createView() // .edgesIgnoringSafeArea(.bottom) .previewLayout(.sizeThatFits) } } -struct dydxSettingsSecondaryActionsViewModel_Previews_Light: PreviewProvider { +struct dydxProfileSecondaryButtonsViewModel_Previews_Light: PreviewProvider { @StateObject static var themeSettings = ThemeSettings.shared static var previews: some View { ThemeSettings.applyLightTheme() ThemeSettings.applyStyles() - return dydxSettingsSecondaryActionsViewModel.previewValue + return dydxProfileSecondaryButtonsViewModel.previewValue .createView() // .edgesIgnoringSafeArea(.bottom) .previewLayout(.sizeThatFits) diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/dydxProfileView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/dydxProfileView.swift index 0e6cb6e4e..620c92b48 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/dydxProfileView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/dydxProfileView.swift @@ -14,7 +14,7 @@ import dydxFormatter public class dydxProfileViewModel: PlatformViewModel { @Published public var header = dydxProfileHeaderViewModel() @Published public var buttons = dydxProfileButtonsViewModel() - @Published public var secondaryActions = dydxSettingsSecondaryActionsViewModel() + @Published public var secondaryButtons = dydxProfileSecondaryButtonsViewModel() @Published public var history: dydxProfileHistoryViewModel? = dydxProfileHistoryViewModel() @Published public var fees: dydxProfileFeesViewModel? = dydxProfileFeesViewModel() @Published public var balances: dydxProfileBalancesViewModel? = dydxProfileBalancesViewModel() @@ -40,7 +40,7 @@ public class dydxProfileViewModel: PlatformViewModel { self.buttons .createView(parentStyle: style) - self.secondaryActions + self.secondaryButtons .createView(parentStyle: style) .padding(.top, 8)