Просмотр исходного кода

Merge pull request #34 from AndreasStokholm/fix/respect-threshold

Respect carbs required threshold settings for badge on main tab
Deniz Cengiz 2 лет назад
Родитель
Сommit
535a76fb2d
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

+ 2 - 1
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -783,7 +783,8 @@ extension Home {
                 TabView {
                     let carbsRequiredBadge: String? = {
                         guard let carbsRequired = state.carbsRequired else { return nil }
-                        return carbsRequired > 0 ? "\(numberFormatter.string(from: carbsRequired as NSNumber) ?? "") " +
+                        return carbsRequired > state.settingsManager.settings
+                            .carbsRequiredThreshold ? "\(numberFormatter.string(from: carbsRequired as NSNumber) ?? "") " +
                             NSLocalizedString("g", comment: "Short representation of grams") : nil
                     }()