mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-09 17:57:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
8044 commits 7 branches 124 tags 230 MiB
Commit graph

8044 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
92d799ea5a Automated changelog: just link to github for automated builds 
Change-Id: I5aa98f07a6c2053fe263d26f9d2265fb2193afef
 2021-01-16 18:59:42 +01:00
SpiritCroc
9687bacd9a increment_version: Ensure higher version code than previous test builds 
Change-Id: Ia48c13930ca1a26b43a4bb71fd642e0d7d139b60
 2021-01-16 18:51:51 +01:00
SpiritCroc
4a95b69fcd Add some padding when hiding emoji button 
Otherwise, some elements are too close to the edge (especially on edge
displays).

Change-Id: I305fc343e134661964f1d83d10d0d02aa9c22131
 2021-01-16 18:43:34 +01:00
SpiritCroc
9d2c763b16 Fix hidden emoji button re-appearing on reply 
Change-Id: Ibfff4135d8ac24355a0e7fd3f3395c6ba56b0a85
 2021-01-16 16:04:58 +01:00
SpiritCroc
e019222b76 Fix compose layout (missed renamed ids from latest upstream merge) 
Change-Id: I8c2928be45cc6bd3774fa23e7d73d99378f8bc89
 2021-01-16 15:49:01 +01:00
SpiritCroc
e58a13ea91 Uniform bubble width in group chats 
Previously, we had a fixed margin for bubbles to the other side.
However, in group chats, we currently display avatars on one side and
not on the other, which leads to inhomogeneous message bubbles widths.

This patch leaves the width for direct chats unchanged, but adapts the
widths in group chats as following:
- Incoming messages a little bit wider, as these already are "missing"
  the avatar space.
- Outgoin messages a little bit narrower, so we have a more homogeneous
  look in group chats, and also do not start nearly at the same x-offset
  as incoming messages.

Closes https://github.com/SchildiChat/SchildiChat-android/issues/42.

Change-Id: Ic5391f1d512d4425ce4694182049ba0630ec9498
 2021-01-16 15:01:01 +01:00
SpiritCroc
aca8715ec8 Revert "Remove empty task affinity" 
Upstream found a better fix.

This reverts commit 3cb5f6087c.

Change-Id: I65a3c7628a67ed3ab2782894855c5dba38c3856f
 2021-01-16 15:00:53 +01:00
SpiritCroc
6652ed9a1f Small versioning rework 
- Remove the second dot in upstream_version.sc.scVersion
    - Reason: some programs linkify upstream_version.sc
- Always increment scVersion
    - Reason: Easier to identify unique SchildiChat versions
- Increment versionCode independently from versionName
    - Reason: version codes are limitted, don't waste them!
        - ok, it's unlikely that we'll reach the limit either way...
- Unique versionName for test versions (as long as used correctly)!

Change-Id: I7464d27255d55c4b5d51c08fb51e7692d3a24d1f
 2021-01-16 11:54:08 +01:00
SpiritCroc
4564c36fac Automatic SchildiChat string correction 
Change-Id: I09bcc6fec991cc5d7a965eada1a6673bfd6e10bc
 2021-01-16 11:21:51 +01:00
SpiritCroc
c87627bb5e Automatic upstream merge postprocessing 
Change-Id: I0da2864255e9d91599bc42ffccf7c9d345f5edc1
 2021-01-16 11:21:50 +01:00
SpiritCroc
500a62e0a5 Automatic color correction 
Change-Id: I8155fded8bf096693b0cca1f6de5794c0b1247a4
 2021-01-16 11:21:49 +01:00
SpiritCroc
6f39304469 post_merge.sh: Fix missing quote 
Change-Id: I8c007bd99a7be1f7e0d2ea1cad678f093f82eadd
 2021-01-16 11:21:39 +01:00
SpiritCroc
53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
zeritti
d7e4fd555c Added translation using Weblate (Czech) 2021-01-15 16:50:42 +00:00
SpiritCroc
f0e83813e9 [TMP] Automatic upstream merge preparation 
Change-Id: Iaa07f187ded58fa745830596edd27e324ca8339e
 2021-01-15 17:33:22 +01:00
SpiritCroc
26d178305e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I6d2fe7f0634e303fd12e8d37f2aa2b6274dcaca1
 2021-01-15 17:33:21 +01:00
Benoit Marty
68f422e498
Merge pull request #2680 from vector-im/feature/dfa/dagger_update 
Dagger: update to 2.31 and use new AssistedInject
 2021-01-15 15:57:44 +01:00
