IOS-2605 Fix

anyproto · Apr 9, 2024 · c17641a · c17641a
1 parent 5713116
commit c17641a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/Anytype/Resources/Assets.xcassets/Common/arrowForward.imageset/Contents.json b/Anytype/Resources/Assets.xcassets/Common/arrowForward.imageset/Contents.json
@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
diff --git a/Anytype/Sources/PresentationLayer/Common/SwiftUI/BasicComponents/DynamicForeground.swift b/Anytype/Sources/PresentationLayer/Common/SwiftUI/BasicComponents/DynamicForeground.swift
@@ -1,24 +1,26 @@
 import Foundation
 import SwiftUI
 
-private struct DynamicForegroundViewModifier: ViewModifier {
+private struct DynamicForegroundStyle: ShapeStyle {
 
-    @Environment(\.isEnabled) private var isEnable
     let enabledColor: Color
     let disabledColor: Color
 
-    func body(content: Content) -> some View {
-        content
-            .foregroundColor(isEnable ? enabledColor : disabledColor)
+    func resolve(in environment: EnvironmentValues) -> some ShapeStyle {
+        if environment.isEnabled {
+            return enabledColor
+        } else {
+            return disabledColor
+        }
     }
 }
 
 extension View {
-    func buttonDynamicForegroundColor() -> some View {
-        modifier(DynamicForegroundViewModifier(enabledColor: .Button.active, disabledColor: .Button.inactive))
+    func buttonDynamicForegroundStyle() -> some View {
+        foregroundStyle(DynamicForegroundStyle(enabledColor: .Button.active, disabledColor: .Button.inactive))
     }
 
-    func textDynamicForegroundColor(color: Color) -> some View {
-        modifier(DynamicForegroundViewModifier(enabledColor: color, disabledColor: .Text.tertiary))
+    func dynamicForegroundStyle(color: Color, disabledColor: Color) -> some View {
+        foregroundStyle(DynamicForegroundStyle(enabledColor: color, disabledColor: disabledColor))
     }
 }
diff --git a/Anytype/Sources/PresentationLayer/Common/SwiftUI/IconView/IconView.swift b/Anytype/Sources/PresentationLayer/Common/SwiftUI/IconView/IconView.swift
@@ -12,10 +12,10 @@ struct IconView: View {
             ObjectIconView(icon: objectIcon)
         case .asset(let imageAsset):
             Image(asset: imageAsset)
-                .buttonDynamicForegroundColor()
+                .buttonDynamicForegroundStyle()
         case .image(let uIImage):
             Image(uiImage: uIImage)
-                .buttonDynamicForegroundColor()
+                .buttonDynamicForegroundStyle()
         case nil:
             EmptyView()
         }

diff --git a/Anytype/Sources/PresentationLayer/Common/SwiftUI/IconView/Specific/Object/TodoIconView.swift b/Anytype/Sources/PresentationLayer/Common/SwiftUI/IconView/Specific/Object/TodoIconView.swift
@@ -11,7 +11,7 @@ struct TodoIconView: View {
         Image(asset: checked ? .TaskLayout.done : .TaskLayout.empty)
             .resizable()
             .scaledToFit()
-            .buttonDynamicForegroundColor()
+            .buttonDynamicForegroundStyle()
             .frame(maxWidth: 28, maxHeight: 28)
     }
 }
diff --git a/Anytype/Sources/PresentationLayer/Settings/Settings/Sections/SettingsSectionItemView.swift b/Anytype/Sources/PresentationLayer/Settings/Settings/Sections/SettingsSectionItemView.swift
@@ -40,7 +40,7 @@ struct SettingsSectionItemView: View {
                 }
                 HStack(alignment: .center, spacing: 0) {
                     AnytypeText(name, style: .uxBodyRegular)
-                        .foregroundColor(.Text.primary)
+                        .dynamicForegroundStyle(color: .Text.primary, disabledColor: .Text.tertiary)
                     Spacer()
                     decorationView
                 }
@@ -57,11 +57,11 @@ struct SettingsSectionItemView: View {
             case .arrow(let text):
                 HStack(alignment: .center, spacing: 10) {
                     AnytypeText(text, style: .bodyRegular)
-                        .foregroundColor(.Text.secondary)
+                        .dynamicForegroundStyle(color: .Text.secondary, disabledColor: .Text.tertiary)
                         .lineLimit(1)
                     Image(asset: .arrowForward)
                         .renderingMode(.template)
-                        .foregroundColor(.Text.tertiary)
+                        .dynamicForegroundStyle(color: .Text.tertiary, disabledColor: .Button.inactive)
                 }
             case .button(let text):
                 AnytypeText(text, style: .caption1Medium)

diff --git a/Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/ViewPicker/SetViewPicker.swift b/Anytype/Sources/PresentationLayer/TextEditor/Set/Views/Popups/ViewPicker/SetViewPicker.swift
@@ -57,7 +57,7 @@ struct SetViewPicker: View {
             ToolbarItem(placement: .navigationBarLeading) {
                 if viewModel.canEditViews {
                     EditButton()
-                        .buttonDynamicForegroundColor()
+                        .buttonDynamicForegroundStyle()
                 }
             }
             ToolbarItem(placement: .navigationBarTrailing) {