Skip to content

[DRAFT] Fluent UI Update POC #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

[DRAFT] Fluent UI Update POC #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
527ae28
Fluent update
palatter Feb 6, 2025
97de35e
Update colorProvider
palatter Feb 7, 2025
5a70f40
Update Chat
palatter Feb 7, 2025
3a0609c
Create FontProvider.swift
palatter Feb 7, 2025
2f78b55
Initial Calling Changes
palatter Feb 7, 2025
60a6dd3
Update calling
palatter Feb 10, 2025
02c51c3
Fix chat colours
palatter Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions AzureCommunicationUI/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ target 'AzureCommunicationUICalling' do
use_frameworks!
pod 'AzureCore', '1.0.0-beta.15'
pod 'AzureCommunicationCalling', '2.14.1'
pod 'MicrosoftFluentUI/Avatar_ios', '0.10.0'
pod 'MicrosoftFluentUI/BottomSheet_ios', '0.10.0'
pod 'MicrosoftFluentUI/Button_ios', '0.10.0'
pod 'MicrosoftFluentUI/PopupMenu_ios', '0.10.0'
pod 'MicrosoftFluentUI/ActivityIndicator_ios', '0.10.0'
pod 'MicrosoftFluentUI/AvatarGroup_ios', '0.10.0'
pod 'MicrosoftFluentUI/Avatar_ios', '0.32.0'
pod 'MicrosoftFluentUI/BottomSheet_ios', '0.32.0'
pod 'MicrosoftFluentUI/Button_ios', '0.32.0'
pod 'MicrosoftFluentUI/PopupMenu_ios', '0.32.0'
pod 'MicrosoftFluentUI/ActivityIndicator_ios', '0.32.0'
pod 'MicrosoftFluentUI/AvatarGroup_ios', '0.32.0'
pod 'AzureCore', '1.0.0-beta.15'
pod 'SwiftLint', '0.53.0'

Expand All @@ -32,12 +32,12 @@ target 'AzureCommunicationUIChat' do
project 'sdk/AzureCommunicationUIChat/AzureCommunicationUIChat.xcodeproj'
use_frameworks!
pod 'AzureCommunicationChat', '1.3.3'
pod 'MicrosoftFluentUI/Avatar_ios', '0.10.0'
pod 'MicrosoftFluentUI/BottomSheet_ios', '0.10.0'
pod 'MicrosoftFluentUI/Button_ios', '0.10.0'
pod 'MicrosoftFluentUI/PopupMenu_ios', '0.10.0'
pod 'MicrosoftFluentUI/ActivityIndicator_ios', '0.10.0'
pod 'MicrosoftFluentUI/AvatarGroup_ios', '0.10.0'
pod 'MicrosoftFluentUI/Avatar_ios', '0.32.0'
pod 'MicrosoftFluentUI/BottomSheet_ios', '0.32.0'
pod 'MicrosoftFluentUI/Button_ios', '0.32.0'
pod 'MicrosoftFluentUI/PopupMenu_ios', '0.32.0'
pod 'MicrosoftFluentUI/ActivityIndicator_ios', '0.32.0'
pod 'MicrosoftFluentUI/AvatarGroup_ios', '0.32.0'
pod 'SwiftLint', '0.53.0'

target 'AzureCommunicationUIChatTests' do
Expand All @@ -51,12 +51,12 @@ target 'AzureCommunicationUIDemoApp' do
use_frameworks!
pod 'AzureCommunicationCalling', '2.14.1'
pod 'AzureCommunicationChat', '1.3.3'
pod 'MicrosoftFluentUI/Avatar_ios', '0.10.0'
pod 'MicrosoftFluentUI/BottomSheet_ios', '0.10.0'
pod 'MicrosoftFluentUI/Button_ios', '0.10.0'
pod 'MicrosoftFluentUI/PopupMenu_ios', '0.10.0'
pod 'MicrosoftFluentUI/ActivityIndicator_ios', '0.10.0'
pod 'MicrosoftFluentUI/AvatarGroup_ios', '0.10.0'
pod 'MicrosoftFluentUI/Avatar_ios', '0.32.0'
pod 'MicrosoftFluentUI/BottomSheet_ios', '0.32.0'
pod 'MicrosoftFluentUI/Button_ios', '0.32.0'
pod 'MicrosoftFluentUI/PopupMenu_ios', '0.32.0'
pod 'MicrosoftFluentUI/ActivityIndicator_ios', '0.32.0'
pod 'MicrosoftFluentUI/AvatarGroup_ios', '0.32.0'
pod 'SwiftLint', '0.53.0'
pod 'AppCenter/Crashes', '4.4.1'

