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

Design Tweaks for Threads #5356

Merged
merged 38 commits into from
Jan 26, 2022
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2c1324b
Update icons & summary view margins
ismailgulek Jan 4, 2022
48a0272
Shrink summary view if content is small
ismailgulek Jan 4, 2022
e422917
User name coloring on thread list
ismailgulek Jan 4, 2022
9a5bc71
Layout fixes
ismailgulek Jan 4, 2022
a697382
Fix root message redaction
ismailgulek Jan 4, 2022
36d1873
Implement thread list long press actions, fix #5310
ismailgulek Jan 5, 2022
f0ee94d
Implement basic toast
ismailgulek Jan 5, 2022
fc14088
Toast resources
ismailgulek Jan 5, 2022
42a44dd
Implement toast messages when links are copied
ismailgulek Jan 5, 2022
b7936de
Fix encryption badges for unencrypted rooms
ismailgulek Jan 5, 2022
357515b
Fix context menu action orders & layout fixes
ismailgulek Jan 6, 2022
c1cee57
Add EventMenuBuilder to manage ordering on event menu actions
ismailgulek Jan 10, 2022
62386b2
Implement thread list filtered icon, part of #5359
ismailgulek Jan 11, 2022
52d780e
Update strings
ismailgulek Jan 11, 2022
db43e86
Make thread header stacked, fix #5358
ismailgulek Jan 11, 2022
e9b2426
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
ismailgulek Jan 17, 2022
6cbefde
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
ismailgulek Jan 17, 2022
696d700
Fix build after merges
ismailgulek Jan 17, 2022
8cfec2f
Thread summary view design changes
ismailgulek Jan 17, 2022
d5de3a9
Various design fixes
ismailgulek Jan 17, 2022
d7ed2d3
Fix event content where the thread root event is a reply event
ismailgulek Jan 17, 2022
b7b84ad
Align summary last message to the time label
ismailgulek Jan 17, 2022
21d6ea5
Dismiss keyboard when additional menu shown
ismailgulek Jan 17, 2022
e2664e9
Speed up toast animation
ismailgulek Jan 17, 2022
0cb4d66
Center empty view vertically in the whole screen
ismailgulek Jan 17, 2022
b9ccd52
Fix thread screen call button case
ismailgulek Jan 18, 2022
cb57694
Add thread decoration views for search results, fix #5268
ismailgulek Jan 18, 2022
dcd7874
Add background color management on text message highlights
ismailgulek Jan 18, 2022
240bf6a
Disable sending polls in threads
ismailgulek Jan 18, 2022
0a85d1b
Fix cell layout when thread root is a poll
ismailgulek Jan 18, 2022
8a1d66f
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
ismailgulek Jan 18, 2022
677eb52
Update thread list filter applied icon
ismailgulek Jan 20, 2022
67da0c0
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
ismailgulek Jan 26, 2022
5f9b9fc
Implement thread summary displayable on cell decorator
ismailgulek Jan 26, 2022
9327626
Fix Doug's remarks
ismailgulek Jan 26, 2022
583fe39
Make remove poll action destructive as well
ismailgulek Jan 26, 2022
f14b471
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
ismailgulek Jan 26, 2022
ec38cef
Fix further review remarks
ismailgulek Jan 26, 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
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,26 @@
{
"images" : [
{
"filename" : "Vector.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" : "original"
}
}
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,12 @@
{
"images" : [
{
"filename" : "filter-on.svg",
ismailgulek marked this conversation as resolved.
Show resolved Hide resolved
"idiom" : "universal"
}
],
"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
Expand Up @@ -19,5 +19,8 @@
"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.
26 changes: 26 additions & 0 deletions Riot/Assets/Images.xcassets/Room/link_icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "Link.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.
6 changes: 4 additions & 2 deletions Riot/Assets/en.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ Tap the + to start adding people.";
"room_event_action_reaction_show_all" = "Show all";
"room_event_action_reaction_show_less" = "Show less";
"room_event_action_reaction_history" = "Reaction history";
"room_event_copy_link_info" = "Link copied to clipboard.";
"room_warning_about_encryption" = "End-to-end encryption is in beta and may not be reliable.\n\nYou should not yet trust it to secure data.\n\nDevices will not yet be able to decrypt history from before they joined the room.\n\nEncrypted messages will not be visible on clients that do not yet implement encryption.";
"room_event_failed_to_send" = "Failed to send";
"room_action_camera" = "Take photo or video";
Expand Down Expand Up @@ -442,9 +443,10 @@ Tap the + to start adding people.";
"threads_action_my_threads" = "My threads";
"threads_empty_title" = "Keep discussions organised with threads";
"threads_empty_info_all" = "Threads help keep your conversations on-topic and easy to track.";
"threads_empty_info_my" = "Reply to an ongoing thread or use “Thread” when selecting a message to start a new one.";
"threads_empty_tip" = "Tip: Use “Thread” option when selecting a message.";
"threads_empty_info_my" = "Reply to an ongoing thread or tap a message and use “Thread” to start a new one.";
"threads_empty_tip" = "Tip: Tap a message and use “Thread” to start one.";
"threads_empty_show_all_threads" = "Show all threads";
"message_from_a_thread" = "From a thread";

"media_type_accessibility_image" = "Image";
"media_type_accessibility_audio" = "Audio";
Expand Down
Loading