fix bug: tools category switches don't show on two columns mode(#70)

jacklandrin · Jan 19, 2023 · f46335d · f46335d
1 parent 24a6082
commit f46335d
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 0 deletions.
diff --git a/Localization/de.lproj/Localizable.strings b/Localization/de.lproj/Localizable.strings
@@ -143,3 +143,4 @@
 "Turn off" = "ist ausschaltet";
 "Turn on" = "ist einschaltet";
 "Running" = "ausführt";
+"TOOLS" = "WERKZEUG";
diff --git a/Localization/en.lproj/Localizable.strings b/Localization/en.lproj/Localizable.strings
@@ -142,3 +142,4 @@
 "Turn off" = "Turn off";
 "Turn on" = "Turn on";
 "Running" = "Running";
+"TOOLS" = "TOOLS";
diff --git a/Localization/es.lproj/Localizable.strings b/Localization/es.lproj/Localizable.strings
@@ -141,3 +141,4 @@ Creado por Jacklandrin el día 14/12/2021.
 "Turn off" = "Apagar";
 "Turn on" = "Encender";
 "Running" = "Procesando";
+"TOOLS" = "HERRAMIENTAS";
diff --git a/Localization/fil.lproj/Localizable.strings b/Localization/fil.lproj/Localizable.strings
@@ -143,3 +143,4 @@
 "Turn off" = "Patayin";
 "Turn on" = "I-on";
 "Running" = "patakbuhin";
+"TOOLS" = "MGA TOOL";
diff --git a/Localization/fr.lproj/Localizable.strings b/Localization/fr.lproj/Localizable.strings
@@ -141,3 +141,4 @@
 "Turn off" = "Éteindre";
 "Turn on" = "Allumer";
 "Running" = "en cours";
+"TOOLS" = "OUTILS";
diff --git a/Localization/hr.lproj/Localizable.strings b/Localization/hr.lproj/Localizable.strings
@@ -140,3 +140,4 @@
 "Turn off" = "Isključiti";
 "Turn on" = "Upaliti";
 "Running" = "Pokreni";
+"TOOLS" = "ALATI";
diff --git a/Localization/it.lproj/Localizable.strings b/Localization/it.lproj/Localizable.strings
@@ -142,3 +142,4 @@
 "Turn off" = "Spegnere";
 "Turn on" = "Accendere";
 "Running" = "Esegui";
+"TOOLS" = "UTENSILI";
diff --git a/Localization/ja.lproj/Localizable.strings b/Localization/ja.lproj/Localizable.strings
@@ -145,3 +145,4 @@
 "Turn off" = "消す";
 "Turn on" = "オンにする";
 "Running" = "実行している";
+"TOOLS" = "ツール";
diff --git a/Localization/ko.lproj/Localizable.strings b/Localization/ko.lproj/Localizable.strings
@@ -145,3 +145,4 @@
 "Turn off" = "끄다";
 "Turn on" = "켜다";
 "Running" = "진행 중";
+"TOOLS" = "도구";
diff --git a/Localization/nl.lproj/Localizable.strings b/Localization/nl.lproj/Localizable.strings
@@ -142,3 +142,4 @@
 "Turn off" = "Uitschakelen";
 "Turn on" = "Inschakelen";
 "Running" = "Uitvoeren";
+"TOOLS" = "HULPMIDDELEN";
diff --git a/Localization/pl.lproj/Localizable.strings b/Localization/pl.lproj/Localizable.strings
@@ -143,3 +143,4 @@
 "Turn off" = "Wyłączyć";
 "Turn on" = "Włączyć coś";
 "Running" = "Uruchom";
+"TOOLS" = "NARZĘDZIA";
diff --git a/Localization/ru.lproj/Localizable.strings b/Localization/ru.lproj/Localizable.strings
@@ -142,3 +142,4 @@
 "Turn off" = "Выключать";
 "Turn on" = "Включи";
 "Running" = "Запустить";
