alqindiirsyam 1 년 전
부모
커밋
b9364d27b2

+ 3 - 3
appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -173,10 +173,10 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                         Item(icon: UIImage(systemName: "person.badge.key"), title: "Access Admin / Internal Features".localized()),
                         Item(icon: UIImage(systemName: "person.badge.key"), title: "Access Admin / Internal Features".localized()),
                     ]
                     ]
                 }
                 }
+                if Nexilis.showButtonFB {
+                    Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "gearshape.circle"), title: "Configure Floating Button".localized()))
+                }
                 if !isChangeProfile {
                 if !isChangeProfile {
-                    if Nexilis.showButtonFB {
-                        Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "gearshape.circle"), title: "Configure Floating Button".localized()))
-                    }
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Sign-Up/Sign-In".localized()))
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Sign-Up/Sign-In".localized()))
                 } else if isChangeProfile {
                 } else if isChangeProfile {
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.clockwise.icloud"), title: "Backup & Restore".localized()))
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.clockwise.icloud"), title: "Backup & Restore".localized()))

+ 3 - 0
appbuilder-ios/AppBuilder/AppBuilder/ViewController.swift

@@ -59,6 +59,9 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
     override func viewDidLoad() {
     override func viewDidLoad() {
         super.viewDidLoad()
         super.viewDidLoad()
         DispatchQueue.main.async { [self] in
         DispatchQueue.main.async { [self] in
+            while !Utils.getFinishInitPrefsr() {
+                print("WAITING PREFS DONE")
+            }
             startView()
             startView()
         }
         }
     }
     }

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/FloatingButton/FloatingButton.swift

@@ -390,7 +390,7 @@ public class FloatingButton: UIView {
             }
             }
         } else {
         } else {
             DispatchQueue.main.async { [self] in
             DispatchQueue.main.async { [self] in
-                if indicatorCounterFB.isDescendant(of: button_fb2) {
+                if button_fb2 != nil && indicatorCounterFB.isDescendant(of: button_fb2) {
                     indicatorCounterFB.removeFromSuperview()
                     indicatorCounterFB.removeFromSuperview()
                 }
                 }
                 if indicatorCounterFBBig.isDescendant(of: nexilis_button) {
                 if indicatorCounterFBBig.isDescendant(of: nexilis_button) {

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/Utils.swift

@@ -142,7 +142,7 @@ public final class Utils {
         UserDefaults.standard.set(value, forKey: "finish_init_prefs")
         UserDefaults.standard.set(value, forKey: "finish_init_prefs")
     }
     }
     
     
-    static func getFinishInitPrefsr() -> Bool {
+    public static func getFinishInitPrefsr() -> Bool {
         UserDefaults.standard.bool(forKey: "finish_init_prefs")
         UserDefaults.standard.bool(forKey: "finish_init_prefs")
     }
     }
     
     

+ 3 - 3
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/SettingTableViewController.swift

@@ -128,10 +128,10 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                         Item(icon: UIImage(systemName: "person.badge.key"), title: "Access Admin / Internal Features".localized()),
                         Item(icon: UIImage(systemName: "person.badge.key"), title: "Access Admin / Internal Features".localized()),
                     ]
                     ]
                 }
                 }
+                if Nexilis.showButtonFB {
+                    Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "gearshape.circle"), title: "Configure Floating Button".localized()))
+                }
                 if !isChangeProfile {
                 if !isChangeProfile {
-                    if DigiX.showButtonFB {
-                        Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "gearshape.circle"), title: "Configure Floating Button".localized()))
-                    }
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Sign-Up/Sign-In".localized()))
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Sign-Up/Sign-In".localized()))
                 } else if isChangeProfile {
                 } else if isChangeProfile {
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.clockwise.icloud"), title: "Backup & Restore".localized()))
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.clockwise.icloud"), title: "Backup & Restore".localized()))

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/FloatingButton/FloatingButton.swift

@@ -390,7 +390,7 @@ public class FloatingButton: UIView {
             }
             }
         } else {
         } else {
             DispatchQueue.main.async { [self] in
             DispatchQueue.main.async { [self] in
-                if indicatorCounterFB.isDescendant(of: button_fb2) {
+                if button_fb2 != nil && indicatorCounterFB.isDescendant(of: button_fb2) {
                     indicatorCounterFB.removeFromSuperview()
                     indicatorCounterFB.removeFromSuperview()
                 }
                 }
                 if indicatorCounterFBBig.isDescendant(of: nexilis_button) {
                 if indicatorCounterFBBig.isDescendant(of: nexilis_button) {

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/Utils.swift

@@ -142,7 +142,7 @@ public final class Utils {
         UserDefaults.standard.set(value, forKey: "finish_init_prefs")
         UserDefaults.standard.set(value, forKey: "finish_init_prefs")
     }
     }
     
     
-    static func getFinishInitPrefsr() -> Bool {
+    public static func getFinishInitPrefsr() -> Bool {
         UserDefaults.standard.bool(forKey: "finish_init_prefs")
         UserDefaults.standard.bool(forKey: "finish_init_prefs")
     }
     }
     
     

+ 3 - 3
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/SettingTableViewController.swift

@@ -128,10 +128,10 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
                         Item(icon: UIImage(systemName: "person.badge.key"), title: "Access Admin / Internal Features".localized()),
                         Item(icon: UIImage(systemName: "person.badge.key"), title: "Access Admin / Internal Features".localized()),
                     ]
                     ]
                 }
                 }
+                if Nexilis.showButtonFB {
+                    Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "gearshape.circle"), title: "Configure Floating Button".localized()))
+                }
                 if !isChangeProfile {
                 if !isChangeProfile {
-                    if Nexilis.showButtonFB {
-                        Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "gearshape.circle"), title: "Configure Floating Button".localized()))
-                    }
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Sign-Up/Sign-In".localized()))
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Sign-Up/Sign-In".localized()))
                 } else if isChangeProfile {
                 } else if isChangeProfile {
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.clockwise.icloud"), title: "Backup & Restore".localized()))
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.clockwise.icloud"), title: "Backup & Restore".localized()))