alqindiirsyam 2 年之前
父节点
当前提交
7f428cdfa1

二进制
appbuilder-ios/DigiXLite/DigiXLite.xcworkspace/xcuserdata/akhmadalqindiirsyam.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 6
appbuilder-ios/DigiXLite/DigiXLite/Source/Extension.swift

@@ -1189,13 +1189,9 @@ public class LibAlertController: UIAlertController {
         let messageFont = UIFont.systemFont(ofSize: 14)
         let messageAttributes = [NSAttributedString.Key.font: messageFont]
         setValue(NSAttributedString(string: self.message ?? "", attributes: messageAttributes), forKey: "attributedMessage")
-    }
-    
-    open override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-
+        
         for i in self.actions {
-            let attributedText = NSAttributedString(string: i.title ?? "", attributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 14)])
+            let attributedText = NSAttributedString(string: i.title ?? "", attributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)])
 
             guard let label = (i.value(forKey: "__representer") as AnyObject).value(forKey: "label") as? UILabel else { return }
             label.attributedText = attributedText

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

@@ -1415,7 +1415,7 @@ public class Nexilis: NSObject {
 
 struct LibFontName {
     static let regular = "Inter-Regular"
-    static let bold = "Inter-Bold"
+    static let bold = "Inter-SemiBold"
     static let italic = "Inter-Italic"
 }
 

+ 7 - 8
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ImageVideoPicker.swift

@@ -28,14 +28,6 @@ open class ImageVideoPicker: NSObject {
         
         self.pickerController.delegate = self
         self.pickerController.allowsEditing = false
-        
-        if UIBarButtonItem.appearance().titleTextAttributes(for: .normal) != nil {
-            isBlackCancelButton = UIBarButtonItem.appearance().titleTextAttributes(for: .normal)?.values.first as! NSObject == UIColor.black
-        }
-        if !isBlackCancelButton {
-            let cancelButtonAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black, NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
-            UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes , for: .normal)
-        }
     }
     
     enum Source {
@@ -46,6 +38,13 @@ open class ImageVideoPicker: NSObject {
     }
     
     func present(source sourceView: Source) {
+        if UIBarButtonItem.appearance().titleTextAttributes(for: .normal) != nil {
+            isBlackCancelButton = UIBarButtonItem.appearance().titleTextAttributes(for: .normal)?.values.first as! NSObject == UIColor.black
+        }
+        if !isBlackCancelButton {
+            let cancelButtonAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black, NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
+            UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes , for: .normal)
+        }
         if (sourceView == .imageAlbum) {
             self.pickerController.mediaTypes = ["public.image"]
             self.pickerController.sourceType = .savedPhotosAlbum

+ 2 - 6
appbuilder-ios/NexilisLite/NexilisLite/Source/Extension.swift

@@ -1189,13 +1189,9 @@ public class LibAlertController: UIAlertController {
         let messageFont = UIFont.systemFont(ofSize: 14)
         let messageAttributes = [NSAttributedString.Key.font: messageFont]
         setValue(NSAttributedString(string: self.message ?? "", attributes: messageAttributes), forKey: "attributedMessage")
-    }
-    
-    open override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-
+        
         for i in self.actions {
-            let attributedText = NSAttributedString(string: i.title ?? "", attributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 14)])
+            let attributedText = NSAttributedString(string: i.title ?? "", attributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)])
 
             guard let label = (i.value(forKey: "__representer") as AnyObject).value(forKey: "label") as? UILabel else { return }
             label.attributedText = attributedText

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

@@ -1421,7 +1421,7 @@ public class Nexilis: NSObject {
 
 struct LibFontName {
     static let regular = "Poppins-Regular"
-    static let bold = "Poppins-Bold"
+    static let bold = "Poppins-SemiBold"
     static let italic = "Poppins-Italic"
 }
 

+ 7 - 8
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ImageVideoPicker.swift

@@ -28,14 +28,6 @@ open class ImageVideoPicker: NSObject {
         
         self.pickerController.delegate = self
         self.pickerController.allowsEditing = false
-        
-        if UIBarButtonItem.appearance().titleTextAttributes(for: .normal) != nil {
-            isBlackCancelButton = UIBarButtonItem.appearance().titleTextAttributes(for: .normal)?.values.first as! NSObject == UIColor.black
-        }
-        if !isBlackCancelButton {
-            let cancelButtonAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black, NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
-            UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes , for: .normal)
-        }
     }
     
     enum Source {
@@ -46,6 +38,13 @@ open class ImageVideoPicker: NSObject {
     }
     
     func present(source sourceView: Source) {
+        if UIBarButtonItem.appearance().titleTextAttributes(for: .normal) != nil {
+            isBlackCancelButton = UIBarButtonItem.appearance().titleTextAttributes(for: .normal)?.values.first as! NSObject == UIColor.black
+        }
+        if !isBlackCancelButton {
+            let cancelButtonAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black, NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
+            UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes , for: .normal)
+        }
         if (sourceView == .imageAlbum) {
             self.pickerController.mediaTypes = ["public.image"]
             self.pickerController.sourceType = .savedPhotosAlbum