+"TOOLS" = "ИНСТРУМЕНТЫ";
diff --git a/Localization/so.lproj/Localizable.strings b/Localization/so.lproj/Localizable.strings
@@ -142,3 +142,4 @@
 "Turn off" = "Dami";
 "Turn on" = "Daar";
 "Running" = "socda";
+"TOOLS" = "QALAB";
diff --git a/Localization/tr.lproj/Localizable.strings b/Localization/tr.lproj/Localizable.strings
@@ -143,3 +143,4 @@
 "Turn off" = "Kapat";
 "Turn on" = "Açmak";
 "Running" = "Çalıştır";
+"TOOLS" = "ALETLER";
diff --git a/Localization/zh-Hans.lproj/Localizable.strings b/Localization/zh-Hans.lproj/Localizable.strings
@@ -142,3 +142,4 @@
 "Turn off" = "开启";
 "Turn on" = "关闭";
 "Running" = "执行中";
+"TOOLS" = "工具";
diff --git a/OnlySwitch/View/OnlySwitchList/OnlySwitchListView.swift b/OnlySwitch/View/OnlySwitchList/OnlySwitchListView.swift
@@ -216,6 +216,29 @@ struct OnlySwitchListView: View {
                 }
             }
 
+            if switchVM.toolItemList.count > 0 {
+                HStack {
+                    Rectangle().frame(height: 1)
+                        .foregroundColor(.gray)
+                    Text("TOOLS".localized())
+                    Rectangle().frame(height: 1)
+                        .foregroundColor(.gray)
+                }.frame(height:30)
+                    .opacity(0.7)
+                    .shadow(radius: 1)
+
+                LazyVGrid(columns: columns, spacing: 0) {
+                    ForEach(switchVM.toolItemList.indices, id:\.self) { index in
+                        HStack {
+                            if let item = switchVM.toolItemList[index] {
+                                SwitchBarView().environmentObject(item)
+                                    .frame(height:Layout.singleSwitchHeight)
+                            }
+                        }
+                    }
+                }
+            }
+
             if switchVM.shortcutsList.count > 0 {
                 HStack {
                     Rectangle().frame(height: 1)
@@ -337,6 +360,7 @@ struct OnlySwitchListView: View {
             totalHeight += categoryHeight(count: switchVM.audioItemList.count)
             totalHeight += categoryHeight(count: switchVM.cleanupItemList.count)
             totalHeight += categoryHeight(count: switchVM.shortcutsList.count)
+            totalHeight += categoryHeight(count: switchVM.toolItemList.count)
             totalHeight -= 30.0
         }
 

diff --git a/OnlySwitch/View/OnlySwitchList/SwitchListModel.swift b/OnlySwitch/View/OnlySwitchList/SwitchListModel.swift
@@ -21,5 +21,7 @@ struct SwitchListModel {
 
     var cleanupItemList = Array<SwitchBarVM>() //for two columns
 
+    var toolItemList = Array<SwitchBarVM>() //for two columns
+
     var sortMode = false
 }
diff --git a/OnlySwitch/View/OnlySwitchList/SwitchListVM.swift b/OnlySwitch/View/OnlySwitchList/SwitchListVM.swift
@@ -39,6 +39,10 @@ class SwitchListVM: ObservableObject, CurrentScreen {
         return model.cleanupItemList
     }
 
+    var toolItemList:[SwitchBarVM] {
+        return model.toolItemList
+    }
+
     var sortMode:Bool {
         return model.sortMode
     }
@@ -108,6 +112,7 @@ class SwitchListVM: ObservableObject, CurrentScreen {
         self.model.uncategoryItemList = self.switchList.filter{ $0.category == .none && !$0.isHidden }
         self.model.audioItemList = self.switchList.filter{ $0.category == .audio && !$0.isHidden }
         self.model.cleanupItemList = self.switchList.filter{ $0.category == .cleanup && !$0.isHidden }
+        self.model.toolItemList = self.switchList.filter{ $0.category == .tool && !$0.isHidden }
 
         print("refresh")
     }