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

6463 commits

Author SHA1 Message Date
SpiritCroc
e5c9c33a0f Merge tag 'v1.1.12' into sc 
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236

Conflicts:
	library/ui-styles/src/main/res/values/text_appearances.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
 2021-07-05 16:58:45 +02:00
SpiritCroc
a4ba5998e1 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I145b127da93a119944cdd13879644787c875a52e
 2021-07-05 10:32:08 +02:00
Benoit Marty
76f4c81d2d Hide password... Oups 2021-07-05 09:50:20 +02:00
SpiritCroc
24a61ee0ff Display-name coloring setting 
Based on whether a chat is
- DM
- Room
- Public room

allow to select whether to color usernames
- Uniformly (as previously done in SC themes)
- Based on Matrix ID (as previously seen in Element themes)
- Based on the user's power level in that room (new!)

The setting concerning rooms that are neither DM nor public is also used
for deciding whether to use mxid-based avatar coloring or uniform
coloring.

Change-Id: Ic68a24f4818a193f776a3b14232f887cd229929a
 2021-07-04 17:01:27 +02:00
SpiritCroc
1ba30d4bdb Increment version 
Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24
 2021-07-04 11:52:31 +02:00
SpiritCroc
ba6fd96623 Fix some corner case where a wrong display name would show 
Scenario: Scroll to a message in dual side bubble layout that:
- Is an image, i.e. has a time footer overlay
- Was sent by the user
- Was sent in a group chat, i.e. other messages show sender display
  names

This scenario could lead to the non-bubble name view not being cleared
nor hidden correctly.

Change-Id: I033d3070612d219dea9f2181c5029e17460c3ee6
 2021-07-03 15:34:34 +02:00
SpiritCroc
fe1fc098c8 Disable "long click on room" "help" 
Change-Id: I851092f89131b531e5e0e94e405bb2769f84dbb0
 2021-07-02 18:35:15 +02:00
SpiritCroc
1c32fcad35 Profile screen theme tweaks 
Change-Id: I0dfeea8284ae597b03c6e9fd8c1f2f1e4f45332f
 2021-07-02 18:33:42 +02:00
Benoit Marty
2c7b947d27 Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 15:32:01 +02:00
SpiritCroc
4b472f041b Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: If195307eec194931f2ec1980dbf23d0b45d18a32
 2021-07-02 15:23:09 +02:00
SpiritCroc
b808d8b464 Avoid chat position jumps during message loading 
Sometimes, the chat list would jump without the user scrolling:
- During intial loading of a room content, i.e. when it is expected
  that the list stays scrolled to bottom
- During loading of messages after jumping to a linked message

With this commit, the target event is repeatedly scrolled to upon list
changes until the users scroll themselves, to avoid above scenarios.

Change-Id: Iabbe76832e7e68686431b0baed9356c88eb50901
 2021-07-02 15:19:20 +02:00
Benoit Marty
f06d2b1734 Fix typo 2021-07-02 14:55:30 +02:00
Benoit Marty
1eea734a4c Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 12:53:00 +02:00
Weblate
64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Benoit Marty
b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility 
Fix some issues with timeline cache invalidation and visibility.
 2021-07-02 09:40:37 +02:00
Benoit Marty
d4009476f9 Cleanup 2021-07-02 09:39:32 +02:00
lvre
1906fbdeaa Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-02 01:04:01 +00:00
Benoit Marty
69c399a229
Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application 
Apply Google Services Gradle plugin more robustly
 2021-07-01 10:16:00 +02:00
