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

Space creation element-ios #5182

Merged
merged 21 commits into from
Jan 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
87d54ad
[iOS] Create public space #143
gileluard Nov 23, 2021
b9ac78d
[iOS] Create public space #143
gileluard Nov 23, 2021
30c3c3d
[iOS] Create public space #143
gileluard Dec 1, 2021
fcba28e
Merge branch 'develop' into gil/143_create_public_space
gileluard Dec 8, 2021
9c29b62
[iOS] Create public space #143
gileluard Dec 9, 2021
de17051
Merge branch 'develop' into gil/143_create_public_space
gileluard Dec 13, 2021
35bde5e
[iOS] Create public space #143
gileluard Dec 13, 2021
8d2be41
[iOS] Create public space #143
gileluard Dec 15, 2021
652c4da
[iOS] Create public space #143
gileluard Dec 15, 2021
9e946eb
[iOS] Create public space #143
gileluard Dec 16, 2021
fa9727b
[iOS] Create public space #143
gileluard Dec 16, 2021
c2b5532
[iOS] Create public space #143
gileluard Dec 23, 2021
835e608
Merge branch 'develop' into gil/143_create_public_space
gileluard Dec 23, 2021
775e91b
[iOS] Create public space #143
gileluard Dec 23, 2021
bce0bf3
Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space
gileluard Jan 10, 2022
ddf732d
Update RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixIt…
gileluard Jan 10, 2022
d6e4bd6
Update RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProc…
gileluard Jan 10, 2022
523be58
[iOS] Create public space #143
gileluard Jan 24, 2022
d6a351f
Merge branch 'gil/143_create_public_space' of github.com:vector-im/el…
gileluard Jan 24, 2022
b2bf867
Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space
gileluard Jan 24, 2022
0f1a5a1
[iOS] Create public space #143
gileluard Jan 24, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "space_creation_camera.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "space_creation_camera@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "space_creation_camera@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "space_creation_private.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "space_creation_private@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "space_creation_private@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "space_creation_public.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "space_creation_public@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "space_creation_public@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "space_home_icon_dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "space_home_icon_dark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "space_home_icon_dark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "space_home_icon_light.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "space_home_icon_light@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "space_home_icon_light@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "spaces_add_space_dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "spaces_add_space_dark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "spaces_add_space_dark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "spaces_add_space_light.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "spaces_add_space_light@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "spaces_add_space_light@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "spaces_invite_users.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "spaces_invite_users@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "spaces_invite_users@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "space_home_icon.png",
"filename" : "spaces_modal_back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "space_home_icon@2x.png",
"filename" : "spaces_modal_back@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "space_home_icon@3x.png",
"filename" : "spaces_modal_back@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "spaces_modal_close.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "spaces_modal_close@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "spaces_modal_close@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
64 changes: 64 additions & 0 deletions Riot/Assets/en.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
"less" = "Less";
"open" = "Open";
"done" = "Done";
"private" = "Private";
"public" = "Public";
"stop" = "Stop";
"ok" = "OK";

// Call Bar
Expand Down Expand Up @@ -1749,6 +1752,8 @@ Tap the + to start adding people.";
"space_beta_announce_information" = "Spaces are a new way to group rooms and people. They’re not on iOS yet, but you can use them now on Web and Desktop.";

"spaces_home_space_title" = "Home";
"spaces_add_space_title" = "Create space";
"spaces_create_space_title" = "Create a space";
"spaces_left_panel_title" = "Spaces";
"leave_space_title" = "Leave %@";
"leave_space_message" = "Are you sure you want to leave %@? Do you also want to leave all rooms and spaces of this space?";
Expand All @@ -1772,7 +1777,66 @@ Tap the + to start adding people.";
"space_home_show_all_rooms" = "Show all rooms";

"space_private_join_rule" = "Private space";
"space_private_join_rule_detail" = "Invite only, best for yourself or teams";
"space_public_join_rule" = "Public space";
"space_public_join_rule_detail" = "Open to anyone, best for communities";

"space_topic" = "description";

// Mark: - Space Creation

"spaces_creation_hint" = "Spaces are a new way to group rooms and people.";
"spaces_creation_visibility_title" = "What type of space do you want to create?";
"spaces_creation_visibility_message" = "To join an existing space, you need an invite.";
"spaces_creation_footer" = "You can change this later";
"spaces_creation_settings_message" = "Add some details to help it stand out. You can change these at any point.";
"spaces_creation_address" = "Address";
"spaces_creation_empty_room_name_error" = "Name required";
"spaces_creation_address_default_message" = "Your space will be viewable at\n%@";
"spaces_creation_address_invalid_characters" = "%@\nhas invalid characters";
"spaces_creation_address_already_exists" = "%@\nalready exists";
"spaces_creation_public_space_title" = "Your public space";
"spaces_creation_private_space_title" = "Your private space";
"spaces_creation_cancel_title" = "Stop creating a space?";
"spaces_creation_cancel_message" = "Your progress will be lost.";

