Merge pull request #791 from splendo/feature/minor-resources-fixes

Fixed bug in tint for Disabled Image Button & SwiftUI styled strings fix
splendo · Jul 26, 2024 · d1dc80c · d1dc80c
2 parents a548049 + 4f0ca72
commit d1dc80c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/example/ios/Demo/Resources/LabelView.swift b/example/ios/Demo/Resources/LabelView.swift
@@ -33,9 +33,9 @@ struct LabelView: View {
             ScrollView {
                 VStack(spacing: 10.0) {
                     ForEach(labels.value, id: \.self) { label in
-                        label.toText().frame(maxWidth: .infinity)
+                        label.toText().frame(maxWidth: .infinity, alignment: .leading)
                     }
-                }
+                }.padding(8)
             }.navigationTitle("feature_resources_button".localized())
         }
     }

diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI
diff --git a/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt b/resources/src/commonMain/kotlin/stylable/KalugaButtonStyle.kt
@@ -555,7 +555,7 @@ sealed interface KalugaButtonStyleDSL<StateStyle : ButtonStateStyle, StateStyleD
         fun setImage(image: TintedImage, pressedTint: KalugaColor = image.tint, disabledTint: KalugaColor = image.tint) {
             defaultStyle { setImage(image) }
             pressedStyle { setImage(image.image, pressedTint) }
-            disabledStyle { setImage(image.image, pressedTint) }
+            disabledStyle { setImage(image.image, disabledTint) }
         }
 
         /**
@@ -568,7 +568,7 @@ sealed interface KalugaButtonStyleDSL<StateStyle : ButtonStateStyle, StateStyleD
         fun setImage(image: KalugaImage, defaultTint: KalugaColor, pressedTint: KalugaColor = defaultTint, disabledTint: KalugaColor = defaultTint) {
             defaultStyle { setImage(image, defaultTint) }
             pressedStyle { setImage(image, pressedTint) }
-            disabledStyle { setImage(image, pressedTint) }
+            disabledStyle { setImage(image, disabledTint) }
         }
     }