From 07a1adf9d1884d4a5f20e3632630e5d122247d8d Mon Sep 17 00:00:00 2001 From: dankito Date: Mon, 7 Sep 2020 19:02:01 +0200 Subject: [PATCH] Renamed AccountsTab to AccountsDialog and SettingsTab to SettingsDialog --- .../BankingiOSApp.xcodeproj/project.pbxproj | 16 ++++++++-------- .../BankingiOSApp/Base.lproj/Localizable.strings | 2 +- .../BankingiOSApp/TabBarController.swift | 4 ++-- .../BankingiOSApp/de.lproj/Localizable.strings | 2 +- .../{AccountsTab.swift => AccountsDialog.swift} | 6 +++--- .../{SettingsTab.swift => SettingsDialog.swift} | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) rename ui/BankingiOSApp/BankingiOSApp/ui/views/{AccountsTab.swift => AccountsDialog.swift} (91%) rename ui/BankingiOSApp/BankingiOSApp/ui/views/{SettingsTab.swift => SettingsDialog.swift} (98%) diff --git a/ui/BankingiOSApp/BankingiOSApp.xcodeproj/project.pbxproj b/ui/BankingiOSApp/BankingiOSApp.xcodeproj/project.pbxproj index d58d8d44..2d87bca5 100644 --- a/ui/BankingiOSApp/BankingiOSApp.xcodeproj/project.pbxproj +++ b/ui/BankingiOSApp/BankingiOSApp.xcodeproj/project.pbxproj @@ -91,7 +91,7 @@ 36D60F7924FFB6F100596ABC /* Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36D60F7824FFB6F100596ABC /* Messages.swift */; }; 36E21ECB24D88DF000649DC8 /* UIKitExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21ECA24D88DF000649DC8 /* UIKitExtensions.swift */; }; 36E21ECF24DA0EEE00649DC8 /* IconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21ECE24DA0EEE00649DC8 /* IconView.swift */; }; - 36E21ED124DC540400649DC8 /* SettingsTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21ED024DC540400649DC8 /* SettingsTab.swift */; }; + 36E21ED124DC540400649DC8 /* SettingsDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21ED024DC540400649DC8 /* SettingsDialog.swift */; }; 36E21ED524DC549800649DC8 /* BankSettingsDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21ED424DC549800649DC8 /* BankSettingsDialog.swift */; }; 36E21ED724DC617200649DC8 /* BankAccountSettingsDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21ED624DC617200649DC8 /* BankAccountSettingsDialog.swift */; }; 36E21EDB24DC990300649DC8 /* LabelledUIKitTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E21EDA24DC990300649DC8 /* LabelledUIKitTextField.swift */; }; @@ -108,7 +108,7 @@ 36FC92C124B39A08002B12E9 /* BankingiOSAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36FC92C024B39A08002B12E9 /* BankingiOSAppUITests.swift */; }; 36FC92D024B39C47002B12E9 /* fints4k.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36FC92CF24B39C47002B12E9 /* fints4k.framework */; }; 36FC92D124B39C47002B12E9 /* fints4k.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 36FC92CF24B39C47002B12E9 /* fints4k.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 36FC92DC24B3A4A0002B12E9 /* AccountsTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36FC92DB24B3A4A0002B12E9 /* AccountsTab.swift */; }; + 36FC92DC24B3A4A0002B12E9 /* AccountsDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36FC92DB24B3A4A0002B12E9 /* AccountsDialog.swift */; }; 36FC92E824B3B1DC002B12E9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 36FC92EA24B3B1DC002B12E9 /* Localizable.strings */; }; 36FC92EF24B3BB81002B12E9 /* AddAccountDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36FC92EE24B3BB81002B12E9 /* AddAccountDialog.swift */; }; /* End PBXBuildFile section */ @@ -228,7 +228,7 @@ 36D60F7824FFB6F100596ABC /* Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Messages.swift; sourceTree = ""; }; 36E21ECA24D88DF000649DC8 /* UIKitExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIKitExtensions.swift; sourceTree = ""; }; 36E21ECE24DA0EEE00649DC8 /* IconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconView.swift; sourceTree = ""; }; - 36E21ED024DC540400649DC8 /* SettingsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTab.swift; sourceTree = ""; }; + 36E21ED024DC540400649DC8 /* SettingsDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsDialog.swift; sourceTree = ""; }; 36E21ED424DC549800649DC8 /* BankSettingsDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BankSettingsDialog.swift; sourceTree = ""; }; 36E21ED624DC617200649DC8 /* BankAccountSettingsDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BankAccountSettingsDialog.swift; sourceTree = ""; }; 36E21EDA24DC990300649DC8 /* LabelledUIKitTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelledUIKitTextField.swift; sourceTree = ""; }; @@ -251,7 +251,7 @@ 36FC92C024B39A08002B12E9 /* BankingiOSAppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BankingiOSAppUITests.swift; sourceTree = ""; }; 36FC92C224B39A08002B12E9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 36FC92CF24B39C47002B12E9 /* fints4k.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = fints4k.framework; path = "../../fints4k/build/xcode-frameworks/fints4k.framework"; sourceTree = ""; }; - 36FC92DB24B3A4A0002B12E9 /* AccountsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsTab.swift; sourceTree = ""; }; + 36FC92DB24B3A4A0002B12E9 /* AccountsDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsDialog.swift; sourceTree = ""; }; 36FC92EC24B3B371002B12E9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; 36FC92ED24B3B3A2002B12E9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; 36FC92EE24B3BB81002B12E9 /* AddAccountDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountDialog.swift; sourceTree = ""; }; @@ -479,7 +479,7 @@ isa = PBXGroup; children = ( 36B8A4502503DE1800C15359 /* LoginDialog.swift */, - 36FC92DB24B3A4A0002B12E9 /* AccountsTab.swift */, + 36FC92DB24B3A4A0002B12E9 /* AccountsDialog.swift */, 360782C024E18D5E0098FEFE /* AddAccountButtonView.swift */, 36FC92EE24B3BB81002B12E9 /* AddAccountDialog.swift */, 36BE068E24CEE1BD00CBBB68 /* AllBanksListItem.swift */, @@ -496,7 +496,7 @@ 36BE064E24C9A17F00CBBB68 /* ImageTanView.swift */, 360782C624E544170098FEFE /* FlickerCodeTanView.swift */, 360782D224F429F70098FEFE /* FlickerCodeStripe.swift */, - 36E21ED024DC540400649DC8 /* SettingsTab.swift */, + 36E21ED024DC540400649DC8 /* SettingsDialog.swift */, 36E21ED424DC549800649DC8 /* BankSettingsDialog.swift */, 36E21ED624DC617200649DC8 /* BankAccountSettingsDialog.swift */, 36B8A4472503D12100C15359 /* ProtectAppSettingsDialog.swift */, @@ -692,7 +692,7 @@ 360782C524E541970098FEFE /* ScaleImageView.swift in Sources */, 366FA4E224C4ED6C0094F009 /* EnterTanDialog.swift in Sources */, 361116AA250562CF00315620 /* TouchIDButton.swift in Sources */, - 36FC92DC24B3A4A0002B12E9 /* AccountsTab.swift in Sources */, + 36FC92DC24B3A4A0002B12E9 /* AccountsDialog.swift in Sources */, 36BCF86E24BA691B005BEC29 /* DependencyInjector.swift in Sources */, 36BE06C224D07FB100CBBB68 /* Favicon.swift in Sources */, 36BE06B824D077EC00CBBB68 /* SwiftBankIconFinder.swift in Sources */, @@ -750,7 +750,7 @@ 36BE068F24CEE1BD00CBBB68 /* AllBanksListItem.swift in Sources */, 360782C324E49FF70098FEFE /* ValidationLabel.swift in Sources */, 36BE069124CEF52800CBBB68 /* UpdateButton.swift in Sources */, - 36E21ED124DC540400649DC8 /* SettingsTab.swift in Sources */, + 36E21ED124DC540400649DC8 /* SettingsDialog.swift in Sources */, 366FA4DC24C479120094F009 /* BankInfoListItem.swift in Sources */, 36B8A44B2503D1E800C15359 /* BiometricAuthenticationService.swift in Sources */, 36FC929E24B39A05002B12E9 /* SceneDelegate.swift in Sources */, diff --git a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings index c57015d6..3e3ea633 100644 --- a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings +++ b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings @@ -130,7 +130,7 @@ Unfortunately, Bankmeister cannot know whether a bank charges for instant paymen "Could not change TAN medium to %@. Error: %@." = "Could not change TAN medium to '%@'.\n\nError message from your bank:\n\n%@."; -/* SettingsTab */ +/* SettingsDialog */ "Secure app data" = "Secure app data"; diff --git a/ui/BankingiOSApp/BankingiOSApp/TabBarController.swift b/ui/BankingiOSApp/BankingiOSApp/TabBarController.swift index c52f15eb..c1c41b51 100644 --- a/ui/BankingiOSApp/BankingiOSApp/TabBarController.swift +++ b/ui/BankingiOSApp/BankingiOSApp/TabBarController.swift @@ -20,14 +20,14 @@ class TabBarController : UITabBarController, UITabBarControllerDelegate { private func setupTabs() { - let accountsTab = buildControllerAndTabBarItem("Accounts", "Accounts", AccountsTab(data: data)) + let accountsTab = buildControllerAndTabBarItem("Accounts", "Accounts", AccountsDialog(data: data)) let newOptionsTab = InterceptTabClickViewController { self.showNewOptionsActionSheet() } newOptionsTab.tabBarItem = buildTabBarItem("New", "New") - let settingsTab = buildControllerAndTabBarItem("Settings", "Settings", SettingsTab(data: data)) + let settingsTab = buildControllerAndTabBarItem("Settings", "Settings", SettingsDialog(data: data)) self.viewControllers = [accountsTab, newOptionsTab, settingsTab] diff --git a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings index a339ee78..d2d8160e 100644 --- a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings +++ b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings @@ -130,7 +130,7 @@ Ob eine Bank Gebühren für Echtzeitüberweisungen erhebt, kann Bankmeister leid "Could not change TAN medium to %@. Error: %@." = "TAN medium konnte nicht zu '%@' geändert werden.\n\nFehlermeldung Ihrer Bank:\n\n%@."; -/* SettingsTab */ +/* SettingsDialog */ "Secure app data" = "Appdaten schützen"; diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/views/AccountsTab.swift b/ui/BankingiOSApp/BankingiOSApp/ui/views/AccountsDialog.swift similarity index 91% rename from ui/BankingiOSApp/BankingiOSApp/ui/views/AccountsTab.swift rename to ui/BankingiOSApp/BankingiOSApp/ui/views/AccountsDialog.swift index 651872e0..49a89d2f 100644 --- a/ui/BankingiOSApp/BankingiOSApp/ui/views/AccountsTab.swift +++ b/ui/BankingiOSApp/BankingiOSApp/ui/views/AccountsDialog.swift @@ -2,7 +2,7 @@ import SwiftUI import BankingUiSwift -struct AccountsTab: View { +struct AccountsDialog: View { @Inject private var presenter: BankingPresenterSwift @@ -45,13 +45,13 @@ struct AccountsTab: View { } -struct AccountsTab_Previews: PreviewProvider { +struct AccountsDialog_Previews: PreviewProvider { static var previews: some View { let data = AppData() data.banks = previewBanks - return AccountsTab(data: data) + return AccountsDialog(data: data) } } diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/views/SettingsTab.swift b/ui/BankingiOSApp/BankingiOSApp/ui/views/SettingsDialog.swift similarity index 98% rename from ui/BankingiOSApp/BankingiOSApp/ui/views/SettingsTab.swift rename to ui/BankingiOSApp/BankingiOSApp/ui/views/SettingsDialog.swift index 37a38edd..2efbf256 100644 --- a/ui/BankingiOSApp/BankingiOSApp/ui/views/SettingsTab.swift +++ b/ui/BankingiOSApp/BankingiOSApp/ui/views/SettingsDialog.swift @@ -2,7 +2,7 @@ import SwiftUI import BankingUiSwift -struct SettingsTab: View { +struct SettingsDialog: View { @Environment(\.editMode) var editMode @@ -116,7 +116,7 @@ struct SettingsTab: View { struct SettingsDialog_Previews: PreviewProvider { static var previews: some View { - SettingsTab(data: AppData()) + SettingsDialog(data: AppData()) } }