"spaces_creation_new_rooms_title" = "What are some discussions you’ll have?";
"spaces_creation_new_rooms_message" = "We’ll create a room for each one.";
"spaces_creation_new_rooms_room_name_title" = "Room name";
"spaces_creation_new_rooms_general" = "General";
"spaces_creation_new_rooms_random" = "Random";
"spaces_creation_new_rooms_support" = "Support";

"spaces_creation_email_invites_title" = "Invite your team";
"spaces_creation_email_invites_message" = "You can invite them later too.";
"spaces_creation_email_invites_email_title" = "Email";

"spaces_creation_sharing_type_title" = "Who are you working with?";
"spaces_creation_sharing_type_message" = "Make sure the right people have access %@. You can change this later.";
"spaces_creation_sharing_type_just_me_title" = "Just me";
"spaces_creation_sharing_type_just_me_detail" = "A private space to organise your rooms";
"spaces_creation_sharing_type_me_and_teammates_title" = "Me and teammates";
"spaces_creation_sharing_type_me_and_teammates_detail" = "A private space for you & your teammates";

"spaces_creation_add_rooms_title" = "What do you want to add?";
"spaces_creation_add_rooms_message" = "As this space is just for you, no one will be informed. You can add more later.";

"spaces_creation_invite_by_username" = "Invite by username";
"spaces_creation_invite_by_username_title" = "Invite your team";
"spaces_creation_invite_by_username_message" = "You can invite them later too.";

"spaces_creation_post_process_creating_space" = "Creating space";
"spaces_creation_post_process_creating_space_task" = "Creating %@";
"spaces_creation_post_process_uploading_avatar" = "Uploading avatar";
"spaces_creation_post_process_creating_room" = "Creating %@";
"spaces_creation_post_process_adding_rooms" = "Adding %@ rooms";
"spaces_creation_post_process_inviting_users" = "Inviting %@ users";

"spaces_creation_in_spacename" = "in %@";
"spaces_creation_in_spacename_plus_one" = "in %@ + 1 space";
"spaces_creation_in_spacename_plus_many" = "in %@ + %@ spaces";
"spaces_creation_in_many_spaces" = "in %@ spaces";
"spaces_creation_in_one_space" = "in 1 space";

// Mark: Avatar

Expand Down
11 changes: 10 additions & 1 deletion Riot/Generated/Images.swift
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ internal enum Asset {
internal static let sideMenuNotifIcon = ImageAsset(name: "side_menu_notif_icon")
internal static let featureUnavaibleArtwork = ImageAsset(name: "feature_unavaible_artwork")
internal static let featureUnavaibleArtworkDark = ImageAsset(name: "feature_unavaible_artwork_dark")
internal static let spaceHomeIcon = ImageAsset(name: "space_home_icon")
internal static let spaceCreationCamera = ImageAsset(name: "space_creation_camera")
internal static let spaceCreationPrivate = ImageAsset(name: "space_creation_private")
internal static let spaceCreationPublic = ImageAsset(name: "space_creation_public")
internal static let spaceHomeIconDark = ImageAsset(name: "space_home_icon_dark")
internal static let spaceHomeIconLight = ImageAsset(name: "space_home_icon_light")
internal static let spaceMenuClose = ImageAsset(name: "space_menu_close")
internal static let spaceMenuLeave = ImageAsset(name: "space_menu_leave")
internal static let spaceMenuMembers = ImageAsset(name: "space_menu_members")
Expand All @@ -215,6 +219,11 @@ internal enum Asset {
internal static let spaceRoomIcon = ImageAsset(name: "space_room_icon")
internal static let spaceTypeIcon = ImageAsset(name: "space_type_icon")
internal static let spaceUserIcon = ImageAsset(name: "space_user_icon")
internal static let spacesAddSpaceDark = ImageAsset(name: "spaces_add_space_dark")
internal static let spacesAddSpaceLight = ImageAsset(name: "spaces_add_space_light")
internal static let spacesInviteUsers = ImageAsset(name: "spaces_invite_users")
internal static let spacesModalBack = ImageAsset(name: "spaces_modal_back")
internal static let spacesModalClose = ImageAsset(name: "spaces_modal_close")
internal static let spacesMore = ImageAsset(name: "spaces_more")
internal static let tabFavourites = ImageAsset(name: "tab_favourites")
internal static let tabGroups = ImageAsset(name: "tab_groups")
Expand Down
Loading