-
Notifications
You must be signed in to change notification settings - Fork 424
Add rooms layout option to native dashboard #4220
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
499f638
Add usage prediction common control section to Home
bgoncal ee38475
Handle usage prediction section header separately
bgoncal d69fa25
Add common used controls to native dashboard view
bgoncal 7e4f177
Add configuration toggle to customization view
bgoncal 3c91654
Localize controls prediction section label
bgoncal fb83adf
Add areas layout customization to Home view
bgoncal 01aedf9
Add grid layout option to HomeView areas
bgoncal bf61b21
Refactor area grid and add icon support in HomeView
bgoncal b077f6e
Lint
bgoncal 07ba2da
Merge branch 'main' into rooms-layout
bgoncal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
Sources/App/WebView/ExperimentalSpace/Home/AreaGridButton.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import SFSafeSymbols | ||
| import Shared | ||
| import SwiftUI | ||
|
|
||
| @available(iOS 26.0, *) | ||
| struct AreaGridButton: View { | ||
| enum Constants { | ||
| static let cornerRadius: CGFloat = DesignSystem.CornerRadius.two | ||
| static let borderLineWidth: CGFloat = DesignSystem.Border.Width.default | ||
| static let iconSize: CGFloat = 32 | ||
| } | ||
|
|
||
| let section: HomeViewModel.RoomSection | ||
| let action: () -> Void | ||
|
|
||
| var body: some View { | ||
| Button(action: action) { | ||
| VStack(spacing: DesignSystem.Spaces.oneAndHalf) { | ||
| icon | ||
| Text(section.name) | ||
| .font(.footnote.weight(.semibold)) | ||
| .foregroundColor(Color(uiColor: .label)) | ||
| .lineLimit(2) | ||
| .truncationMode(.middle) | ||
| .multilineTextAlignment(.center) | ||
| .padding(.horizontal, DesignSystem.Spaces.one) | ||
| } | ||
| .frame(maxWidth: .infinity, maxHeight: .infinity) | ||
| .aspectRatio(1, contentMode: .fill) | ||
| .background(Color.tileBackground) | ||
| .clipShape(RoundedRectangle(cornerRadius: Constants.cornerRadius)) | ||
| .overlay( | ||
| RoundedRectangle(cornerRadius: Constants.cornerRadius) | ||
| .stroke(Color.tileBorder, lineWidth: Constants.borderLineWidth) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private var icon: some View { | ||
| let materialDesignIcon = MaterialDesignIcons( | ||
| serversideValueNamed: section.icon.orEmpty, | ||
| fallback: .squareRoundedOutlineIcon | ||
| ) | ||
| return Group { | ||
| Image(uiImage: materialDesignIcon.image( | ||
| ofSize: .init(width: Constants.iconSize, height: Constants.iconSize), | ||
| color: .haPrimary | ||
| )) | ||
| } | ||
| .font(.system(size: Constants.iconSize)) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 31 additions & 1 deletion
32
Sources/App/WebView/ExperimentalSpace/Home/HomeViewConfiguration.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.