ganfra
de64df3cdb Fix crash after video call 2021-06-30 14:50:30 +02:00
J. Lavoie
24fe43e267 Translated using Weblate (French) 
Currently translated at 27.7% (15 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-06-30 13:07:58 +02:00
Govindas
265806b190 Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/lt/
 2021-06-30 13:07:58 +02:00
SpiritCroc
b9749f0260 Translated using Weblate (German) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2021-06-30 13:07:58 +02:00
waclaw66
b78a1768e8 Translated using Weblate (Czech) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-06-30 13:07:58 +02:00
J. Lavoie
b18bf89934 Added translation using Weblate (French) 2021-06-30 13:07:58 +02:00
lvre
1a0f29ff94 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-06-30 10:34:47 +00:00
libexus
c350c94827 Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-30 10:34:47 +00:00
SpiritCroc
4e9ab0c6f9 Fix message highlight color behind bubbles for SC themes 
Change-Id: Ia115cba593c90682bbf4023d9161b1df6001f3c9
 2021-06-29 16:46:23 +02:00
SpiritCroc
559016cd32 SC theme improvements after merge, pt. 3 
Change-Id: I506d0bc3a320508268646ba86d93fb39e2ad8168
 2021-06-29 15:06:45 +02:00
SpiritCroc
dab04d52fd More SC theme improvements, including a reworked light theme 
Change-Id: I373daedc45bee3aa9e24e09bb632b01e27754010
 2021-06-28 18:28:41 +02:00
Benoit Marty
edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign 
Jump to unread: implement new design
 2021-06-28 16:45:06 +02:00
Benoit Marty
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite 
Feature/fga/auto accept invite
 2021-06-28 16:40:10 +02:00
ganfra
48fa9e1a5e Clean after benoits review 2021-06-28 11:00:29 +02:00
random
2764ecb256 Translated using Weblate (Italian) 
Currently translated at 99.8% (2486 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-06-27 19:34:46 +00:00
libexus
230b3f31d7 Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-27 19:34:46 +00:00
SpiritCroc
15625e7424 Clarify element theme names 
Change-Id: Ibe3e4bd6536978b1ff816f7c74738768c52adf95
 2021-06-27 14:44:16 +02:00
SpiritCroc
29d243d8b2 Use composer view without outline again 
Change-Id: Icc567fad3df142cab8c927d95d65ff031683b49f
 2021-06-27 14:40:37 +02:00
SpiritCroc
71b663db49 Update tab hiding logic 
Change-Id: Ic6d80651e80c2ea57f72516cf9909e3691ac0367
 2021-06-27 12:35:23 +02:00
SpiritCroc
098d98926a Fixup SchildiChat theming 
Change-Id: I0c6f04ceb4c09be41d5879b6c6a4cee1d082c525
 2021-06-27 12:01:35 +02:00
Benoit Marty
cd0c9b4e08
Merge pull request #3549 from vector-im/feature/bma/cleanup_styles 
Fix styles issue
 2021-06-25 19:11:54 +02:00
BramvdnHeuvel
7c04391037 Translated using Weblate (Dutch) 
Currently translated at 52.1% (1298 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-06-25 09:34:49 +00:00
Thibault Martin
bafd01c0f4 Translated using Weblate (French) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-06-25 09:34:45 +00:00
dependabot[bot]
9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.25 to 8.12.26.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.25...v8.12.26)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-24 23:05:19 +00:00
ganfra
cccf5de015 Jump to unread: removes unnecessary check which can cause scroll issue 2021-06-24 18:50:44 +02:00
ganfra
ab37984beb Jump to unread: avoid blink when jumping 2021-06-24 18:33:30 +02:00
ganfra
1ba97fa9be Clean after Benoits review 2021-06-24 17:40:45 +02:00
Benoit Marty
ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67 
Bump kluent-android from 1.65 to 1.67
 2021-06-24 14:49:53 +02:00
Benoit Marty
f5ecaa0339
Merge pull request #3520 from vector-im/feature/fga/timeline_virtual_room 
Feature/fga/timeline virtual room
 2021-06-24 14:43:00 +02:00
Benoit Marty
5eb0097fb2 Delete unused drawable to avoid conflict on develop 2021-06-24 14:40:38 +02:00
Benoit Marty
14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25 
Bump libphonenumber from 8.12.24 to 8.12.25
 2021-06-24 14:34:45 +02:00
Benoit Marty
ed90f376e6
Merge pull request #3518 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.5 
Bump fragment-ktx from 1.3.4 to 1.3.5
 2021-06-24 14:31:04 +02:00