Commit e23c47c
committed
feat: adapt shortcuts to Compose conversation operations sheet
Upstream migrated the conversation bottom dialog to a Compose
ModalBottomSheet. Adapt our shortcut features to the new architecture:
- Add AddToHomeScreen action to ConversationOpsAction sealed class
- Add "Add to home screen" menu item in ConversationOperationsSheet
- Wire handler in ConversationsListActivity.handleConversationOpsAction
- Fix back-stack: pass KEY_INTERNAL_USER_ID to ConversationsListActivity
via intent so it reads the correct user from DB instead of stale cache
Signed-off-by: angrymuesli <github.visibly626@slmails.com>1 parent 41baf6f commit e23c47c
5 files changed
Lines changed: 38 additions & 5 deletions
File tree
- app/src/main/java/com/nextcloud/talk
- activities
- conversationlist
- ui
- utils
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
298 | 298 | | |
299 | 299 | | |
300 | 300 | | |
301 | | - | |
302 | | - | |
303 | 301 | | |
304 | 302 | | |
305 | 303 | | |
| |||
339 | 337 | | |
340 | 338 | | |
341 | 339 | | |
| 340 | + | |
342 | 341 | | |
343 | 342 | | |
344 | 343 | | |
| |||
Lines changed: 25 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
181 | | - | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
182 | 187 | | |
183 | 188 | | |
184 | 189 | | |
| |||
939 | 944 | | |
940 | 945 | | |
941 | 946 | | |
| 947 | + | |
942 | 948 | | |
943 | 949 | | |
944 | 950 | | |
| |||
955 | 961 | | |
956 | 962 | | |
957 | 963 | | |
| 964 | + | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
| 972 | + | |
| 973 | + | |
958 | 974 | | |
959 | 975 | | |
960 | 976 | | |
| |||
1041 | 1057 | | |
1042 | 1058 | | |
1043 | 1059 | | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
1044 | 1068 | | |
1045 | 1069 | | |
1046 | 1070 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
| |||
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
| 74 | + | |
73 | 75 | | |
74 | 76 | | |
75 | 77 | | |
| |||
165 | 167 | | |
166 | 168 | | |
167 | 169 | | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
168 | 176 | | |
169 | 177 | | |
170 | 178 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
131 | | - | |
| 131 | + | |
| 132 | + | |
132 | 133 | | |
133 | 134 | | |
134 | 135 | | |
| |||
137 | 138 | | |
138 | 139 | | |
139 | 140 | | |
140 | | - | |
| 141 | + | |
141 | 142 | | |
142 | 143 | | |
143 | 144 | | |
| |||
0 commit comments