ganfra
2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
Benoit Marty
72ee1ace48 Version++ 2021-01-15 11:14:59 +01:00
Benoit Marty
7c013de7b9 Merge branch 'release/1.0.14' 2021-01-15 11:13:49 +01:00
Benoit Marty
979ffcf227 Merge branch 'release/1.0.14' into develop 2021-01-15 11:13:47 +01:00
Benoit Marty
f0f0aafa1b Prepare release 1.0.14 2021-01-15 11:13:36 +01:00
Benoit Marty
c2d5ded335
Merge pull request #2673 from vector-im/feature/bma/fix_weblate 
Fix issue coming from Weblate and ensure Hebrew is taken into account in the internal language screen setting
 2021-01-14 17:09:26 +01:00
ganfra
55fd983fd3 Merge branch 'feature/fga/voip_v1_start' into feature/fga/voip_dial_pad 2021-01-14 15:10:07 +01:00
Benoit Marty
1a5291537d Correct support for Hebrew 2021-01-14 14:27:22 +01:00
Benoit Marty
d6ef3ea08e Fix lint issues 2021-01-14 14:08:08 +01:00
ganfra
3e4a41bd73 DialPad: clean code 2021-01-14 12:35:00 +01:00
ganfra
b31bb9eb4f DialPad: fix listeners 2021-01-14 12:23:58 +01:00
Benoit Marty
fac9a65f54
Merge pull request #2670 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-01-14 11:28:13 +01:00
Weblate
93fc64ff33 Merge branch 'origin/develop' into Weblate. 2021-01-14 09:57:30 +00:00
Flat Earth Israel Association
e097c92458 Translated using Weblate (Hebrew) 
Currently translated at 54.2% (1114 of 2055 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-01-14 09:57:18 +00:00
Jeff Huang
e91dbfbf2c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (7 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-01-14 09:57:14 +00:00
Jeff Huang
801f2860e2 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2055 of 2055 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-01-14 09:57:14 +00:00
Benoit Marty
1ffc3a4f53
Merge pull request #2621 from vector-im/feature/bca/crypto_store_outbound 
Persist outbound group session
 2021-01-14 10:44:08 +01:00
Benoit Marty
844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound 2021-01-14 10:43:38 +01:00
Benoit Marty
69efb45fb7
Merge pull request #2659 from vector-im/feature/bma/fix_init_sync 
Fix issue with delay set to 0
 2021-01-14 10:41:10 +01:00
Benoit Marty
1103d7c112
Merge pull request #2637 from vector-im/feature/bma/investigation 
Fix switch theme issue
 2021-01-14 10:39:13 +01:00
Benoit Marty
c88072e55f
Merge branch 'develop' into feature/bma/investigation 2021-01-14 10:38:56 +01:00
Benoit Marty
e041d404f3
Merge pull request #2664 from vector-im/feature/ons/emoji_keyboard_settings 
Option to hide emoji keyboard.
 2021-01-14 10:17:33 +01:00
Benoit Marty
5b07af2c12
Merge pull request #2666 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-01-13 23:54:12 +01:00
ganfra
1f96367286 DialPad: show dialerchoice dialog when supported 2021-01-13 21:07:50 +01:00
Weblate
de73539d2b Merge branch 'origin/develop' into Weblate. 2021-01-13 15:00:03 +00:00
argaman
f7ed94c6e9 Translated using Weblate (Hebrew) 
Currently translated at 52.1% (1052 of 2018 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-01-13 14:59:56 +00:00
Valere
36b1a1471a Fix Dendrite sync response support 2021-01-13 14:23:45 +01:00
Onuray Sahin
1f1eeccc32 Option to hide emoji keyboard is added. 2021-01-13 13:28:46 +03:00
Benoit Marty
1d449c84fe
Merge pull request #2661 from vector-im/feature/bma/fix_join 
Fix request too large Uri error when joining a room
 2021-01-13 09:29:04 +01:00
argaman
0750c7763c Translated using Weblate (Hebrew) 
Currently translated at 52.1% (1052 of 2018 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-01-12 21:37:23 +00:00
אבי טייב
dbaaa07dad Translated using Weblate (Hebrew) 
Currently translated at 52.1% (1052 of 2018 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2021-01-12 21:37:23 +00:00
ganfra
14502573bf DialPad: integrate getThirdPartyUser with protocol and add helper for create DM 2021-01-12 20:10:52 +01:00
Benoit Marty
7446b12827 Fix request too large Uri error when joining a room 2021-01-12 18:16:35 +01:00