Răsfoiți Sursa

change order fb mode

alqindiirsyam 1 an în urmă
părinte
comite
16887510e6

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

@@ -48,10 +48,10 @@ public class FloatingButton: UIView {
     let heightFBSideTab = (UIScreen.main.bounds.height * 1.05) / 7.5
     let widthFBSideTab: CGFloat = 18
     
-    final let MODE_HORIZONTAL_SIDE_TAB = "1"
+    final let MODE_VERTICAL_FLOATING_BUTTON = "1"
     final let MODE_VERTICAL_ANIMATION = "2"
-    final let MODE_VERTICAL_FLOATING_BUTTON = "3"
-    final let MODE_HORIZONTAL_ANIMATION = "4"
+    final let MODE_HORIZONTAL_ANIMATION = "3"
+    final let MODE_HORIZONTAL_SIDE_TAB = "4"
     
     var countMenuFB: CGFloat = 5 {
         didSet {
@@ -493,7 +493,7 @@ public class FloatingButton: UIView {
         let counter = queryCountCounter()
         if counter > 0 {
             DispatchQueue.main.async { [self] in
-                if !indicatorCounterFB.isDescendant(of: button_fb2) {
+                if button_fb2 != nil && !indicatorCounterFB.isDescendant(of: button_fb2) {
                     button_fb2.addSubview(indicatorCounterFB)
                     indicatorCounterFB.layer.cornerRadius = 7.5
                     indicatorCounterFB.layer.masksToBounds = true

+ 1 - 1
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ConfigureFloatingButton.swift

@@ -12,7 +12,7 @@ public class ConfigureFloatingButton: UIViewController {
     let titleConfigureFB = UILabel()
     var chosenMode: String = "1"
     var fullMode: [String] = ["1", "2", "3", "4"]
-    var dataMode: [String] = ["1. Side-Tab (Horizontal Mode)".localized(),"2. Animation (Vertical Mode)".localized(),"3. Floating Button (Vertical Mode)".localized(),"4. Animation (Horizontal Mode)".localized()]
+    var dataMode: [String] = ["1. Floating Button (Vertical Mode)".localized(),"2. Animation (Vertical Mode)".localized(),"3. Animation (Horizontal Mode)".localized(),"4. Side-Tab (Horizontal Mode)".localized()]
     var paddingTopFinishButton = NSLayoutConstraint()
     let buttonSet = UIButton()
     let modeButton = UIView()

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

@@ -48,10 +48,10 @@ public class FloatingButton: UIView {
     let heightFBSideTab = (UIScreen.main.bounds.height * 1.05) / 7.5
     let widthFBSideTab: CGFloat = 18
     
-    final let MODE_HORIZONTAL_SIDE_TAB = "1"
+    final let MODE_VERTICAL_FLOATING_BUTTON = "1"
     final let MODE_VERTICAL_ANIMATION = "2"
-    final let MODE_VERTICAL_FLOATING_BUTTON = "3"
-    final let MODE_HORIZONTAL_ANIMATION = "4"
+    final let MODE_HORIZONTAL_ANIMATION = "3"
+    final let MODE_HORIZONTAL_SIDE_TAB = "4"
     
     var countMenuFB: CGFloat = 5 {
         didSet {
@@ -493,7 +493,7 @@ public class FloatingButton: UIView {
         let counter = queryCountCounter()
         if counter > 0 {
             DispatchQueue.main.async { [self] in
-                if !indicatorCounterFB.isDescendant(of: button_fb2) {
+                if button_fb2 != nil && !indicatorCounterFB.isDescendant(of: button_fb2) {
                     button_fb2.addSubview(indicatorCounterFB)
                     indicatorCounterFB.layer.cornerRadius = 7.5
                     indicatorCounterFB.layer.masksToBounds = true

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ConfigureFloatingButton.swift

@@ -12,7 +12,7 @@ public class ConfigureFloatingButton: UIViewController {
     let titleConfigureFB = UILabel()
     var chosenMode: String = "1"
     var fullMode: [String] = ["1", "2", "3", "4"]
-    var dataMode: [String] = ["1. Side-Tab (Horizontal Mode)".localized(),"2. Animation (Vertical Mode)".localized(),"3. Floating Button (Vertical Mode)".localized(),"4. Animation (Horizontal Mode)".localized()]
+    var dataMode: [String] = ["1. Floating Button (Vertical Mode)".localized(),"2. Animation (Vertical Mode)".localized(),"3. Animation (Horizontal Mode)".localized(),"4. Side-Tab (Horizontal Mode)".localized()]
     var paddingTopFinishButton = NSLayoutConstraint()
     let buttonSet = UIButton()
     let modeButton = UIView()