filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,159 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

24159 Commits

Author SHA1 Message Date
SpiritCroc 799279eb5d Do not ellipsize message previews due to trailing newline 
Change-Id: I8e6a43f6599e209f40e676a8bdb1754fb6a6e93e
 2023-04-19 17:09:45 +02:00
SpiritCroc 423f841a2a Increment version 
Change-Id: I2a76553af45c7056f04cc1cfa0909ab86c4f147a
 2023-04-15 17:02:00 +02:00
SpiritCroc f16a7edf51 Sticker room summary preview: prefer sticker body like on desktop 
Change-Id: If3dda509b1acddccf44b3e3267f098de3ee35611
 2023-04-15 10:42:04 +02:00
SpiritCroc 9e0ec534d5 [merge] More appropriate pill size for downstream text size 
https://developer.android.com/reference/com/google/android/material/chip/ChipDrawable

Change-Id: Ib21bb1426547c8a49f55e2ecd836f83d9dfe1654
 2023-04-11 17:27:21 +02:00
SpiritCroc 89750f74a4 Ensure unique IDs across all emoji autocompletion types 
Change-Id: I522eaf4fb8af214ff9b6a0ac744093cbe6b8b6e4
 2023-04-07 12:40:46 +02:00
SpiritCroc cb593ebb14 Move standard emojis to top of autocompletion 
Now that we can limit emojis per category while allowing to expand them,
makes sense to show standard emojis on top, above custom emotes,
especially when users have lots of emotes.

Change-Id: I822cc091bf595795fa08fef32f0737073a43163a
 2023-04-07 12:38:10 +02:00
SpiritCroc 07a0d315f5 Merge remote-tracking branch 'origin/sc_beta' into sc 
Change-Id: I61bf897abe30e5763047852bdc4128f6df3a1660
 2023-04-07 11:09:14 +02:00
Linerly ec54ab3d43 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
 2023-04-06 17:01:29 +00:00
waclaw66 456a54e192 Translated using Weblate (Czech) 
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
 2023-04-06 17:01:28 +00:00
SpiritCroc 5ea7f03e25 Fix FooteredTextView measurements for overlong pill spans 
Together with https://github.com/vector-im/element-android/pull/8260,
fixes https://github.com/SchildiChat/SchildiChat-android/issues/28

Change-Id: I3c11d1ec89383330fedb4a958d70e89047915024
 2023-04-05 15:03:28 +02:00
SpiritCroc ea2a0e2193 Automatic SchildiChat string correction 
Change-Id: Id3c60521d8640b6253bf8b4e788147b381357bcc
 2023-04-05 11:37:42 +02:00
SpiritCroc 6db0a52db4 Automatic upstream merge postprocessing 
Change-Id: I6864bdf70ee6c5039e10c742fdbb9947f5a79ebb
 2023-04-05 11:37:41 +02:00
SpiritCroc 965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
 2023-04-05 11:28:26 +02:00
SpiritCroc 4c771bde7f [TMP] Automatic upstream merge preparation 
Change-Id: Iaeede6c1ba4afc5f3481582fe52fd20bfb67421d
 2023-04-05 11:17:40 +02:00
SpiritCroc 877d65a8c8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ifbb9c4cdf4e4d86ee2b72b7c4ca4e5216aa0840c
 2023-04-05 11:17:40 +02:00
SpiritCroc 2756877d5b Revert "[TMP] Get widgets / stickers working again" 
This reverts commit c47b9ee64d.
 2023-04-05 11:15:39 +02:00
SpiritCroc 1e3b77824e Fix crash caused by empty span when removing leading newlines 
Change-Id: I9045bf1314b15d3672d1837bca29fa4af4c0fdbd
 2023-04-05 10:25:10 +02:00
SpiritCroc 16afd70294 tmp_icon.sh: Script to quickly try out new launcher icons 
People suggest new icons in png formats, and I'm tired of searching this
scripts, so let's push it to main

Change-Id: Ie3cb2f7f82383c60188ae8499ad64b61264435d8
 2023-04-05 10:19:32 +02:00
