Dynamic type flag works for all content size category changes (icons …

…as well)
lightningkite · Jun 4, 2024 · 7ad6c1c · 7ad6c1c
1 parent 8a20501
commit 7ad6c1c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/library/src/iosMain/kotlin/com/lightningkite/kiteui/views/direct/IconView.ios.kt b/library/src/iosMain/kotlin/com/lightningkite/kiteui/views/direct/IconView.ios.kt
@@ -18,8 +18,10 @@ import platform.Foundation.NSOperationQueue
 actual class NIconView(): NView(CGRectMake(0.0,0.0,0.0,0.0)), UIViewWithSpacingRulesProtocol {
     init {
         setUserInteractionEnabled(false)
-        NSNotificationCenter.defaultCenter.addObserverForName(UIContentSizeCategoryDidChangeNotification, null, NSOperationQueue.mainQueue) {
-            informParentOfSizeChange()
+        if (ENABLE_DYNAMIC_TYPE) {
+            NSNotificationCenter.defaultCenter.addObserverForName(UIContentSizeCategoryDidChangeNotification, null, NSOperationQueue.mainQueue) {
+                informParentOfSizeChange()
+            }
         }
     }
 

diff --git a/library/src/iosMain/kotlin/com/lightningkite/kiteui/views/direct/TextView.ios.kt b/library/src/iosMain/kotlin/com/lightningkite/kiteui/views/direct/TextView.ios.kt
@@ -247,7 +247,11 @@ private val dynamicTypeScaleFactors = mapOf(
     UIContentSizeCategoryExtraExtraExtraLarge to 1.42,
 )
 const val ENABLE_DYNAMIC_TYPE = false
-fun preferredScaleFactor() = dynamicTypeScaleFactors[UIApplication.sharedApplication.preferredContentSizeCategory] ?: 1.0
+fun preferredScaleFactor() = if (ENABLE_DYNAMIC_TYPE) {
+    dynamicTypeScaleFactors[UIApplication.sharedApplication.preferredContentSizeCategory] ?: 1.0
+} else {
+    1.0
+}
 fun UILabelWithGradient.setContentSizeCategoryChangeListener() {
     if (ENABLE_DYNAMIC_TYPE) {
         NSNotificationCenter.defaultCenter.addObserverForName(UIContentSizeCategoryDidChangeNotification, null, NSOperationQueue.mainQueue) {
@@ -260,13 +264,7 @@ fun UILabelWithGradient.updateFont() = label.run {
     val textSize = extensionTextSize ?: return
     val alignment = textAlignment
     font = extensionFontAndStyle?.let {
-        it.font.get(textSize.value.let {
-            if (ENABLE_DYNAMIC_TYPE) {
-                it * preferredScaleFactor()
-            } else {
-                it
-            }
-        }, it.weight.toUIFontWeight(), it.italic)
+        it.font.get(textSize.value * preferredScaleFactor(), it.weight.toUIFontWeight(), it.italic)
     } ?: UIFont.systemFontOfSize(textSize.value)
     textAlignment = alignment
 }