mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 17:40:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
14877 commits 7 branches 124 tags 230 MiB
Commit graph

14877 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
161780899e [merge] Make unread indicator accent color as before 
Change-Id: I511adcfd2be159f1ba392525af6e60196a774901
 2022-03-04 11:42:49 +01:00
SpiritCroc
2f5df9133f Merge tag 'v1.4.2' into sc 
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/factory/MergedHeaderItemFactory.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/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
 2022-03-04 11:42:30 +01:00
SpiritCroc
ab9bf0cb7d [TMP] Automatic upstream merge preparation 
Change-Id: I643396f8586b594412dbd97284256165fd843f7b
 2022-03-04 10:48:35 +01:00
SpiritCroc
5331ad8911 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I2cf821d62dab6a1c5bcbf7a3c124e57bd49ab60e
 2022-03-04 10:48:35 +01:00
SpiritCroc
dd0037509e Apply corner roundness to image-related drawables 
Background outline and time overlay

Change-Id: If6715bf11489609a9ad2aad831db9ee608c803b6
 2022-03-04 10:21:40 +01:00
SpiritCroc
b56c1a3b0c Fix image corner radius for SC bubbles 
Change-Id: I8cb2515f3f7985cf12ecc2b4a368f663cacfc0d0
 2022-03-04 10:06:16 +01:00
SpiritCroc
fe5eaece47 Setting for more rounded bubbles 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/48

Change-Id: I51dabc18c1542dcd4b8d12769fe1cc76573441c5
 2022-03-03 17:20:06 +01:00
SpiritCroc
20ba02db57 [TMP] Raise sync logging level 
So we get these in rageshakes

Change-Id: I1efb8dd759cd03607ade0611c92a87df1b20c7f3
 2022-03-03 08:55:34 +01:00
SpiritCroc
ad3beec3cf [merge] Make url previews utilize maximum width again 
Change-Id: Ib0e6bbb2d898553f23c4d51a8c3e0242c6197bb8
 2022-03-03 08:52:24 +01:00
SpiritCroc
8afa535fe6 [merge] Fix minimum bubble width for long sender names 
Change-Id: I32aa8b8dfc40ce29e2414f04ae8933a836d9ebc3
 2022-03-03 08:48:38 +01:00
SpiritCroc
a8f10a95da Fix attachments close button look 
Rotating the attachments button to get a close button does not work
for us

Change-Id: I893a06d0671f75626229e71037f0b6bee774a74c
 2022-03-02 16:43:43 +01:00
SpiritCroc
fa53abc91f Proper thread list title name color 
Change-Id: I3e39db09a575190a62bd206dcd71b84db07305f6
 2022-03-02 16:41:42 +01:00
SpiritCroc
b26b3186ac Hide username color override if unused 
Change-Id: I93e40b06c518398ad27458b6425ce0bcae8ebd57
 2022-03-02 16:39:56 +01:00
SpiritCroc
fd72d55dd0 Accent color for location map pin 
Change-Id: I624f156ad7f44ab84328cee43ff3777e6a51f802
 2022-03-02 16:27:21 +01:00
SpiritCroc
bd66326c40 Put emotes back into bubbles 
Change-Id: I2c80095104039081e32785d9fd83477e610fda21
 2022-03-02 16:22:26 +01:00
SpiritCroc
ccb49c6c70 increment_version.sh: Exclude more merge-related commits 
Change-Id: If9093f1cc195afcc68a694bb6716691875badb8d
 2022-03-02 16:14:22 +01:00
SpiritCroc
7ff40cb22d Threading-related theming 
Change-Id: Idec928fa03c60235e2723c22139c6247020ef7b0
 2022-03-02 16:07:50 +01:00
Benoit Marty
f10c67d3fa Merge branch 'release/1.4.2' into main 2022-02-22 21:32:05 +01:00
Benoit Marty
bb0955f809 change for fastlane 2022-02-22 21:29:16 +01:00
Benoit Marty
70bb1004c1 Tidy up the changelog 2022-02-22 21:27:06 +01:00
Benoit Marty
b746321bad Towncrier 2022-02-22 21:21:40 +01:00
Benoit Marty
6fd14c9ebc Typo in the filename 2022-02-22 21:21:24 +01:00
Benoit Marty
ed80fe517d Revert recent change to fix a crash 
`readReceiptsSummaryEntity.realm` is null
 2022-02-22 21:06:41 +01:00