Expand Down
47 changes: 25 additions & 22 deletions AzureCommunicationUI/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,43 @@ PODS:
- Trouter (= 0.2.0)
- AzureCommunicationCommon (1.2.0)
- AzureCore (1.0.0-beta.15)
- MicrosoftFluentUI/ActivityIndicator_ios (0.10.0):
- MicrosoftFluentUI/ActivityIndicator_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/Avatar_ios (0.10.0):
- MicrosoftFluentUI/Avatar_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/AvatarGroup_ios (0.10.0):
- MicrosoftFluentUI/AvatarGroup_ios (0.32.0):
- MicrosoftFluentUI/Avatar_ios
- MicrosoftFluentUI/BottomSheet_ios (0.10.0):
- MicrosoftFluentUI/BottomSheet_ios (0.32.0):
- MicrosoftFluentUI/Obscurable_ios
- MicrosoftFluentUI/ResizingHandleView_ios
- MicrosoftFluentUI/Button_ios (0.10.0):
- MicrosoftFluentUI/Button_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/Core_ios (0.10.0)
- MicrosoftFluentUI/Drawer_ios (0.10.0):
- MicrosoftFluentUI/Core_ios (0.32.0)
- MicrosoftFluentUI/Drawer_ios (0.32.0):
- MicrosoftFluentUI/Obscurable_ios
- MicrosoftFluentUI/ResizingHandleView_ios
- MicrosoftFluentUI/Separator_ios
- MicrosoftFluentUI/TouchForwardingView_ios
- MicrosoftFluentUI/Label_ios (0.10.0):
- MicrosoftFluentUI/Label_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/Obscurable_ios (0.10.0):
- MicrosoftFluentUI/Obscurable_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/PopupMenu_ios (0.10.0):
- MicrosoftFluentUI/PopupMenu_ios (0.32.0):
- MicrosoftFluentUI/Drawer_ios
- MicrosoftFluentUI/Label_ios
- MicrosoftFluentUI/Separator_ios
- MicrosoftFluentUI/TableView_ios
- MicrosoftFluentUI/ResizingHandleView_ios (0.10.0):
- MicrosoftFluentUI/ResizingHandleView_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/Separator_ios (0.10.0):
- MicrosoftFluentUI/Separator_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/TableView_ios (0.10.0):
- MicrosoftFluentUI/TableView_ios (0.32.0):
- MicrosoftFluentUI/Label_ios
- MicrosoftFluentUI/Separator_ios
- MicrosoftFluentUI/TouchForwardingView_ios (0.10.0):
- MicrosoftFluentUI/TableViewListShared_ios
- MicrosoftFluentUI/TableViewListShared_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- MicrosoftFluentUI/TouchForwardingView_ios (0.32.0):
- MicrosoftFluentUI/Core_ios
- SwiftLint (0.53.0)
- Trouter (0.2.0)
Expand All @@ -53,12 +56,12 @@ DEPENDENCIES:
- AzureCommunicationCalling (= 2.14.1)
- AzureCommunicationChat (= 1.3.3)
- AzureCore (= 1.0.0-beta.15)
- MicrosoftFluentUI/ActivityIndicator_ios (= 0.10.0)
- MicrosoftFluentUI/Avatar_ios (= 0.10.0)
- MicrosoftFluentUI/AvatarGroup_ios (= 0.10.0)
- MicrosoftFluentUI/BottomSheet_ios (= 0.10.0)
- MicrosoftFluentUI/Button_ios (= 0.10.0)
- MicrosoftFluentUI/PopupMenu_ios (= 0.10.0)
- MicrosoftFluentUI/ActivityIndicator_ios (= 0.32.0)
- MicrosoftFluentUI/Avatar_ios (= 0.32.0)
- MicrosoftFluentUI/AvatarGroup_ios (= 0.32.0)
- MicrosoftFluentUI/BottomSheet_ios (= 0.32.0)
- MicrosoftFluentUI/Button_ios (= 0.32.0)
- MicrosoftFluentUI/PopupMenu_ios (= 0.32.0)
- SwiftLint (= 0.53.0)

SPEC REPOS:
Expand All @@ -78,10 +81,10 @@ SPEC CHECKSUMS:
AzureCommunicationChat: 79fb67f0d6160754817d77d307565a015a5eb9b2
AzureCommunicationCommon: 130a21be2be889f83dc4adbf994af6285f962de8
AzureCore: ebbf7cf4dfe72afc7584088c38d1c99f5a35d647
MicrosoftFluentUI: f6db695718efb93f4ca9bdc366c00b80a1f91dba
MicrosoftFluentUI: d6ea08c5237e92694a0976a978971b8f13ff8251
SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44
Trouter: 7eab36954ad740e32db3ff9f6025b0dff92193d7

