mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 22:18:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
6368 commits 6 branches 120 tags 229 MiB
Commit graph

3945 commits

Author SHA1 Message Date
SpiritCroc
600674e871 Room topic: tweak collapse behaviour some more 
One could argue that collapsing is only useful if we have more than 2
lines to hide.
Also, @su-ex wants more lines, so let's go for 5+3.

Change-Id: I5f3580171d4b1544fd8f91f1de48cea85023b60a
 2020-11-03 10:46:25 +01:00
SpiritCroc
56b84a5201 Move footer time slighlty down in the bubble 
Change-Id: I0d61691ca56a44a6c8efb01d2c447bac9d50c9cb
 2020-11-03 09:49:53 +01:00
SpiritCroc
07e6cf2a8d Increment version 
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
 2020-11-02 13:20:05 +01:00
SpiritCroc
4d269c586d Room summary: Increase number of topic lines before collapsing 
Change-Id: I1e86a5a14a5598b25ef315e23d6752540eaeac4e
 2020-11-02 12:30:39 +01:00
SpiritCroc
65c365a157 Don't crash language selection just because we are in debug 
Change-Id: I429dfee9ad08bd2578a9e24d0662ad60cdd7c917
 2020-11-02 12:25:10 +01:00
SpiritCroc
44355109d7 Improve direct chat handling 
We show less information in direct chats in dual chat bubble layout, as
we assume that the senders know themselves, and see the chat partner
from  the action bar at the top.

However, there are some limitations:
- A directChat might actually include more members, due to helper bots,
  multiple accounts, or misconfigurations
- Even if a direct chat has exactly two members, there might have been
  some membership changes in the past

To account for this, we do the following:
- Only enable the direct message layout if there are exactly two members
  in the room currently (in addition to the isDirect-flag being set)
- Before hiding sender information, check if the sender is actually the
  expected chat partner. If not, fallback to showing avatar and name for
  this message.

Possible improvement for the future: if we have a message in a direct
chat by a non-member, following messages by the dm chat partner might
benefit from showing member name either way.

Change-Id: Ie4a204510990301175339e60469048b06669d36b
 2020-11-02 12:25:10 +01:00
SpiritCroc
be2983053a For bottom timestamps, we can hide member names also when hiding avatars 
Member names not really important in direct chats or for outgoing
messages.

Change-Id: I1d3328444daf571488b1d9b4d2d188d695c515b3
 2020-11-02 12:25:09 +01:00
SpiritCroc
0b2d98b116 Don't reserve space for the expand text button if we need just one more line 
Test: view Room summary with 1, 2, 3, 4 lines

Change-Id: Ic8a5e197f78ffeb8c1410d6ac3c859fd522decaa
 2020-11-02 12:25:09 +01:00
SpiritCroc
12e97fbed2 Hide redactions by default 
Change-Id: I498ca35464f7f42b70e21ca451b94702aefee8d6
 2020-11-02 12:25:09 +01:00
SpiritCroc
d538ee4dcb Fix ic_send for attachments on fab 
Floating action button has accent color background, so better not have
the icon accent color as well.

Change-Id: Ie5cd49a3e4631425c14183e022a16dde76d40004
 2020-11-02 12:25:09 +01:00
SpiritCroc
056c27a270 Overlay image/video items with footer 
Change-Id: I353ab5223b60677486d590d7c38a8186e3a8c3db
 2020-11-02 12:23:35 +01:00
SpiritCroc
8602f1345b Message bubble footer area 
For use with
- bottom timestamps in message bubbles
- unpersonal read receipts: maybe in the future, as we can not really
  update all relevant messages with the current db update mechanism.
  But we can use it for send-status for now.

Change-Id: I2de909362394e336f9aaba9f0d157e7c6fe8f9b1
 2020-11-02 12:08:38 +01:00
SpiritCroc
5853709c97 Increment version 
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
 2020-10-17 17:05:03 +02:00
SpiritCroc
863f07cbe4 Fix changing inactive theme 
Bug introduced in commit 65716c0ee8.

Fixes:
- Change inactive theme
- Switch to inactive theme -> still the old theme setting

Change-Id: I1b56144ffdb5e0f33efa67702e8aa05065285488
 2020-10-17 16:52:47 +02:00
SpiritCroc
db7a82f567 Hide "invite" menu item 
We can invite users over the "Participants" menu item as well, and
inviting users isn't something we do too often probably.

Change-Id: I0c4c77371f0b81d39b3ae65992ef0362acf83a7c
 2020-10-17 16:47:34 +02:00
SpiritCroc
33d59b3ec6 Hide timeline_settings 
This menu item was added upstream, but we already have the menu item
show_room_info which does the same thing, and I prefer its wording to
upstream.