Benoit Marty
bff663d4fa
Merge pull request #5304 from vector-im/feature/bma/weblate_1_4_2 
Weblate 1 4 2
 2022-02-22 18:13:01 +01:00
Benoit Marty
5dced8b6bd
Merge pull request #5258 from vector-im/feature/mna/5218-crash-at-registration 
#5218: Fix crash at registration when redirecting to Web View
 2022-02-22 18:12:35 +01:00
Maxime Naturel
21fa0267f6 Removing TODOs 2022-02-22 17:44:59 +01:00
Benoit Marty
1ce65d7f87 Use plurals for message_reaction_show_more. Fixes #5227 2022-02-22 16:08:08 +01:00
Benoit Marty
17fa463bc8 Delete unused resource 2022-02-22 16:05:40 +01:00
Benoit Marty
a9702c63d2 Fix lint issue 2022-02-22 16:00:40 +01:00
Benoit Marty
fa66f10075 Create template with the app name 2022-02-22 15:47:15 +01:00
Benoit Marty
9cd4b5d3b8 Create template with the app name 2022-02-22 15:45:47 +01:00
Benoit Marty
e35d6a676a Create template with the app name 2022-02-22 15:44:14 +01:00
Benoit Marty
407394b7fa Create template with the app name 2022-02-22 15:42:29 +01:00
Benoit Marty
98b9f1b1ca Rename some string resources 2022-02-22 15:38:43 +01:00
Benoit Marty
672e798e7c Remove unused string 2022-02-22 15:34:14 +01:00
Benoit Marty
2f048d8f88 Remove unused string 2022-02-22 15:32:39 +01:00
Benoit Marty
ad2ee0e9bc Remove unused string 2022-02-22 15:29:52 +01:00
Benoit Marty
c4d9ba24d3 Remove duplicated string - keep the latest version. 2022-02-22 15:27:44 +01:00
Benoit Marty
8e67e5dd18
Merge pull request #5301 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-02-22 15:25:09 +01:00
Benoit Marty
79b511b44d
Merge pull request #5297 from vector-im/feature/fga/fix_bad_realm_usages 
Improve usage of realm
 2022-02-22 15:21:14 +01:00
Benoit Marty
6d45886e1c
Merge pull request #5294 from vector-im/feature/eric/roomlist-green-to-grey 
Changes unread marker in item_room.xml
 2022-02-22 14:27:40 +01:00
ganfra
4cc80162ca Clean and add Changelog 2022-02-22 14:23:45 +01:00
Weblate
593c9447d8 Merge branch 'origin/develop' into Weblate. 2022-02-22 13:22:53 +00:00
yaronsb
79a53c68b0 Translated using Weblate (Hebrew) 
Currently translated at 84.2% (2345 of 2785 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2022-02-22 13:22:45 +00:00
Edward Gera
bfd8f6c3ff Translated using Weblate (Hebrew) 
Currently translated at 84.2% (2345 of 2785 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2022-02-22 13:22:34 +00:00
Suguru Hirahara
8628619578 Translated using Weblate (Japanese) 
Currently translated at 92.9% (2589 of 2785 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2022-02-22 13:22:32 +00:00
Joe Sagawa
f5593860cf Translated using Weblate (Japanese) 
Currently translated at 92.9% (2589 of 2785 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2022-02-22 13:22:32 +00:00
waclaw66
7ba86f032a Translated using Weblate (Czech) 
Currently translated at 100.0% (2785 of 2785 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-02-22 13:22:29 +00:00
Benoit Marty
33e5a9c2ef
Merge pull request #5257 from vector-im/feature/nfe/track_screen_on_enter 
track screen event when user enters the screen
 2022-02-22 14:22:04 +01:00
Benoit Marty
77c48f2c48
Merge pull request #5296 from vector-im/feature/adm/crash-when-reading-qr 
Fixing crash adding room by QR code
 2022-02-22 14:04:37 +01:00