Jorge Martín 0b09a51bb2 Merge branch 'release/1.5.30' 2023-04-05 10:17:33 +02:00
Jorge Martín 76cea42d4b Adding fastlane file for version 1.5.30 2023-04-05 09:40:08 +02:00
Jorge Martín b61a184297 Changelog for version 1.5.30 2023-04-05 09:38:41 +02:00
dependabot[bot] be80b46327
Bump flipper from 0.187.0 to 0.188.0 (#8303) 2023-04-04 15:38:11 +00:00
Yoan Pintas da5a3eaad8
Jump to unread marker instead of first unread message (#8305) 2023-04-04 12:50:49 +00:00
Benoit Marty 29777f50fa
Merge pull request #8256 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-04-04 14:19:48 +02:00
Vri 776e63476c Translated using Weblate (German) 
Currently translated at 100.0% (2610 of 2610 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2023-04-04 11:50:05 +02:00
Szimszon c966a94b93 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (95 of 95 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2023-04-04 11:50:05 +02:00
Jeff Huang 4ca560f80f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2610 of 2610 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-04-04 11:50:05 +02:00
Peter Chen 38832715ff Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2610 of 2610 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-04-04 11:50:05 +02:00
Jorge Martin Espinosa 55033ea5b0
Merge pull request #8297 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.17.0 
Bump io.sentry:sentry-android from 6.16.0 to 6.17.0
 2023-04-03 12:26:05 +02:00
Jorge Martín 2830459b6a Fix crash when re-enabling analytics. 2023-04-03 11:30:14 +02:00
SpiritCroc 76d1c81495 [TEST] Restructure RR deduplication logic and avoid threads 
We probably should add an extra check to only set main_or_null to events
which actually exist in the main thread

Change-Id: I8db0010e8717b6941917225fcce6646685814665
 2023-04-02 13:02:50 +02:00
SpiritCroc 5ef2341bec [TEST] Fix another case of wrong read receipt location, to be observed 
Context: https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/995

So comparing timestamps for main vs null read receipts does not seem to
work at all... so better only use that as fallback in case we really
don't know which event came later...?

Change-Id: I8f7df95735d1478784ec5f8bf3b0b1a70c534a29
 2023-04-02 12:38:25 +02:00
SpiritCroc f4e9559eca In threads, reply fallback shouldn't cause stickers to render as bubble 
Change-Id: I9539c77520e2d1563c3e782d649c2868e08ad81a
 2023-04-01 16:23:45 +02:00
SpiritCroc 5f787db4f1 Send-as-sticker button for sticker-enabled custom emotes 
Add some primitive support for sending MSC2545 stickers, at least for
stickers that also support sending as custom emote.
Also, this introduces support to sending stickers as reply this way 🎉

Change-Id: I85b245c2c40b9662342459e50285c081d37f324b
 2023-04-01 16:15:22 +02:00
SpiritCroc dab8f0b51c increment_version.sh: weblate now auto-pushes, no need to manage here 
Change-Id: I1d671cc682e02c9e8bc29634471ac18c2e41c112
 2023-04-01 11:23:33 +02:00
SpiritCroc c3077c1ff9 Increment version 
Change-Id: I62c495d2a018f29ad88afc6058972608273b357d
 2023-04-01 11:20:55 +02:00
SpiritCroc 1d0686d82d Properly ellipsize autocompletion headers 
For example for long emote/sticker pack names

Change-Id: I7f1bd44ad6b70dfdd25825b1156d40bcee2e3df8
 2023-04-01 11:11:57 +02:00
dependabot[bot] 95b30bb8e9
Bump io.sentry:sentry-android from 6.16.0 to 6.17.0 
Bumps [io.sentry:sentry-android](https://github.com/getsentry/sentry-java) from 6.16.0 to 6.17.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.16.0...6.17.0)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-31 23:58:28 +00:00
ganfra c94ee5c6fe
Merge pull request #8295 from vector-im/feature/fga/acceptable_use_policy 
Replace Terms and Conditions with Acceptable Use Policy.
 2023-03-31 15:22:03 +02:00
ganfra ac65defe56 Replace Terms and Conditions with Acceptable Use Policy. 2023-03-30 20:41:05 +02:00
Yoan Pintas 93cd197c78
Fix custom sticker url loading (#8290) 2023-03-30 09:34:42 +00:00
Yoan Pintas ed121c051b
Add user completion for matrix ids (#8271) 2023-03-30 08:04:59 +00:00
Jorge Martin Espinosa 1227f048bb
Merge pull request #8288 from vector-im/dependabot/gradle/com.google.firebase-firebase-bom-31.4.0 
Bump com.google.firebase:firebase-bom from 31.3.0 to 31.4.0
 2023-03-29 12:40:21 +02:00
dependabot[bot] 35cf6cb9e0
Bump com.google.firebase:firebase-bom from 31.3.0 to 31.4.0 
Bumps com.google.firebase:firebase-bom from 31.3.0 to 31.4.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-28 23:57:22 +00:00
Yoan Pintas ca6dd3a0a1
Bump vanniktechEmoji from 0.16.0-SNAPSHOT to 0.16.0 Release (#8281) 2023-03-28 18:20:17 +00:00
Benoit Marty 716bd9a2e6
Merge pull request #8272 from vector-im/dependabot/gradle/mavericks-3.0.2 
Bump mavericks from 3.0.1 to 3.0.2
 2023-03-27 15:22:58 +02:00
SpiritCroc 9b384c0971 Update to vanniktechEmoji 0.16.0 to fix compile 
Revert "Use vanniktechEmoji "0.16.0-SNAPSHOT""

This reverts commit a1f4ffbf17.

Change-Id: I66c1490349f26de0f8f7159f4d18027c487b2220
 2023-03-27 12:18:03 +02:00
SpiritCroc cf7a93b5bb Tweak bug report screen for internal builds 
I always get confused by the missing switch, so just disable it instead
of hiding.

Change-Id: I894be7dd9d5e50e793960f16ee8b04df20effc41
 2023-03-27 11:54:30 +02:00
dependabot[bot] e76225f7d1
Bump com.google.firebase:firebase-bom from 31.2.3 to 31.3.0 (#8277) 
Bumps com.google.firebase:firebase-bom from 31.2.3 to 31.3.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-27 08:16:11 +00:00
SpiritCroc 236c44a5a5 Easier access to more custom emotes 
- Expand button
- More emotes by default

Change-Id: Id18f0b36099465d83156fcee2d3b016f299402f4
 2023-03-25 13:53:58 +01:00