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

Switching composer between text mode & action mode #4151

Merged
merged 26 commits into from
Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b4d3635
Switching composer between text mode & action mode
gileluard Mar 25, 2021
d2c4634
Switching composer between text mode & action mode
gileluard Mar 26, 2021
31b3d02
Switching composer between text mode & action mode
gileluard Mar 27, 2021
d1a34dc
Merge branch 'element_4133' into element_4087
gileluard Mar 27, 2021
9369008
Merge branch 'element_4133' into element_4087
gileluard Mar 29, 2021
654aea9
Switching composer between text mode & action mode
gileluard Mar 29, 2021
4b84799
Switching composer between text mode & action mode
gileluard Apr 2, 2021
b2500f9
Switching composer between text mode & action mode
gileluard Apr 7, 2021
17aef9c
Switching composer between text mode & action mode
gileluard Apr 7, 2021
c807231
Crash in [RoomViewController setupActions]
gileluard Apr 7, 2021
1364852
too much vertical whitespace when replying
gileluard Apr 7, 2021
0084c19
Merge branch 'develop' into element_4087
gileluard Apr 7, 2021
7e11020
too much vertical whitespace when replying
gileluard Apr 7, 2021
9b63c6f
Updated CHANGES.rst
gileluard Apr 7, 2021
b7f8807
Black theme uses dark background for composer
gileluard Apr 7, 2021
f110473
Increase grow/shrink animation speed in new composer
gileluard Apr 7, 2021
da168c8
back button chevron looks really weird
gileluard Apr 8, 2021
820e859
Update CHANGES.rst
gileluard Apr 8, 2021
3c1fa6f
Update CHANGES.rst
gileluard Apr 8, 2021
92e660e
Update Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
gileluard Apr 8, 2021
9c57d13
Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
gileluard Apr 8, 2021
f0c1b6d
Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
gileluard Apr 8, 2021
45ccb75
Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
gileluard Apr 8, 2021
79dc443
Update Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
gileluard Apr 8, 2021
bae0292
Update Riot/Modules/Room/Views/InputToolbar/RoomActionItem.swift
gileluard Apr 8, 2021
a26a206
Update after review
gileluard Apr 8, 2021
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
11 changes: 9 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@ Changes to be released in next version
=================================================

✨ Features
*
* Composer Update - Typing and sending a message (#4085)
* Switching composer between text mode & action mode (#4087)

🙌 Improvements
* Make the application settings more configurable (#4171)
* Possibility to lock some room creation parameters from settings (#4181)
* Enable / disable external friends invite (#4173)
* Composer update - UI enhancements (#4133)
* Increase grow/shrink animation speed in new composer (#4187)

🐛 Bugfix
*
* if you start typing while the new attachment sending mode is on, the send button appears (#4155)
gileluard marked this conversation as resolved.
Show resolved Hide resolved
* The final frames of the appearance animation of the new composer buttons are missing (#4160)
* Crash in [RoomViewController setupActions] (#4162)
* too much vertical whitespace when replying (#4164)
gileluard marked this conversation as resolved.
Show resolved Hide resolved
* Black theme uses dark background for composer (#4192)

⚠️ API Changes
*
Expand Down
6 changes: 6 additions & 0 deletions Riot/Assets/Images.xcassets/Room/Actions/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "action_camera.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
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,26 @@
{
"images" : [
{
"filename" : "action_file.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
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,26 @@
{
"images" : [
{
"filename" : "action_media_library.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
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,26 @@
{
"images" : [
{
"filename" : "action_sticker.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
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.
4 changes: 4 additions & 0 deletions Riot/Generated/Images.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ internal enum Asset {
internal static let peopleEmptyScreenArtwork = ImageAsset(name: "people_empty_screen_artwork")
internal static let peopleEmptyScreenArtworkDark = ImageAsset(name: "people_empty_screen_artwork_dark")
internal static let peopleFloatingAction = ImageAsset(name: "people_floating_action")
internal static let actionCamera = ImageAsset(name: "action_camera")
internal static let actionFile = ImageAsset(name: "action_file")
internal static let actionMediaLibrary = ImageAsset(name: "action_media_library")
internal static let actionSticker = ImageAsset(name: "action_sticker")
internal static let error = ImageAsset(name: "error")
internal static let errorMessageTick = ImageAsset(name: "error_message_tick")
internal static let roomActivitiesRetry = ImageAsset(name: "room_activities_retry")
Expand Down
Loading