Change-Id: I065eeec4b3fdf4751978776566350823f2da5131
 2020-10-17 16:43:52 +02:00
SpiritCroc
c5f59b9752 Fix mismerge 
Change-Id: Ieb568d343a568a2b29297fe9824430ab5e8a4a94
 2020-10-17 16:20:01 +02:00
SpiritCroc
6eff36c1a7 Fix duplicate resource build error 
Move drawable-anydpi-v24 xmls to drawable-v24

Change-Id: I48aa8efb013715802cc87da0c43509dbda4ac5c8
 2020-10-17 16:13:16 +02:00
SpiritCroc
bde0020305 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""""""" 
This reverts commit c22f2b7a9b.

Change-Id: I4b7ceb45da0ee77301c6323aa2ca12b76ca46738
 2020-10-17 15:33:36 +02:00
SpiritCroc
835bde286c Automatic SchildiChat string correction 
Change-Id: I44a73d45a7445a11037cbf3d0443147144a7d0ed
 2020-10-17 15:28:34 +02:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
SpiritCroc
25b6357408 Revert "Automatic SchildiChat string correction" 
This reverts commit 797e5a0490.
 2020-10-17 15:09:01 +02:00
SpiritCroc
c22f2b7a9b Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""""" 
This reverts commit f9fc7abbd2.
 2020-10-17 15:09:00 +02:00
Benoit Marty
ca0af0f342 Fix bad cases 2020-10-16 16:38:33 +02:00
Benoit Marty
aa91c41082 Fix lint issue 2020-10-16 16:36:09 +02:00
Weblate
dea994c1fb Merge branch 'origin/develop' into Weblate. 2020-10-16 14:02:54 +00:00
ganfra
9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
Samu Voutilainen
003bffe463 Translated using Weblate (Finnish) 
Currently translated at 80.3% (1541 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2020-10-16 09:04:53 +00:00
Marcelo Filho
021c23cd19 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-10-16 09:04:53 +00:00
random
821b9dc187 Translated using Weblate (Italian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2020-10-16 09:04:50 +00:00
TR_SLimey
ab8c9bd269 Translated using Weblate (Polish) 
Currently translated at 79.7% (1529 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2020-10-16 09:04:47 +00:00
linsui
1692a52e0a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2020-10-16 09:04:46 +00:00
Nikita Epifanov
a086b2001b Translated using Weblate (Russian) 
Currently translated at 99.4% (1907 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2020-10-16 09:04:43 +00:00
Priit Jõerüüt
98086f1b6b Translated using Weblate (Estonian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-10-16 09:04:41 +00:00
ginnyTheCat
c1ea4bc1a7 Translated using Weblate (German) 
Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-16 09:04:38 +00:00
@a2sc:matrix.org
7f48604820 Translated using Weblate (German) 
Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-16 09:04:38 +00:00
LinAGKar
572b0942ba Translated using Weblate (Swedish) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-10-16 09:04:38 +00:00
Jeff Huang
63dff842f6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-10-16 09:04:35 +00:00
Benoit Marty
93683d026b
Merge pull request #2260 from vector-im/feature/bma/fix_issue 
Feature/bma/fix issue
 2020-10-15 18:14:17 +02:00
Benoit Marty
6fcfd259b7
Merge pull request #2211 from ginnyTheCat/rainbow-color 
Changed rainbow algorithm
 2020-10-15 18:13:24 +02:00
Benoit Marty
6c335c7df1
Merge pull request #2257 from ginnyTheCat/share 
Ability to share text
 2020-10-15 18:12:27 +02:00
Benoit Marty
95142274fa Clear alerts if user sign out 2020-10-15 15:55:55 +02:00
Benoit Marty
f68eb449bd Be robust against StrandHogg task injection 2020-10-15 15:55:55 +02:00
Benoit Marty
7158f49fcb
Merge pull request #2244 from ginnyTheCat/direct_share 
Direct share support
 2020-10-14 14:27:08 +02:00
Benoit Marty
95df786227 Add a click action at the top of the drawer to open the general settings 2020-10-14 12:21:27 +02:00
Benoit Marty
2b026b6bc6 Fix vector tint compilation error. Tint at runtime. 
Also remove unused icon.
 2020-10-13 23:15:06 +02:00
Constantin Wartenburger
afe55ae57e
Merge remote-tracking branch 'upstream/develop' into direct_share 2020-10-13 20:26:07 +02:00
Constantin Wartenburger
7bee558e01
Using ApplicationId from BuildConfig 2020-10-13 20:17:56 +02:00
Benoit Marty
35b94d70e2 Fix compilation issue introduced when formatting code :/ 2020-10-13 16:04:44 +02:00
SpiritCroc
ca60a769d2 Increment version 
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
 2020-10-13 15:42:19 +02:00