diff --git a/.xcode-version b/.xcode-version index facd73a33..dfa88c8eb 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -26.0 +26.1 diff --git a/Makefile b/Makefile index 1182ac5d7..c09a84079 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ MISTICA_DESIGN_URL := https://raw.githubusercontent.com/Telefonica/mistica-desig # Xcode ifneq ($(origin GITHUB_ACTION),undefined) -export DEVELOPER_DIR=/Applications/Xcode_26.0.1.app/Contents/Developer +export DEVELOPER_DIR=/Applications/Xcode_26.1.app/Contents/Developer endif # Targets diff --git a/MisticaCatalog/Source/ColorsView.swift b/MisticaCatalog/Source/ColorsView.swift index fdcbf06a7..f67c10428 100644 --- a/MisticaCatalog/Source/ColorsView.swift +++ b/MisticaCatalog/Source/ColorsView.swift @@ -16,6 +16,7 @@ struct ColorsView: View { var body: some View { List { + let last = colors.last?.name ?? "" ForEach(colors, id: \.name) { item in Cell( style: .fullwidth, @@ -24,7 +25,7 @@ struct ColorsView: View { description: item.color.hexString.uppercased(), assetType: .roundImage(circle(with: item.color)) ) - .shouldShowDivider(item.name != colors.last?.name) + .shouldShowDivider(item.name != last) } } .misticaListStyle() diff --git a/MisticaCatalog/Source/MisticaCatalogApp.swift b/MisticaCatalog/Source/MisticaCatalogApp.swift index a53aaf097..5c1ee1ea8 100644 --- a/MisticaCatalog/Source/MisticaCatalogApp.swift +++ b/MisticaCatalog/Source/MisticaCatalogApp.swift @@ -91,13 +91,18 @@ struct MisticaCatalogApp: App { buttonAppearance.normal.titleTextAttributes = [.foregroundColor: UIColor.clear] let appearance = UINavigationBarAppearance() - appearance.configureWithOpaqueBackground() + if #available(iOS 26, *) { + appearance.configureWithTransparentBackground() + } else { + appearance.configureWithOpaqueBackground() + appearance.backgroundColor = .background + } + appearance.buttonAppearance = buttonAppearance appearance.shadowColor = nil appearance.shadowImage = nil appearance.largeTitleTextAttributes[.font] = UIFont.systemFont(ofSize: 28, weight: .light) appearance.titleTextAttributes[.font] = UIFont.systemFont(ofSize: 18, weight: .regular) - appearance.backgroundColor = .background UINavigationBar.appearance().standardAppearance = appearance UINavigationBar.appearance().scrollEdgeAppearance = appearance diff --git a/MisticaCatalog/SupportFiles/Info.plist b/MisticaCatalog/SupportFiles/Info.plist index dae7db620..9794c0bdc 100644 --- a/MisticaCatalog/SupportFiles/Info.plist +++ b/MisticaCatalog/SupportFiles/Info.plist @@ -79,7 +79,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIDesignRequiresCompatibility - + UIDesignRequiresCompatibility + diff --git a/Sources/MisticaSwiftUI/Styleguide/Components/TabView+Styleguide.swift b/Sources/MisticaSwiftUI/Styleguide/Components/TabView+Styleguide.swift index 7e9c2749b..11a6aaac5 100644 --- a/Sources/MisticaSwiftUI/Styleguide/Components/TabView+Styleguide.swift +++ b/Sources/MisticaSwiftUI/Styleguide/Components/TabView+Styleguide.swift @@ -29,9 +29,14 @@ private struct MisticaTabViewStyle: ViewModifier { public extension UITabBarAppearance { static func applyMisticaStyle() { let appearance = UITabBarAppearance() - appearance.configureWithTransparentBackground() - appearance.shadowImage = UIImage(color: .divider) - UITabBar.appearance().backgroundColor = .appBarBackground + if #available(iOS 26, *) { + appearance.configureWithDefaultBackground() + } else { + appearance.configureWithTransparentBackground() + appearance.shadowImage = UIImage(color: .divider) + UITabBar.appearance().backgroundColor = .appBarBackground + } + UITabBar.appearance().standardAppearance = appearance UITabBar.appearance().isTranslucent = true }