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

15182 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
3d57cb880c Unread line: follow unread counter color 
Change-Id: Ia3cd51364517276cfc438fe0f7700d11de7ff00a
 2022-03-04 11:57:58 +01:00
SpiritCroc
0a4f07f07f Automatic SchildiChat string correction 
Change-Id: I3b93d37a7ac0874203cb10e16693476c01b5fe5b
 2022-03-04 11:43:01 +01:00
SpiritCroc
d77c42f8c1 Automatic upstream merge postprocessing 
Change-Id: Iaf674a4d25857de93b86e4162b51688ed113553f
 2022-03-04 11:43:00 +01:00
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
Michael Kaye
d4bf38f428
Merge pull request #5391 from vector-im/michaelk/sonaqube_nightly 
Run sonarqube as part of nightly build
 2022-03-04 09:25:18 +00: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
ClaireG
2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402 
[Create private room] Picture doesn't not displayed
 2022-03-03 22:40:26 +01:00
Michael Kaye
2d5b25cfad Remove the printing of file name to the log as it's doubling up information. 2022-03-03 20:39:41 +00:00
Michael Kaye
9fe04ac5b8 Remove exclusions (for now). 
We can merge this PR without and re-add afterwards the only ones we want.
 2022-03-03 20:26:33 +00:00
Michael Kaye
cb32124fd4 Fix typo in name of action 2022-03-03 18:28:13 +00:00
Benoit Marty
1690a0b2cf
giving avatar/display name error dialogs human readable error messages (#5419) 
- reuses the ErrorDialog logic which translates exceptions to human readable strings
 2022-03-03 18:29:39 +01:00
Adam Brown
54e23a2c55 giving avatar/display name error dialogs human readable error messages 
- reuses the ErrorDialog logic which translates exceptions to human readable strings
 2022-03-03 16:37:59 +00:00
Michael Kaye
76844b1572 Run codecoverage and pass to sonarqube upload for processing. 2022-03-03 16:34:54 +00:00
Michael Kaye
49fbfe6811 Better codecov based on ouchadam's suggestion 2022-03-03 16:34:54 +00:00
Michael Kaye
105f3dd93d Correct name of environment variable 2022-03-03 16:34:26 +00: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
Michael Kaye
3364868365 Use environment variable that is tied to project property 2022-03-03 15:05:39 +00:00
Yoan Pintas
6e6b04c57e
Merge pull request #4498 from vector-im/yostyle/fix_strandhogg 
Override task affinity to prevent unknown activities running in our app tasks.
 2022-03-03 15:05:29 +01:00
Benoit Marty
7a1322baf7
Merge pull request #5415 from vector-im/feature/adm/missing-allowed-depenency-groups 
Adding missing dependency allowances
 2022-03-03 14:57:37 +01:00
Adam Brown
16a31e1716 adding new dependency allowances for latest dependency upgrades 2022-03-03 13:47:19 +00:00
Benoit Marty
dd0d2e8101
Merge pull request #5383 from vector-im/dependabot/gradle/com.google.android.gms-oss-licenses-plugin-0.10.5 
Bump oss-licenses-plugin from 0.10.4 to 0.10.5 - REQUIRE HUMAN INTERVENTION
 2022-03-03 11:55:00 +01:00
Michael Kaye
0ce787f20b Ensure we run on java 11 on macos 2022-03-03 10:51:00 +00:00
Michael Kaye
fd065dbbb9 Update build.gradle 
Note password secret name.
 2022-03-03 10:51:00 +00:00
Michael Kaye
5ea917f74b jobs.step.env is a map not a list 2022-03-03 10:51:00 +00:00
Michael Kaye
82e0f4a1a9 Run sonarqube as part of nightly build 2022-03-03 10:51:00 +00:00
Benoit Marty
840742ce71 Lint: "MissingQuantity" -> warning 2022-03-03 10:22:59 +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
Benoit Marty
4396390409 Fix lint error (false positive, but anyway, not used) 2022-03-02 22:14:54 +01:00
Benoit Marty
7024ccb244
Merge pull request #5409 from vector-im/feature/adm/test-compilation-error 
Fixing unit test compilation error
 2022-03-02 21:25:23 +01:00
Adam Brown
10f480b88d adding missing VectorOverrides param from test instance creation and removing unused VectorDatastore 2022-03-02 18:27:12 +00:00
Adam Brown
99e5a8f2fa
FTUE - Choose a display name (#5211) 
* adding base choose name fragment with UI

* add click handling for the display name actions

* updating real account display name

* setting the initial disabled state when the view is created

* adding header padding which would have been a toolbar

* exiting the flow on display name updated or skipped, the next PR will introduce the profile picture screen

* updating view model state testing to take all emissions into account

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* using colorSecondary instead of accent as per quality script rule

* making use of viewevent delegating action for the back handling

* using debounced clicks

* consuming the back action when existing the display name fragment via viewmodel

* making the keyboard imeDone update the display name
 2022-03-02 17:59:40 +00: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
4bbb60cc65 White list group org.webjars 2022-03-02 15:22:59 +01:00
Michael Kaye
74040c5563
Merge pull request #5387 from vector-im/michaelk/nightly_tests_logcat 
Nightly Tests should save logcat logs to artifact
 2022-03-02 10:34:23 +00:00
Adam Brown
0c628905de
Lifting debug overrides to their own abstraction (#5361) 
* separating the debug overrides to their own abstraction
- rather than sharing the user facing vector data store

* inlining the debug flow getters and declarations
- also replaces funs with vals as the references are immutable

* adding changelog entry
 2022-03-02 10:08:43 +00:00
Michael Kaye
7837d1d6d6 Wrap up the argument list; it can be long 2022-03-02 10:05:07 +00:00
Benoit Marty
1c94a7ddc7
Merge pull request #5382 from vector-im/dependabot/github_actions/actions/setup-python-3 
Bump actions/setup-python from 2 to 3
 2022-03-01 18:38:54 +01:00
Benoit Marty
7e909de31c
Merge pull request #5392 from vector-im/eric/update-material-library-version 
Upgrades to Material 1.5.0 (dependency only)
 2022-03-01 18:37:20 +01:00