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
6004 commits 6 branches 120 tags 229 MiB
Commit graph

6004 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
e81a7211b2 Refactor view visibilities 
Reduce redundant code when having alternative views for the same
information available for different styles.

While we are at it: fix the setting view timestamps for all messages in
dual-bubble mode (even though it looks bad with the current design).

Change-Id: Id9598c6536c3cb5d93073e9d09485c009a53cd00
 2020-10-13 15:36:21 +02:00
SpiritCroc
e29ca1256f Better align scaled image to message bubbles 
Fixes images not aligned to the same side as message bubbles in
following scenarios:
- The image measures are not known before loading it
- The information header (sender name + date) is wider than the image

Change-Id: Id178905e39cfd1b3353946e920e9523c32867851
 2020-10-12 18:14:06 +02:00
SpiritCroc
94d422c074 Adapt image round corners to look similar to bubble round corners 
Change-Id: I70903cfe0958716877258c9ca37083208493f24c
 2020-10-12 15:39:09 +02:00
SpiritCroc
869384f59a Fix isDirect information getting lost 
Fixes direct chats looking like group chats after recreation due to
theme change.

Change-Id: Ic3dedf51d63e8e897d83e199c94bca8af520b43c
 2020-10-08 16:13:14 +02:00
SpiritCroc
1231e6b0aa Don't invalidate theme if it hasn't changed 
Change-Id: I0811218679409ac7e111aa7609736fc19de5236b
 2020-10-08 16:13:09 +02:00
SpiritCroc
5e721d55f9 Add labs setting for following system dark mode < Android 10 
Fixes https://github.com/SpiritCroc/SchildiChat-android/issues/19.

Change-Id: I4fec536d3b491ef31c4ed51325a8300a5134e96c
 2020-10-08 16:13:05 +02:00
SpiritCroc
96aa885819 Increment version 
Change-Id: I68a3f7a7806795a2f5ae7a1b582bb6d9e572872b
 2020-09-30 12:23:15 +02:00
SpiritCroc
46924ea842 Fix new_session background color 
Change-Id: I0b6843fda9a7427bd0f892d3319cb5c85db4f662
 2020-09-30 12:23:03 +02:00
SpiritCroc
ad70208d7c Revert "increment_version.sh: Tag pre-release" 
F-Droid update scanner seems to pick it up either way...

This reverts commit cc2d95f0dd.
 2020-09-30 10:52:45 +02:00
SpiritCroc
68ed05ae7f Don't crash on empty message 
If the message is empty, m.last() causes a NoSuchElementException.
Fixes https://github.com/SpiritCroc/SchildiChat-android/issues/17

Change-Id: I31ad5a8e4f8baf5d095cf34f430c5337737442b4
 2020-09-30 10:48:14 +02:00
SpiritCroc
1cc4c7177f Increment version 
Change-Id: I1f2ddbb0e8ff82db6f3f321dc073f29426e8d5ac
 2020-09-27 14:11:52 +02:00
SpiritCroc
f9fc7abbd2 Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""""" 
This reverts commit ddeb73b20c.
 2020-09-27 13:57:56 +02:00
SpiritCroc
797e5a0490 Automatic SchildiChat string correction 
Change-Id: I034c30676887f41331fa1c7bf9c1d42f83684e9d
 2020-09-27 13:57:56 +02:00
SpiritCroc
7731d5eaaf Automatic upstream merge postprocessing 
Change-Id: I2bc98a8df74965a1b0662de1fd6c68109f4559cc
 2020-09-27 13:57:54 +02:00
SpiritCroc
97be4a5812 merge_helpers: add upstream_log 
Change-Id: I368d2728ac6ba2538fd2fbcf61c5546e938dc641
 2020-09-27 13:57:46 +02:00
SpiritCroc
43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
 2020-09-27 13:55:40 +02:00
SpiritCroc
17ff2d76a9 [TMP] Automatic upstream merge preparation 
Change-Id: Ib66bf65ae9bfed527bec21f438456ef57b5d45d1
 2020-09-27 10:41:07 +02:00
SpiritCroc
a7198d6e1a Revert "Automatic SchildiChat string correction" 
This reverts commit d0c7393ae1.
 2020-09-27 10:41:06 +02:00
SpiritCroc
ddeb73b20c Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""" 
This reverts commit e6cf19fe94.
 2020-09-27 10:41:06 +02:00
SpiritCroc
17801fdf54 Multiple stickers in a row don't require showInformation each time 
Change-Id: I0364d46ba00f29291a4527e7ad3a98d1275ea829
 2020-09-25 15:22:45 +02:00
