Show battery rem. only when power source is battery

gao-sun · Feb 4, 2021 · ad959d9 · ad959d9
1 parent 4cb5d9a
commit ad959d9
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 16 deletions.
diff --git a/Resource/ar.lproj/Localizable.strings b/Resource/ar.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "البطارية";
 "battery.charge" = "شحن البطارية";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Power Source";
 "battery.power_source.battery" = "مصدر الطاقة";
 "battery.power_source.acPower" = "تيار مستمر";

diff --git a/Resource/cs.lproj/Localizable.strings b/Resource/cs.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Baterie";
 "battery.charge" = "Nabito";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Zdroj Energie";
 "battery.power_source.battery" = "Baterie";
 "battery.power_source.acPower" = "Nápájen ze Sítě";

diff --git a/Resource/de.lproj/Localizable.strings b/Resource/de.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Batterie";
 "battery.charge" = "Laden";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Stromquelle";
 "battery.power_source.battery" = "Batterie";
 "battery.power_source.acPower" = "Netzteil";

diff --git a/Resource/en.lproj/Localizable.strings b/Resource/en.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Battery";
 "battery.charge" = "Charge";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Power Source";
 "battery.power_source.battery" = "Battery";
 "battery.power_source.acPower" = "AC Power";

diff --git a/Resource/es.lproj/Localizable.strings b/Resource/es.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Batería";
 "battery.charge" = "Carga";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Alimentación";
 "battery.power_source.battery" = "Batería";
 "battery.power_source.acPower" = "Alimentación CA";

diff --git a/Resource/fr.lproj/Localizable.strings b/Resource/fr.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Batterie";
 "battery.charge" = "Charge";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Source d'alimentation";
 "battery.power_source.battery" = "Batterie";
 "battery.power_source.acPower" = "Adaptateur secteur";

diff --git a/Resource/ja.lproj/Localizable.strings b/Resource/ja.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "バッテリー";
 "battery.charge" = "充電";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "電源";
 "battery.power_source.battery" = "バッテリー";
 "battery.power_source.acPower" = "電源アダプタ";

diff --git a/Resource/mn.lproj/Localizable.strings b/Resource/mn.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Батaрей";
 "battery.charge" = "Цэнэг";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Эх үүсвэр";
 "battery.power_source.battery" = "Батарей";
 "battery.power_source.acPower" = "Цэнэглэгч";

diff --git a/Resource/pt.lproj/Localizable.strings b/Resource/pt.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Bateria";
 "battery.charge" = "Carga";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Fonte de Alimentação";
 "battery.power_source.battery" = "Bateria";
 "battery.power_source.acPower" = "Fonte AC";

diff --git a/Resource/ru.lproj/Localizable.strings b/Resource/ru.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Батарея";
 "battery.charge" = "Заряд";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Источник питания";
 "battery.power_source.battery" = "Батарея";
 "battery.power_source.acPower" = "Сетевой Адаптер";

diff --git a/Resource/uk.lproj/Localizable.strings b/Resource/uk.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "Акумулятор";
 "battery.charge" = "Заряд";
-"battery.timeRemaining" = "Time Rem.";
+"battery.time_remaining" = "Time Rem.";
 "battery.power_source" = "Джерело живлення";
 "battery.power_source.battery" = "Акумулятор";
 "battery.power_source.acPower" = "Електромережа";

diff --git a/Resource/zh-Hans.lproj/Localizable.strings b/Resource/zh-Hans.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 // MARK: Battery
 "battery" = "电池";
 "battery.charge" = "电量";
-"battery.timeRemaining" = "剩余时间";
+"battery.time_remaining" = "剩余时间";
 "battery.power_source" = "电源";
 "battery.power_source.battery" = "电池";
 "battery.power_source.acPower" = "电源适配器";

diff --git a/eul/Store/BatteryStore.swift b/eul/Store/BatteryStore.swift
@@ -25,7 +25,7 @@ class BatteryStore: ObservableObject, Refreshable {
     @Published var maxCapacity = 0
     @Published var designCapacity = 0
     @Published var cycleCount = 0
-    @Published var timeRemaining = ""
+    @Published var timeRemaining = "∞"
 
     var charge: Double {
         io.currentCharge
@@ -52,7 +52,7 @@ class BatteryStore: ObservableObject, Refreshable {
         maxCapacity = battery.maxCapactiy()
         designCapacity = battery.designCapacity()
         cycleCount = battery.cycleCount()
-        timeRemaining = battery.timeRemainingFormatted()
+        timeRemaining = io.powerSource == .battery ? battery.timeRemainingFormatted() : "∞"
         _ = battery.close()
         writeToContainer()
     }

diff --git a/eul/Views/Menu/BatteryMenuBlockView.swift b/eul/Views/Menu/BatteryMenuBlockView.swift
@@ -77,8 +77,10 @@ struct BatteryMenuBlockView: View {
                 MiniSectionView(title: "battery.cycle_count".localized(), value: batteryStore.cycleCount.description)
                 Spacer()
                 MiniSectionView(title: "battery.condition".localized(), value: io.condition.description)
-                Spacer()
-                MiniSectionView(title: "battery.timeRemaining".localized(), value: batteryStore.timeRemaining)
+                if io.powerSource == .battery {
+                    Spacer()
+                    MiniSectionView(title: "battery.time_remaining".localized(), value: batteryStore.timeRemaining)
+                }
             }
         }
         .menuBlock()