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.

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

sp2 adding rooms to spaces #5548

Merged
merged 25 commits into from
Feb 17, 2022

Conversation

gileluard
Copy link
Contributor

fix #5230

…_space_creation

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
…_space_creation

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
- check permission before adding room
- Added join button in explore room screens
@github-actions
Copy link

github-actions bot commented Feb 10, 2022

📱 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/8iciGr

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.

Looking good! 😎

Comments inline

gileluard and others added 7 commits February 15, 2022 19:11
…ooser.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
…r.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
…ooser.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
…ooser.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
…ooser.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
- update after review
…sProcessor.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
- update after review
Riot/Routers/TabRouters/RiotSegmentedController.swift Outdated Show resolved Hide resolved
Riot/Routers/TabRouters/TabBarRouter.swift Outdated Show resolved Hide resolved
Riot/Modules/CreateRoom/CreateRoomCoordinator.swift Outdated Show resolved Hide resolved
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 from my side, I see @SBiOSoftWhare has added comments now 👍

@gileluard gileluard merged commit 6735b66 into gil/SP1_space_creation Feb 17, 2022
@gileluard gileluard deleted the gil/5230_SP2-Adding_Rooms_to_Spaces branch February 17, 2022 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants