Commit Graph

334 Commits

Author SHA1 Message Date
jubb
4498b6e00f Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
2021-06-28 11:39:11 +10:00
Niels Andriesse
ab92f3684d
Merge pull request #618 from RyanRory/ui
Fix Theme Issues
2021-06-28 11:30:32 +10:00
jubb
d8a2e3450c feat: progress bar is linear similar to iOS 2021-06-28 11:29:27 +10:00
Niels Andriesse
489516b03b Hook up all voice message recording controls 2021-06-28 11:26:13 +10:00
Niels Andriesse
ca3034cb05 Re-implement GIF & document sending 2021-06-28 10:44:00 +10:00
Ryan ZHAO
e459ea0288 fix overflow menu background color 2021-06-25 15:57:43 +10:00
jubb
bb00754237 refactor: change line to have small spacing margin 2021-06-25 14:47:02 +10:00
Niels Andriesse
40317d9834 Fix corner rounding issue 2021-06-25 14:06:53 +10:00
jubb
21835800ff feat: wiring up click listeners in AlbumThumbnailView.kt 2021-06-25 12:18:52 +10:00
jubb
620d063194 feat: adding text and shade, reverting other components to use old ThumbnailView 2021-06-25 09:57:58 +10:00
jubb
b5f41b4383 Merge remote-tracking branch 'upstream/ui' into ui
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
2021-06-24 16:26:45 +10:00
jubb
110391c2cd refactor: move new thumbnailview to utilities package 2021-06-24 16:25:43 +10:00
Niels Andriesse
fe8b0c9798 Create link preview draft view 2021-06-24 16:23:37 +10:00
jubb
277c741851 feat: AlbumThumbnailView.kt view visible and binding to thumbnail slides 2021-06-24 16:15:13 +10:00
Niels Andriesse
11c2983f66 Fix typing indicator color 2021-06-24 15:27:00 +10:00
Niels Andriesse
32c2762d06 Make link preview view use thumbnail 2021-06-24 15:03:29 +10:00
Niels Andriesse
c0429569db Add blocked banner 2021-06-24 14:21:05 +10:00
Niels Andriesse
06b9c30c27 Add trust dialog 2021-06-24 14:05:55 +10:00
Niels Andriesse
d763fa00d3 Add link preview dialog 2021-06-24 13:59:53 +10:00
Niels Andriesse
250fb50cc8 Add open URL dialog 2021-06-24 13:54:34 +10:00
Niels Andriesse
058319c9c7 Add join open group dialog 2021-06-24 13:47:24 +10:00
Niels Andriesse
7373918d3d Add blocked dialog 2021-06-24 13:38:59 +10:00
Niels Andriesse
1dc7f7e9c0 Make dialogs look better 2021-06-24 13:14:18 +10:00
Niels Andriesse
e4292a3db5 Add action bar subtitle 2021-06-24 11:38:06 +10:00
Niels Andriesse
38710814e2 Show typing indicators 2021-06-24 11:22:32 +10:00
Niels Andriesse
f66309afd8 Add unread count to conversation view 2021-06-24 10:18:52 +10:00
Niels Andriesse
201b8c8e68 Add unread count to scroll to bottom button 2021-06-24 10:04:43 +10:00
Niels Andriesse
311a298c0c Debug 2021-06-24 09:34:16 +10:00
Niels Andriesse
6533fdb64b Add scroll to bottom button 2021-06-23 15:14:19 +10:00
Niels Andriesse
d2d13ec696 Re-add open group guidelines 2021-06-23 13:11:21 +10:00
Niels Andriesse
0291171fb8 Fix quote view sizing 2021-06-23 11:32:05 +10:00
jubb
1ba12c40cc feat: also adjust clear all button to be delete / clear network depending on step 2021-06-23 10:29:17 +10:00
Niels Andriesse
da0ed31f9b Merge branch 'dev' of github.com:oxen-io/session-android into ui 2021-06-23 09:25:56 +10:00
jubb
1df6fa46a4 feat: clear all data dialog with local and network only options 2021-06-22 17:01:27 +10:00
Niels Andriesse
edb0763060 Fix group message layout & handle profile pictures 2021-06-22 16:42:53 +10:00
Niels Andriesse
1c92b17ecc Handle open group invitation weirdness & fix quote view sizing 2021-06-22 15:55:32 +10:00
Niels Andriesse
b2a66e9293 Add message status indicator 2021-06-22 15:41:14 +10:00
Niels Andriesse
b8f6321262 Basic open group invitation view 2021-06-22 10:39:34 +10:00
Niels Andriesse
252f344d93 Fix link preview corner rounding 2021-06-22 09:34:23 +10:00
Niels Andriesse
74330c931a WIP 2021-06-21 16:13:21 +10:00
Niels Andriesse
0eaecf168d Basic link preview view 2021-06-21 15:26:09 +10:00
Niels Andriesse
48df733773 Basic quote view attachment handling 2021-06-21 14:24:00 +10:00
Niels Andriesse
f79bb5e0d4 Add document view 2021-06-21 13:58:01 +10:00
Niels Andriesse
6ddde26496 Minor tweaks 2021-06-21 13:43:49 +10:00
Niels Andriesse
6d9eb0a932 Full voice message UI 2021-06-21 13:36:45 +10:00
Niels Andriesse
ac718a425d Basic voice message 2021-06-21 11:09:30 +10:00
Niels Andriesse
ce5f923b25 Adapt quote view for use in messages 2021-06-21 10:53:52 +10:00
Niels Andriesse
aadbe2fdd0 Fix swipe to reply bug 2021-06-21 09:40:23 +10:00
Niels Andriesse
9471db76c2 Fix height change handling 2021-06-18 16:04:22 +10:00
jubb
fdc042e6d4 feat: testnet clearing network data on delete and differentiating dialogs 2021-06-18 16:01:34 +10:00
Niels Andriesse
123cd6d486 Handle text only quote drafts 2021-06-18 15:54:24 +10:00
Niels Andriesse
9419bafe93 Add preliminary quote draft view 2021-06-18 15:11:41 +10:00
Niels Andriesse
efc752e3a1 Add mention candidates view 2021-06-18 11:00:52 +10:00
Niels Andriesse
7c3b1b22d7 Move attachment options as input bar expands 2021-06-18 10:16:15 +10:00
Niels Andriesse
f4621a4fee More animation 2021-06-17 16:29:57 +10:00
Niels Andriesse
b5376cd60e Handle voice message recording view hiding 2021-06-17 16:07:11 +10:00
Niels Andriesse
b7000aa58b Tweak UI 2021-06-17 15:20:19 +10:00
Niels Andriesse
5a2baae15d Clean 2021-06-17 14:57:47 +10:00
Niels Andriesse
092dad03b7 Add expanding attachment buttons 2021-06-17 14:34:50 +10:00
Niels Andriesse
4855f694e7 More UI 2021-06-17 14:01:43 +10:00
Niels Andriesse
7b68d63534 Animate voice message lock view 2021-06-17 13:18:09 +10:00
Niels Andriesse
8f2ccf9e70 Add voice message lock view 2021-06-17 11:24:54 +10:00
Niels Andriesse
7cacee8499 More animation 2021-06-17 10:53:56 +10:00
Harris
b0dab208d2 feat: extracting more strings, replacing link device strings using existing activities in case they change in future 2021-06-16 16:14:06 +10:00
Harris
5ce28f976b feat: extracting QR related strings and other github mentioned strings 2021-06-16 16:05:08 +10:00
Niels Andriesse
c831c8a31b More animation 2021-06-16 15:54:00 +10:00
Niels Andriesse
bdc5a0e5d9 Add animation 2021-06-16 15:49:39 +10:00
Niels Andriesse
5ae201b81b Add basic voice message recording UI 2021-06-16 14:50:41 +10:00
Niels Andriesse
eac0a87e40 Add send button 2021-06-16 10:39:24 +10:00
Niels Andriesse
871bafe66d Debug 2021-06-16 09:51:50 +10:00
Niels Andriesse
196fc25902 Make input edit text grow dynamically 2021-06-15 16:14:35 +10:00
Niels Andriesse
e06a3271df Add basic input edit text 2021-06-15 14:55:57 +10:00
Niels Andriesse
bb5f8e007d Clean 2021-06-15 14:15:22 +10:00
Niels Andriesse
5755f4150a Implement InputBarButton 2021-06-15 14:05:32 +10:00
Niels Andriesse
acc472bbad Add ripple 2021-06-15 13:01:05 +10:00
Niels Andriesse
61e44dcb59 WIP 2021-06-15 11:34:50 +10:00
Niels Andriesse
f8ea8cbd03 Implement placeholder input bar layout 2021-06-15 09:42:18 +10:00
Niels Andriesse
7c659c9a68 Make room for input bar 2021-06-15 09:24:20 +10:00
Niels Andriesse
c69d66e6a4 Fix scrolling 2021-06-10 11:37:24 +10:00
Niels Andriesse
e61c3288fa Swipe to reply icon 2021-06-09 15:12:48 +10:00
Niels Andriesse
834ac1106b Implement better swipe to reply gesture 2021-06-09 10:57:40 +10:00
nielsandriesse
3820b07ad8 Show message timestamp on select 2021-06-08 14:06:16 +10:00
nielsandriesse
9568a907fe Clean 2021-06-07 16:43:54 +10:00
nielsandriesse
7e6cd7c86f Add date breaks 2021-06-07 16:06:37 +10:00
nielsandriesse
e1345a8774 Implement conversation item context menu interaction 2021-06-07 14:04:55 +10:00
nielsandriesse
4ecfd1f230 Re-implement conversation item context menu 2021-06-07 11:37:20 +10:00
nielsandriesse
d465fecf4c Populate conversation menu 2021-06-07 09:48:01 +10:00
nielsandriesse
3a4ab06df4 Implement basic action mode menu 2021-06-04 15:10:58 +10:00
nielsandriesse
36ba931402 Refactor conversation screen action bar setup 2021-06-04 14:55:53 +10:00
nielsandriesse
37a0263670 Implement swipe to reply gesture 2021-06-04 13:15:43 +10:00
nielsandriesse
f4ca2f2726 Merge branch 'dev' into ui 2021-06-04 08:40:55 +10:00
nielsandriesse
051dc698d7 Fix German translation 2021-06-04 08:37:30 +10:00
nielsandriesse
7b930ad08f Update translations 2021-06-04 08:35:38 +10:00
nielsandriesse
9a0e5e7b6c Make room for triple dot menu 2021-06-02 13:28:02 +10:00
nielsandriesse
dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse
43fbc3de55 Clean up create private chat screen 2021-06-02 11:34:30 +10:00
nielsandriesse
9888f23789 Fix ugly color 2021-06-02 11:00:40 +10:00
nielsandriesse
d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
nielsandriesse
23100962e3 Clean 2021-06-02 10:12:49 +10:00
nielsandriesse
19550f7be9 Merge branch 'dev' into ui 2021-06-02 10:00:36 +10:00
nielsandriesse
86ccc3767e Update translations 2021-06-02 09:53:02 +10:00
nielsandriesse
8b084c89b9 Implement conversation activity toolbar 2021-06-01 16:17:14 +10:00
nielsandriesse
dc4a7d0761 Apply correct message bubble margins 2021-06-01 15:43:37 +10:00
nielsandriesse
958cd54b75 Stub views for different message types 2021-06-01 14:56:58 +10:00
nielsandriesse
3b18b0985b Add date break header 2021-06-01 14:38:52 +10:00
nielsandriesse
e177fc4689 Fix outgoing message layout 2021-06-01 14:28:14 +10:00
nielsandriesse
7f3b714401 Add VisibleMessageContentView 2021-06-01 13:26:57 +10:00
nielsandriesse
a23cfbc11d Implement parts of the visible message view 2021-06-01 13:01:03 +10:00
nielsandriesse
7710a2c32f Distinguish between control messages and visible messages 2021-06-01 09:48:02 +10:00
nielsandriesse
502d485235 Hook up message body 2021-05-31 14:29:11 +10:00
nielsandriesse
b346a85d57 Add basic conversation screen components 2021-05-31 14:06:02 +10:00
Niels Andriesse
b9e2b665e8
Merge pull request #586 from iArchitSharma/patch-2
Full Hindi Translation
2021-05-31 08:24:46 +10:00
Archit Sharma
f2a8d50a4d
All Hindi Translation done 2021-05-28 19:56:20 +07:00
nielsandriesse
1262f80a1f Clean up ProfilePictureView 2021-05-28 16:09:15 +10:00
ryanzhao
e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
Ryan ZHAO
93dfbcaae2 clean 2021-05-27 16:51:59 +10:00
Ryan ZHAO
e6cdd3ee0e add logic and UI in create private chat view 2021-05-27 15:31:48 +10:00
Niels Andriesse
02bbd3b8bf Clean up onboarding 2021-05-25 11:48:59 +10:00
Niels Andriesse
5353e124df Update translations 2021-05-24 14:46:28 +10:00
Niels Andriesse
2a0a5a2326 Fix case 2021-05-24 14:33:10 +10:00
jubb
4f84b976c5 fix: return error early if the public key is not expected length or format with an appropriate message 2021-05-24 14:01:20 +10:00
Niels Andriesse
f64fb68e96
Merge branch 'dev' into fix_hardcoded_strings 2021-05-24 12:52:10 +10:00
Niels Andriesse
04b62df83c Make user details bottom sheet look better 2021-05-24 11:08:08 +10:00
jubb
7c7ace9ecd refactor: extract hardcoded strings
allows fix for #529
2021-05-21 16:49:06 +10:00
Niels Andriesse
c0f894e1b2 Clean 2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4 Merge branch 'dev' into nicknames 2021-05-21 15:21:24 +10:00
Niels Andriesse
b9a7531f58 Clean 2021-05-20 15:44:30 +10:00
Niels Andriesse
24aaa4c9ea Merge branch 'dev' 2021-05-20 15:41:16 +10:00
Niels Andriesse
0d63bc0d44 Delete unsupported language 2021-05-20 15:22:04 +10:00
Ryan ZHAO
f09b203da0 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 14:06:51 +10:00
Niels Andriesse
15daf27efd Remove file server instability modal 2021-05-20 12:06:22 +10:00
Ryan ZHAO
38ed5c2187 Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname 2021-05-20 11:15:24 +10:00
nielsandriesse
c861b330ba Add file server instability modal 2021-05-20 11:00:00 +10:00
nielsandriesse
747a27ddda Add file server instability modal 2021-05-19 15:25:36 +10:00
nielsandriesse
e79d23c910 Add "Help us Translate Session" button 2021-05-19 13:47:04 +10:00
nielsandriesse
588f9ed8cd Remove entirely untranslated languages 2021-05-19 13:27:08 +10:00
jubb
3acbbc1229 refactor: add latest translations (and repeats) 2021-05-18 16:43:45 +10:00
jubb
ac198bd705 refactor: add in missing resource and removing broken folders preventing build 2021-05-18 14:05:45 +10:00
jubb
573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources
# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-ja/strings.xml
2021-05-18 10:09:26 +10:00
jubb
0f435ca040 refactor: remove more unnecessary strings from libsession's values 2021-05-17 17:29:39 +10:00
Niels Andriesse
2172152219
Merge pull request #538 from beantaco/japanese
More Japanese Translations
2021-05-17 15:23:45 +10:00
Niels Andriesse
6b3aa86324 Minor refactoring 2021-05-17 15:19:36 +10:00
jubb
eee3824ca0 refactor: running the remove unused resources command and cleaning up strings 2021-05-17 11:56:14 +10:00
Niels Andriesse
11e223f5d8 Merge branch 'dev' into open-group-invitations 2021-05-17 11:42:27 +10:00
beantaco
4b225c1456
Add new Japanese translations 2021-05-14 10:26:47 +00:00
beantaco
d61b1c05f0
Fix some Japanese translations
- In message details, "Disappears" (meant as message lifetime) is translated to "寿命" (lifetime).
- Translation of "decentralized" is changed from "分散型" (distributed) to "非中央集中型".
- "Session ID を入力してください" (translation of "Enter Session ID" tab) is too long and was not expressed in command form. -> "Session ID を入力する"
- "パス" (the translation of "path") could be a translation of "pass" and its meaning is ambiguous, so is changed to "経路" (route).
- "お知らせ" (also a translation of "news" and "announcement") is changed to "通知" (notification), making translation of "notification" more consistent.
2021-05-14 10:26:41 +00:00
Niels Andriesse
3e75ed3cc4 Merge branch 'dev' into v2-file-server 2021-05-14 16:19:57 +10:00
Niels Andriesse
faa8c9443f Hardcode community guidelines 2021-05-14 15:17:16 +10:00
Niels Andriesse
6e5f75d472 Fix build 2021-05-14 13:53:41 +10:00
Niels Andriesse
9699126ac9 Update copy 2021-05-14 13:52:24 +10:00