swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update compound with row selection. (#1439)

Browse Source 
Include accessibility traits in old form styles too.
This commit is contained in:
Doug 2023-08-03 10:37:34 +01:00 committed by GitHub
parent 17aa0c632f
commit 68f8bfed53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DesignKit/Package.swift
View File

@ -12,7 +12,7 @@ let package = Package(
.library(name: "DesignKit", targets: ["DesignKit"])
],
dependencies: [
.package(url: "https://github.com/vector-im/compound-ios.git", revision: "1f3eb60c4f87249d95addf84ce1aef22c2968763"),
.package(url: "https://github.com/vector-im/compound-ios.git", revision: "89e3ed5adef33be7eb65137b861833ffae64f961"),
.package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"),
.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.9.0")
],

4
ElementX.xcodeproj/project.pbxproj
View File

@ -3670,7 +3670,7 @@
path = Timeline;
sourceTree = "<group>";
};
"TEMP_2C2AE7A1-DD19-41AC-BCFD-C9FE3F5EC278" /* element-x-ios */ = {
"TEMP_F85F8A84-6E1F-4213-A180-41C5B49354D2" /* element-x-ios */ = {
isa = PBXGroup;
children = (
41553551C55AD59885840F0E /* secrets.xcconfig */,
@ -5405,7 +5405,7 @@
repositoryURL = "https://github.com/vector-im/compound-ios";
requirement = {
kind = revision;
revision = 1f3eb60c4f87249d95addf84ce1aef22c2968763;
revision = 89e3ed5adef33be7eb65137b861833ffae64f961;
};
};
9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {

4
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -11,9 +11,9 @@
{
"identity" : "compound-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/vector-im/compound-ios.git",
"location" : "https://github.com/vector-im/compound-ios",
"state" : {
"revision" : "1f3eb60c4f87249d95addf84ce1aef22c2968763"
"revision" : "89e3ed5adef33be7eb65137b861833ffae64f961"
}
},
{

2
ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
View File

@ -58,11 +58,13 @@ struct FormRowAccessory: View {
Image(systemName: "checkmark.circle.fill")
.font(.compound.bodyLG)
.foregroundColor(isSelected && isEnabled ? .compound.iconPrimary : .compound.iconTertiary)
.accessibilityAddTraits(.isSelected)
}
case .multipleSelection(let isSelected):
Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")
.font(.compound.bodyLG)
.foregroundColor(isSelected && isEnabled ? .compound.iconPrimary : .compound.iconTertiary)
.accessibilityAddTraits(isSelected ? .isSelected : [])
}
}

2
project.yml
View File

@ -54,7 +54,7 @@ packages:
minorVersion: 5.13.0
Compound:
url: https://github.com/vector-im/compound-ios
revision: 1f3eb60c4f87249d95addf84ce1aef22c2968763
revision: 89e3ed5adef33be7eb65137b861833ffae64f961
# path: ../compound-ios
Algorithms:
url: https://github.com/apple/swift-algorithms