PODFILE CHECKSUM: 71492c39a100fcfefef00ad5c62a3e055f4b63a8
PODFILE CHECKSUM: b06e1c305d40b2ac9207fb053dc519d636b84035

COCOAPODS: 1.16.2
4 changes: 4 additions & 0 deletions ...nUI/sdk/AzureCommunicationUICalling/AzureCommunicationUICalling.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@
A88CDFBC27505A410004E2F5 /* ErrorInfoViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88CDFBB27505A410004E2F5 /* ErrorInfoViewModel.swift */; };
A8ED232D2645C637008A26B2 /* CallingServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8ED232C2645C637008A26B2 /* CallingServiceTests.swift */; };
A8ED23302649EA61008A26B2 /* NavigationRouterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8ED232F2649EA61008A26B2 /* NavigationRouterTests.swift */; };
A8F202BD2D56BE6C005169C1 /* FontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8F202BC2D56BE68005169C1 /* FontProvider.swift */; };
B2120A5C2A97E35E00E29C05 /* UserFacingDiagnosticModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2120A5B2A97E35E00E29C05 /* UserFacingDiagnosticModel.swift */; };
B238378B2AA26EA7001F72B3 /* CallDiagnosticsReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B238378A2AA26EA7001F72B3 /* CallDiagnosticsReducer.swift */; };
B26F4B092ABA2F6B00753B6C /* BottomToastViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B26F4B082ABA2F6B00753B6C /* BottomToastViewModelTests.swift */; };
Expand Down Expand Up @@ -744,6 +745,7 @@
A88CDFBB27505A410004E2F5 /* ErrorInfoViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorInfoViewModel.swift; sourceTree = "<group>"; };
A8ED232C2645C637008A26B2 /* CallingServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallingServiceTests.swift; sourceTree = "<group>"; };
A8ED232F2649EA61008A26B2 /* NavigationRouterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationRouterTests.swift; sourceTree = "<group>"; };
A8F202BC2D56BE68005169C1 /* FontProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontProvider.swift; sourceTree = "<group>"; };
B2120A5B2A97E35E00E29C05 /* UserFacingDiagnosticModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserFacingDiagnosticModel.swift; sourceTree = "<group>"; };
B238378A2AA26EA7001F72B3 /* CallDiagnosticsReducer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallDiagnosticsReducer.swift; sourceTree = "<group>"; };
B26F4B082ABA2F6B00753B6C /* BottomToastViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomToastViewModelTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1151,6 +1153,7 @@
1F94DADD2673E92300691D1E /* Style */ = {
isa = PBXGroup;
children = (
A8F202BC2D56BE68005169C1 /* FontProvider.swift */,
759BDEFE28FF0B0A002B6853 /* LocalizationProvider.swift */,
759BDEF828FF0851002B6853 /* StyleProvider.swift */,
759BDEF628FF0839002B6853 /* ColorThemeProvider.swift */,
Expand Down Expand Up @@ -2322,6 +2325,7 @@
05CE90FD2C8E9985001ACA79 /* ButtonViewDataAction.swift in Sources */,
1F48B401274879F000B6E5F9 /* DiagnosticConfig.swift in Sources */,
051F73942C0E10BB006E097F /* ToastNotificationAction.swift in Sources */,
A8F202BD2D56BE6C005169C1 /* FontProvider.swift in Sources */,
05C1C828297F4830006EDD0D /* CallHistoryRecord.swift in Sources */,
9823AB4926A13F220006266D /* PreviewAreaView.swift in Sources */,
50FA46212698EA7A001844AC /* IconWithLabelButtonViewModel.swift in Sources */,
Expand Down
10 changes: 5 additions & 5 deletions AzureCommunicationUI/sdk/AzureCommunicationUICalling/Sources/CallComposite.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,11 +690,11 @@ and launch(locator: JoinLocator, localOptions: LocalOptions? = nil) instead.
private func setupColorTheming() {
let colorProvider = ColorThemeProvider(themeOptions: themeOptions)
StyleProvider.color = colorProvider
Task { @MainActor in
if let window = UIWindow.keyWindow {
Colors.setProvider(provider: colorProvider, for: window)
}
}
// Task { @MainActor in
// if let window = UIWindow.keyWindow {
// Colors.setProvider(provider: colorProvider, for: window)
// }
// }
}

private func setupLocalization(with provider: LocalizationProviderProtocol) {
Expand Down
28 changes: 22 additions & 6 deletions ...icationUI/sdk/AzureCommunicationUICalling/Sources/CallCompositeOptions/ThemeOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,36 @@ public extension ThemeOptions {
return .unspecified
}
var primaryColor: UIColor {
return Colors.Palette.communicationBlue.color
return UIColor.blue
}
var primaryColorTint10: UIColor {
return Colors.Palette.communicationBlueTint10.color
return UIColor.blue
}
var primaryColorTint20: UIColor {
return Colors.Palette.communicationBlueTint20.color
return UIColor.blue
}
var primaryColorTint30: UIColor {
return Colors.Palette.communicationBlueTint30.color
return UIColor.blue
}
/* <CUSTOM_COLOR_FEATURE> */
var foregroundOnPrimaryColor: UIColor {
return UIColor.init(dynamicColor: Colors.surfacePrimary.dynamicColor!)
return UIColor.white
}
/* </CUSTOM_COLOR_FEATURE> */
// var primaryColor: UIColor {
// return Colors.Palette.communicationBlue.color
// }
// var primaryColorTint10: UIColor {
// return Colors.Palette.communicationBlueTint10.color
// }
// var primaryColorTint20: UIColor {
// return Colors.Palette.communicationBlueTint20.color
// }
// var primaryColorTint30: UIColor {
// return Colors.Palette.communicationBlueTint30.color
// }
// /* <CUSTOM_COLOR_FEATURE> */
// var foregroundOnPrimaryColor: UIColor {
// return UIColor.init(dynamicColor: Colors.surfacePrimary.dynamicColor!)
// }
// /* </CUSTOM_COLOR_FEATURE> */
}
2 changes: 1 addition & 1 deletion ...k/AzureCommunicationUICalling/Sources/Presentation/FluentUI/Wrapper/CompositeAvatar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct CompositeAvatar: View {
size: avatarSize,
image: avatarImage,
primaryText: displayName)
.ringColor(StyleProvider.color.primaryColor)
.ringColor(StyleProvider.color.brandForegroundTint)
.isRingVisible(isSpeaking)
.accessibilityHidden(true)
}
Expand Down
52 changes: 26 additions & 26 deletions ...k/AzureCommunicationUICalling/Sources/Presentation/FluentUI/Wrapper/CompositeButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,32 +52,32 @@ struct CompositeButton: UIViewRepresentable {
) -> FluentUI.Button {
let button = Button(style: buttonStyle)
button.setTitle(buttonLabel, for: .normal)
/* <CUSTOM_COLOR_FEATURE> */
let dynamicColor = (buttonStyle == .borderless ||
buttonStyle == .primaryOutline)
? themeOptions.primaryColor.dynamicColor
: themeOptions.foregroundOnPrimaryColor.dynamicColor
var overrideTokens: [ButtonTokenSet.Tokens: ControlTokenValue] = [
.foregroundColor: ControlTokenValue.dynamicColor({
dynamicColor!
}),
.foregroundPressedColor: ControlTokenValue.dynamicColor({
dynamicColor!
}),
.foregroundDisabledColor: ControlTokenValue.dynamicColor({
Colors.gray300.dynamicColor!
}),
.borderColor: ControlTokenValue.dynamicColor({
themeOptions.primaryColor.dynamicColor!
})
]
if buttonStyle == .primaryFilled {
overrideTokens[.backgroundColor] = .dynamicColor {
themeOptions.primaryColor.dynamicColor!
}
}
button.tokenSet.replaceAllOverrides(with: overrideTokens)
/* </CUSTOM_COLOR_FEATURE> */
// /* <CUSTOM_COLOR_FEATURE> */
// let dynamicColor = (buttonStyle == .borderless ||
// buttonStyle == .primaryOutline)
// ? themeOptions.primaryColor.dynamicColor
// : themeOptions.foregroundOnPrimaryColor.dynamicColor
// var overrideTokens: [ButtonTokenSet.Tokens: ControlTokenValue] = [
// .foregroundColor: ControlTokenValue.dynamicColor({
// dynamicColor!
// }),
// .foregroundPressedColor: ControlTokenValue.dynamicColor({
// dynamicColor!
// }),
// .foregroundDisabledColor: ControlTokenValue.dynamicColor({
// Colors.gray300.dynamicColor!
// }),
// .borderColor: ControlTokenValue.dynamicColor({
// themeOptions.primaryColor.dynamicColor!
// })
// ]
// if buttonStyle == .primaryFilled {
// overrideTokens[.backgroundColor] = .dynamicColor {
// themeOptions.primaryColor.dynamicColor!
// }
// }
// button.tokenSet.replaceAllOverrides(with: overrideTokens)
// /* </CUSTOM_COLOR_FEATURE> */
if let paddings = paddings {
button.edgeInsets = getEdgeInserts(paddings)
}
Expand Down
Loading