291 Commits

Author SHA1 Message Date
nielsandriesse
49d344f7f7 Merge branch 'dev' into profile-pictures 2020-09-09 13:14:46 +10:00
nielsandriesse
7209686322 Show profile picture in conversation screen 2020-09-07 16:13:34 +10:00
nielsandriesse
4b8609ea5a Revert "Make text bubbles a bit smaller"
This reverts commit db0fd21097c3ed66e9633c6aef745dbb0e0e2b3b.
2020-09-04 18:45:00 +10:00
nielsandriesse
db0fd21097 Make text bubbles a bit smaller 2020-09-04 15:52:21 +10:00
nielsandriesse
31916a95d5 Don't show Session ID in conversation title view 2020-09-04 11:32:43 +10:00
Anton Chekulaev
c2c4c9f41a New avatar placeholder drawable generator. 2020-09-03 22:15:03 +10:00
Anton Chekulaev
de93b6669e Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme
# Conflicts:
#	res/values/strings.xml
2020-09-02 23:47:31 +10:00
nielsandriesse
906deb3ada Add copy Session ID button for one-to-one chats 2020-09-02 16:03:23 +10:00
Anton Chekulaev
2e31900957 Merge branch 'dev' into light-theme
# Conflicts:
#	res/layout/activity_create_closed_group.xml
2020-09-02 13:33:16 +10:00
Anton Chekulaev
4a39fe9588 Conversation activity theme tweaks. 2020-09-02 11:55:01 +10:00
Ryan ZHAO
c0a8e6991d fix open group date handling 2020-09-01 09:48:14 +10:00
Anton Chekulaev
f11478585d Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-27 15:51:54 +10:00
Ryan ZHAO
3b84448d38 fix issues 2020-08-27 14:25:13 +10:00
Anton Chekulaev
b04028f629 Merge remote-tracking branch 'loki/dev' into light-theme 2020-08-25 15:11:51 +10:00
Anton Chekulaev
5e5b88148d Audio view and message bubbles properly themed. 2020-08-24 18:38:48 +10:00
Anton Chekulaev
9cb0a18a85 Consistent dialog styles. 2020-08-24 14:43:24 +10:00
Anton Chekulaev
cd32885db6 Conversation menu resources adjusted for light theme support. 2020-08-24 12:52:50 +10:00
Ryan ZHAO
aed2941da7 show session reset done message 2020-08-24 11:41:39 +10:00
Anton Chekulaev
a5408fa4f4 Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-21 15:07:57 +10:00
Anton Chekulaev
dd37adee5c Layouts' default background replaced with a proper theme level window background.
Bottom sheet style unified.
2020-08-21 15:06:39 +10:00
nielsandriesse
1a013e9a19 Patch bad mac issues 2020-08-21 14:23:23 +10:00
Anton Chekulaev
ec24e3ea4a Merge branch 'dev' of https://github.com/loki-project/session-android into light-theme 2020-08-20 17:49:25 +10:00
Anton Chekulaev
37a3ae9c32 Day theme partially applied. 2020-08-20 16:47:15 +10:00
nielsandriesse
38464bf1f7 Fix crash 2020-08-19 11:53:04 +10:00
nielsandriesse
a5abfc2755 Fix crash 2020-08-19 11:40:34 +10:00
nielsandriesse
75881273d5 Fix crash 2020-08-19 11:36:54 +10:00
nielsandriesse
96736a8095 Raise deployment target and migrate to AndroidX 2020-08-19 10:06:26 +10:00
Niels Andriesse
dadfd17632
Merge pull request #276 from RyanRory/bug-fix
Fix bugs in the Bug Report 1/2
2020-08-18 13:10:24 +10:00
nielsandriesse
43909c3501 Disable member list button 2020-08-18 10:22:21 +10:00
nielsandriesse
f0aa843825 Tweak edit closed group screen layout 2020-08-18 10:05:24 +10:00
nielsandriesse
74dac84796 Implement remaining feedback 2020-08-18 09:34:22 +10:00
nielsandriesse
d2ea5b32bd Merge branch 'dev' into closed-group-editing-2 2020-08-17 15:08:03 +10:00
nielsandriesse
9d9affe4f9 Fix group ID handling 2020-08-17 14:29:24 +10:00
Anton Chekulaev
f7923cd8a4 Merge branch 'dev' into editgroup 2020-08-14 17:47:48 +10:00
Anton Chekulaev
6664c2baa7 Edit closed group activitiy cleanup. 2020-08-14 14:52:15 +10:00
Anton Chekulaev
f88558a719 Merge branch 'dev' into editgroup 2020-08-13 17:26:45 +10:00
nielsandriesse
2f0135a413 Fix group ID handling 2020-08-13 08:49:17 +10:00
nielsandriesse
12a6bc724d Don't send read receipts in groups 2020-08-12 14:06:18 +10:00
nielsandriesse
158c7f13c3 Make the initial message send a bit quicker 2020-08-12 11:21:41 +10:00
nielsandriesse
fcb2bbb768 Debug 2020-08-12 10:00:35 +10:00
nielsandriesse
6c5034f4b3 Make group leaving use the SSK API 2020-08-11 12:20:17 +10:00
Ryan ZHAO
df15743c04 fix text got cut off when sending an image with a text message 2020-08-07 15:13:08 +10:00
nielsandriesse
c2d1953116 Clean ClosedGroupsProtocol ahead of SSK changes 2020-08-07 09:15:36 +10:00
nielsandriesse
6efef1d148 Disable multi device 2020-08-04 15:33:37 +10:00
nielsandriesse
a742ecd574 Fix crashes 2020-07-20 09:20:25 +10:00
nielsandriesse
c388d31873 Implement blocking 2020-07-16 11:20:39 +10:00
nielsandriesse
af5a37c601 Debug 2020-07-16 10:14:25 +10:00
nielsandriesse
06f547dc88 Implement the new protocol 2020-07-15 17:04:23 +10:00
nielsandriesse
455471b20e Remove the concept of friend requests 2020-07-15 14:26:20 +10:00
nielsandriesse
21554441f3 Make things compile 2020-07-15 12:24:43 +10:00