Browse Source

Refactor to Display Name

Jonas Björkert 2 years ago
parent
commit
b5a8145ade

+ 1 - 1
LoopFollow/Controllers/AppStateController.swift

@@ -49,7 +49,7 @@ enum GeneralSettingsChangeEnum: Int {
     case showStatsChange = 1024
     case showStatsChange = 1024
     case showSmallGraphChange = 2048
     case showSmallGraphChange = 2048
     case useIFCCChange = 4096
     case useIFCCChange = 4096
-    case showAppNameChange = 8192
+    case showDisplayNameChange = 8192
 }
 }
 
 
 class AppStateController {
 class AppStateController {

+ 1 - 1
LoopFollow/Controllers/Nightscout/BGData.swift

@@ -205,7 +205,7 @@ extension MainViewController {
     }
     }
     
     
     func updateServerText(with serverText: String? = nil) {
     func updateServerText(with serverText: String? = nil) {
-        if UserDefaultsRepository.showAppName.value, let displayName = Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String {
+        if UserDefaultsRepository.showDisplayName.value, let displayName = Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") as? String {
             self.serverText.text = displayName
             self.serverText.text = displayName
         } else if let serverText = serverText {
         } else if let serverText = serverText {
             self.serverText.text = serverText
             self.serverText.text = serverText

+ 5 - 5
LoopFollow/ViewControllers/GeneralSettingsViewController.swift

@@ -151,16 +151,16 @@ class GeneralSettingsViewController: FormViewController {
                     NotificationCenter.default.post(name: Notification.Name("toggleSpeakBG"), object: nil)
                     NotificationCenter.default.post(name: Notification.Name("toggleSpeakBG"), object: nil)
         }
         }
         
         
-       <<< SwitchRow("showAppName") { row in
-           row.title = "Show App Name"
-           row.value = UserDefaultsRepository.showAppName.value
+       <<< SwitchRow("showDisplayName") { row in
+           row.title = "Show Display Name"
+           row.value = UserDefaultsRepository.showDisplayName.value
        }.onChange { [weak self] row in
        }.onChange { [weak self] row in
            guard let value = row.value else { return }
            guard let value = row.value else { return }
-           UserDefaultsRepository.showAppName.value = value
+           UserDefaultsRepository.showDisplayName.value = value
 
 
            if let appState = self!.appStateController {
            if let appState = self!.appStateController {
                appState.generalSettingsChanged = true
                appState.generalSettingsChanged = true
-               appState.generalSettingsChanges |= GeneralSettingsChangeEnum.showAppNameChange.rawValue
+               appState.generalSettingsChanges |= GeneralSettingsChangeEnum.showDisplayNameChange.rawValue
            }
            }
        }
        }
 
 

+ 1 - 1
LoopFollow/ViewControllers/MainViewController.swift

@@ -338,7 +338,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
                     BGChartFull.isHidden = !UserDefaultsRepository.showSmallGraph.value
                     BGChartFull.isHidden = !UserDefaultsRepository.showSmallGraph.value
                 }
                 }
                 
                 
-                if appState.generalSettingsChanges & GeneralSettingsChangeEnum.showAppNameChange.rawValue != 0 {
+                if appState.generalSettingsChanges & GeneralSettingsChangeEnum.showDisplayNameChange.rawValue != 0 {
                     self.updateServerText()
                     self.updateServerText()
                 }
                 }
                 
                 

+ 1 - 1
LoopFollow/repository/UserDefaults.swift

@@ -75,7 +75,7 @@ class UserDefaultsRepository {
     static let useIFCC = UserDefaultsValue<Bool>(key: "useIFCC", default: false)
     static let useIFCC = UserDefaultsValue<Bool>(key: "useIFCC", default: false)
     static let showSmallGraph = UserDefaultsValue<Bool>(key: "showSmallGraph", default: true)
     static let showSmallGraph = UserDefaultsValue<Bool>(key: "showSmallGraph", default: true)
     static let speakBG = UserDefaultsValue<Bool>(key: "speakBG", default: false)
     static let speakBG = UserDefaultsValue<Bool>(key: "speakBG", default: false)
-    static let showAppName = UserDefaultsValue<Bool>(key: "showAppName", default: false)
+    static let showDisplayName = UserDefaultsValue<Bool>(key: "showDisplayName", default: false)
     static let backgroundRefreshFrequency = UserDefaultsValue<Double>(key: "backgroundRefreshFrequency", default: 1)
     static let backgroundRefreshFrequency = UserDefaultsValue<Double>(key: "backgroundRefreshFrequency", default: 1)
     static let backgroundRefresh = UserDefaultsValue<Bool>(key: "backgroundRefresh", default: true)
     static let backgroundRefresh = UserDefaultsValue<Bool>(key: "backgroundRefresh", default: true)
     static let appBadge = UserDefaultsValue<Bool>(key: "appBadge", default: true)
     static let appBadge = UserDefaultsValue<Bool>(key: "appBadge", default: true)