Skip to content

Commit

Permalink
Cleaning up warnings in Demo app (microsoft#1979)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mischreiber
mischreiber authored Feb 23, 2024
1 parent 7a1bc97 commit 1ec3c51
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 10 deletions.
10 changes: 10 additions & 0 deletions ios/FluentUI.Demo/FluentUI.Demo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
923DF2DF27115B4700637646 /* FluentUIResources-ios.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 923DF2DC271158CD00637646 /* FluentUIResources-ios.bundle */; };
9245E1F927BECDBB007616F3 /* GlobalColorTokensDemoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9245E1F827BECDBB007616F3 /* GlobalColorTokensDemoController.swift */; };
92561E732718AD090072ED00 /* DemoTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92561E722718AD090072ED00 /* DemoTableViewController.swift */; };
928C00B12B8920E60023ECE7 /* View+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 928C00B02B8920E60023ECE7 /* View+Extensions.swift */; };
92B45E4E279A1A0B00E72517 /* DemoAppearanceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92B45E4D279A1A0B00E72517 /* DemoAppearanceController.swift */; };
92D5598426A1523400328FD3 /* CardNudgeDemoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D5598326A1523400328FD3 /* CardNudgeDemoController.swift */; };
92D5FDFD28AC57650087894B /* TypographyTokensDemoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92D5FDFC28AC57650087894B /* TypographyTokensDemoController.swift */; };
Expand Down Expand Up @@ -223,6 +224,7 @@
923DF2DC271158CD00637646 /* FluentUIResources-ios.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = "FluentUIResources-ios.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
9245E1F827BECDBB007616F3 /* GlobalColorTokensDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalColorTokensDemoController.swift; sourceTree = "<group>"; };
92561E722718AD090072ED00 /* DemoTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTableViewController.swift; sourceTree = "<group>"; };
928C00B02B8920E60023ECE7 /* View+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = "<group>"; };
92B45E4D279A1A0B00E72517 /* DemoAppearanceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoAppearanceController.swift; sourceTree = "<group>"; };
92D5598326A1523400328FD3 /* CardNudgeDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardNudgeDemoController.swift; sourceTree = "<group>"; };
92D5FDFC28AC57650087894B /* TypographyTokensDemoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypographyTokensDemoController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -405,6 +407,7 @@
isa = PBXGroup;
children = (
5303259726B31A6300611D05 /* FluentUIDemoToggle.swift */,
928C00B02B8920E60023ECE7 /* View+Extensions.swift */,
);
path = SwiftUI;
sourceTree = "<group>";
Expand Down Expand Up @@ -842,6 +845,7 @@
2F0A96FC25CA047100EF9736 /* SearchBarDemoController.swift in Sources */,
F362C8082A780EA500BB32BB /* ListItemDemoController_SwiftUI.swift in Sources */,
CCC18C2F2501C75F00BE830E /* CardViewDemoController.swift in Sources */,
928C00B12B8920E60023ECE7 /* View+Extensions.swift in Sources */,
F30B74362A7DB168000F63A0 /* ListActionItemDemoController.swift in Sources */,
B4575C5122FB8B6900EBD0EB /* PeoplePickerDemoController.swift in Sources */,
92D5FDFD28AC57650087894B /* TypographyTokensDemoController.swift in Sources */,
Expand Down Expand Up @@ -1059,6 +1063,7 @@
EXCLUDED_ARCHS = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -1071,6 +1076,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DOGFOOD;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
VALIDATE_PRODUCT = YES;
};
name = Dogfood;
Expand Down Expand Up @@ -1157,6 +1163,7 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -1169,6 +1176,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
};
name = Debug;
};
Expand Down Expand Up @@ -1215,6 +1223,7 @@
EXCLUDED_ARCHS = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -1226,6 +1235,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
10 changes: 5 additions & 5 deletions ios/FluentUI.Demo/FluentUI.Demo/DemoAppearanceView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,22 @@ struct DemoAppearanceView: View {
.padding()

// Changes
.onChange(of: configuration.userInterfaceStyle) { newValue in
.onChange_iOS17(of: configuration.userInterfaceStyle) { newValue in
configuration.onUserInterfaceStyleChanged?(newValue)
}
.onChange(of: configuration.windowTheme) { newValue in
.onChange_iOS17(of: configuration.windowTheme) { newValue in
configuration.onWindowThemeChanged?(newValue)
}
.onChange(of: configuration.appWideTheme) { newValue in
.onChange_iOS17(of: configuration.appWideTheme) { newValue in
configuration.onAppWideThemeChanged?(newValue)
}
.onChange(of: configuration.themeWideOverride) { newValue in
.onChange_iOS17(of: configuration.themeWideOverride) { newValue in
configuration.onThemeWideOverrideChanged?(newValue)

// TODO: Still working through some issues with the theme-wide override tokens, so inform the user how to make it visible for now.
showingThemeWideAlert = true
}
.onChange(of: configuration.perControlOverride) { newValue in
.onChange_iOS17(of: configuration.perControlOverride) { newValue in
configuration.onPerControlOverrideChanged?(newValue)
}

Expand Down
5 changes: 0 additions & 5 deletions ios/FluentUI.Demo/FluentUI.Demo/ScrollView/DemoControllerScrollView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ class DemoControllerScrollView: UIScrollView, ScrollableContainerView {
return value(forKey: "verticalScrollIndicator") as? UIView
}

override func prepareForInterfaceBuilder() {
super.prepareForInterfaceBuilder()
initialize()
}

func makeFirstResponderVisible() {
if let firstResponder = UIResponder.firstResponder as? UIView, firstResponder.isDescendant(of: self) {
makeSubviewVisible(firstResponder)
Expand Down
25 changes: 25 additions & 0 deletions ios/FluentUI.Demo/FluentUI.Demo/SwiftUI/View+Extensions.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
//

import SwiftUI

extension View {
/// Abstracts away differences in pre-iOS 17 `onChange(of:perform:)` versus post-iOS 17 `onChange(of:_:)`.
///
/// This function will be removed once FluentUI moves to iOS 17 as a minimum target.
/// - Parameters:
/// - value: The value to check against when determining whether to run the closure.
/// - action: A closure to run when the value changes.
/// - Returns: A view that fires an action when the specified value changes.
func onChange_iOS17<V>(of value: V, _ action: @escaping (V) -> Void) -> some View where V: Equatable {
if #available(iOS 17, *) {
return self.onChange(of: value) { _, newValue in
return action(newValue)
}
} else {
return self.onChange(of: value, perform: action)
}
}
}

0 comments on commit 1ec3c51

Please sign in to comment.