SpiritCroc
037a333c37 Use pseudo-bubbles for for ImageVideo items 
Pseudo-bubbles: align like bubbles, but don't draw the actual bubbles.
Closes #8.

Change-Id: I8ff281858f67ed8a3ee5e4530e3ce02aa786b955
 2020-09-25 15:22:38 +02:00
Benoit Marty
34760a00be Merge branch 'release/1.0.8' 2020-09-25 14:08:25 +02:00
Benoit Marty
22cfb64348 Prepare release 1.0.8 2020-09-25 14:08:15 +02:00
Benoit Marty
056405939b
Merge pull request #2170 from vector-im/feature/bma_fix_wellknown_redirect 
Fix crash when wellknown are malformed
 2020-09-25 13:56:41 +02:00
SpiritCroc
0d7c0bc29c Increase sticker size 
As proposed in https://github.com/SpiritCroc/SchildiChat-android/issues/8

Change-Id: I225515eaf7b269d82572dd1b0f745d6da6b8c3be
 2020-09-25 13:37:17 +02:00
SpiritCroc
01b5a88d59 Hide sender avatar in DMs 
As proposed in https://github.com/SpiritCroc/SchildiChat-android/issues/7

Change-Id: I4a76283191fa1c6a021f7fb643bfddff7551abf8
 2020-09-25 13:36:54 +02:00
Benoit Marty
2dcaabe4c4 Fix crash when wellknown are malformed, or redirect to some HTML content (reported by rageshakes) 2020-09-25 11:25:27 +02:00
Benoit Marty
bbd86661a4
Merge pull request #2159 from vector-im/feature/bma_pin_settings 
Feature/bma pin settings
 2020-09-24 17:16:05 +02:00
Benoit Marty
d684c11c65 Iterate on wording 2020-09-24 15:14:08 +02:00
Benoit Marty
a2fb6d5664 Split long line 2020-09-24 12:47:58 +02:00
Benoit Marty
31029e90cc Fix test compilation issue (no detected since Olm was not available) 2020-09-24 12:46:14 +02:00
Benoit Marty
2e95c78f4e Iterate on wording 2020-09-24 12:40:37 +02:00
Benoit Marty
f271968238 Upgrade library PFLockScreen-Android 2020-09-24 08:20:17 +02:00
Benoit Marty
27d3a36c1b Use same animation for all Fragment transaction 2020-09-23 22:12:02 +02:00
Benoit Marty
dfa0308db6 Pin code: user has to enter pin code twice (#2005) 2020-09-23 21:58:21 +02:00
Benoit Marty
299bcc2bc7 Kill the task if PinActivity is cancelled 2020-09-23 21:58:21 +02:00
Benoit Marty
03c66315cb Ganfra's review 2020-09-23 21:58:21 +02:00
Benoit Marty
9f154748ae Avoid using 1, prefer %d (for translation) 2020-09-23 21:58:21 +02:00
Benoit Marty
5eb66c4617 Small fix and avoid using 1, prefer %d (for translation) 2020-09-23 21:58:21 +02:00
Benoit Marty
44b2673848 PIN: Add a setting to hide notification content when PIN code is configured 2020-09-23 21:58:21 +02:00
Benoit Marty
a6cf2b0685 First test if resultCode == Activity.RESULT_OK 2020-09-23 21:57:58 +02:00
Benoit Marty
b8c350488b Avoid code duplication and let the Activity manage the Fragments 2020-09-23 21:57:58 +02:00
Benoit Marty
fb74628aa8 Protect access to pin code setting, and so remove protection to disable the pin code 2020-09-23 21:57:58 +02:00
Benoit Marty
fdedfc954c PIN Code Improvements. Add more settings (#1985) 
- enable/disable biometrics
- enbale/disable grace period
 2020-09-23 21:57:58 +02:00
Benoit Marty
b8cbafa75d PIN: move setting to a dedicated screen (no other change) 2020-09-23 21:57:36 +02:00
Benoit Marty
9ab053d702
Merge pull request #2145 from vector-im/feature/login_ui 
Login ui
 2020-09-23 17:00:28 +02:00
Benoit Marty
6e2c733319 Fix lint issue (MissingConstraints). Use a simple FrameLayout 2020-09-23 16:59:42 +02:00
Benoit Marty
ad2191a76e Fix scrolling issue. 
Sign in and log in tested ok
 2020-09-23 16:59:42 +02:00
Benoit Marty
ecc189aeac Restore logo on login screens 
This reverts commit 4cc3e87d64.
 2020-09-23 16:59:23 +02:00
Benoit Marty
34d2c3d391
Merge pull request #2152 from vector-im/feature/various_fixes 
Redcude requested permission to access file on the phone
 2020-09-23 16:57:20 +02:00