Fixed layout for avatar view.

ivanvorobei · ivanvorobei · commit 1768eff1e160 · 2022-02-17T10:55:58.000+03:00
diff --git a/NativeUIKit.podspec b/NativeUIKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = 'NativeUIKit'
-  s.version = '1.3.8'
+  s.version = '1.3.9'
   s.summary = 'Mimicrated views and controls to native Apple appearance.'
   s.homepage = 'https://github.com/ivanvorobei/NativeUIKit'
   s.source = { :git => 'https://github.com/ivanvorobei/NativeUIKit.git', :tag => s.version }
diff --git a/Sources/NativeUIKit/Views/NativeAvatarView.swift b/Sources/NativeUIKit/Views/NativeAvatarView.swift
@@ -89,7 +89,7 @@ open class NativeAvatarView: SPView {
         }
     }
     
-    open var placeholderImage = UIImage.system("person.crop.circle.fill", font: .systemFont(ofSize: 80, weight: .medium)) {
+    open var placeholderImage = generatePlaceholderImage(fontSize: 80, fontWeight: .medium) {
         didSet {
             placeholderButton.setImage(placeholderImage)
         }
@@ -164,10 +164,23 @@ open class NativeAvatarView: SPView {
         placeholderButton.sizeToFit()
         frame.setWidth(placeholderButton.frame.width + layoutMargins.left + layoutMargins.right)
         layoutSubviews()
-        return .init(
-            width: max(placeholderButton.frame.maxX, indicatorButton.frame.maxX) + layoutMargins.bottom,
-            height: max(placeholderButton.frame.maxY, indicatorButton.frame.maxY) + layoutMargins.bottom
-        )
+        if isEditable {
+            return .init(
+                width: max(placeholderButton.frame.maxX, indicatorButton.frame.maxX) + layoutMargins.bottom,
+                height: max(placeholderButton.frame.maxY, indicatorButton.frame.maxY) + layoutMargins.bottom
+            )
+        } else {
+            return .init(
+                width: placeholderButton.frame.maxX + layoutMargins.bottom,
+                height: placeholderButton.frame.maxY + layoutMargins.bottom
+            )
+        }
+    }
+    
+    // MARK: - Public
+    
+    static public func generatePlaceholderImage(fontSize: CGFloat, fontWeight: UIFont.Weight) -> UIImage {
+        return UIImage.system("person.crop.circle.fill", font: .systemFont(ofSize: fontSize, weight: fontWeight))
     }
     
     // MARK: - Internal
