Skip to content
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

Jump to bottom

Settings Screen New Design #196

Merged
merged 9 commits into from
Sep 20, 2022
Merged

Settings Screen New Design #196

merged 9 commits into from
Sep 20, 2022

Conversation

ismailgulek
Copy link
Contributor

@ismailgulek ismailgulek commented Sep 20, 2022 •
edited
Loading

Fixes #180

Appearance section not implemented. Also updates placeholder user and room avatars.

Light Dark
Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-20 at 18 55 56 Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-20 at 18 56 12
Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-20 at 19 12 32 Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-20 at 19 12 47

@ismailgulek ismailgulek requested review from a team and pixlwave and removed request for a team September 20, 2022 16:02
@github-actions
Copy link

github-actions bot commented Sep 20, 2022 •
edited
Loading

Warnings
⚠️ Some of the commits are missing ticket numbers. Please consinder using them for better tracking.

Generated by 🚫 Danger Swift against 67eab37

@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 3 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

pixlwave
pixlwave approved these changes Sep 20, 2022
View reviewed changes
Copy link
Member

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, a couple of thoughts inline, but nothing to stop merging this now.

ElementX/Sources/Screens/Settings/SettingsCoordinator.swift Show resolved Hide resolved
ElementX/Sources/Screens/Settings/View/SettingsScreen.swift Show resolved Hide resolved
ElementX/Sources/Screens/Settings/View/SettingsScreen.swift Show resolved Hide resolved
ElementX/Sources/AppCoordinatorStateMachine.swift
Comment on lines -80 to -84

/// Request settings screen presentation
case showSettingsScreen
/// The settings screen has been dismissed
case dismissedSettingsScreen
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come you modified the state machine here? Presumably to inject the user session?

I think we need to separate out into 2 of these now, one top level for the whole app and another for navigation with a single user session navigation.

@github-actions
Copy link

📱 Scan the QR code below to install the build for this PR.
🔒 This build is for internal testing purpose. Only devices listed in the ad-hoc provisioning profile can install Element Alpha.

QR code

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/NBhcMa

@pixlwave pixlwave merged commit 45934d3 into demo Sep 20, 2022
@pixlwave pixlwave deleted the ismail/180_settings_screen branch September 20, 2022 17:33
pixlwave
pixlwave reviewed Sep 22, 2022
View reviewed changes
Copy link
Member

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3 small comments in the re-review :)

ElementX/Sources/Screens/Settings/SettingsViewModel.swift Show resolved Hide resolved
ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift Show resolved Hide resolved
ElementX/Sources/Screens/RoomScreen/View/Timeline/PlaceholderAvatarImage.swift Show resolved Hide resolved
This was referenced Sep 22, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pixlwave pixlwave pixlwave approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ismailgulek @pixlwave