From eb4fc1aaeb57fa7f1b7ca8782db6ffbc11011e94 Mon Sep 17 00:00:00 2001 From: dankito Date: Mon, 7 Sep 2020 18:26:50 +0200 Subject: [PATCH] Renamed all icons to start with an upper case letter; renamed gear.fill to Settings --- .../{gear.fill.imageset => Settings.imageset}/Contents.json | 0 .../{gear.fill.imageset => Settings.imageset}/gear.fill.pdf | 0 ui/BankingiOSApp/BankingiOSApp/TabBarController.swift | 6 +++--- ui/BankingiOSApp/BankingiOSApp/ui/Styles.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/{gear.fill.imageset => Settings.imageset}/Contents.json (100%) rename ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/{gear.fill.imageset => Settings.imageset}/gear.fill.pdf (100%) diff --git a/ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/gear.fill.imageset/Contents.json b/ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/Settings.imageset/Contents.json similarity index 100% rename from ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/gear.fill.imageset/Contents.json rename to ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/Settings.imageset/Contents.json diff --git a/ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/gear.fill.imageset/gear.fill.pdf b/ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/Settings.imageset/gear.fill.pdf similarity index 100% rename from ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/gear.fill.imageset/gear.fill.pdf rename to ui/BankingiOSApp/BankingiOSApp/Assets.xcassets/Settings.imageset/gear.fill.pdf diff --git a/ui/BankingiOSApp/BankingiOSApp/TabBarController.swift b/ui/BankingiOSApp/BankingiOSApp/TabBarController.swift index 7a87bb5c..c52f15eb 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", AccountsTab(data: data)) let newOptionsTab = InterceptTabClickViewController { self.showNewOptionsActionSheet() } - newOptionsTab.tabBarItem = buildTabBarItem("New", "new") + newOptionsTab.tabBarItem = buildTabBarItem("New", "New") - let settingsTab = buildControllerAndTabBarItem("Settings", "gear.fill", SettingsTab(data: data)) + let settingsTab = buildControllerAndTabBarItem("Settings", "Settings", SettingsTab(data: data)) self.viewControllers = [accountsTab, newOptionsTab, settingsTab] diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/Styles.swift b/ui/BankingiOSApp/BankingiOSApp/ui/Styles.swift index 81b874a3..5d3f5c03 100644 --- a/ui/BankingiOSApp/BankingiOSApp/ui/Styles.swift +++ b/ui/BankingiOSApp/BankingiOSApp/ui/Styles.swift @@ -15,7 +15,7 @@ class Styles { static let NegativeAmountColor = Color.red - static let AccountFallbackIcon = "accounts" + static let AccountFallbackIcon = "Accounts" }