mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 22:18:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
13252 commits 6 branches 120 tags 229 MiB
Commit graph

120 commits

Author SHA1 Message Date
SpiritCroc
acdd4e24b9 Merge tag 'v1.3.12' into sc 
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10

Conflicts:
	build.gradle
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.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/home/room/list/actions/RoomListQuickActionsEpoxyController.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/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/drawable/highlighted_message_background.xml
	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_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_expandable_textview.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/layout/item_radio.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_stub_room_profile_header.xml
	vector/src/main/res/layout/view_url_preview.xml
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_root.xml
 2021-12-23 14:36:13 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Benoit Marty
e519e314fe Limit width of content on tablets 2021-12-13 23:16:47 +01:00
SpiritCroc
004a51646b Fix some more reaction colors on dark theme 
Follow-up to 6048e12669: Fix reaction color for non-emojis on dark theme

Hardcoding it to black is bad for dark themes. It was probably done
because the default color would make emojis look pale due to
transparency. If we use a primary text color which hopefully does not
feature transparency (it does not for SC themes, at least), everything
looks fine.

Change-Id: Icbc3b37f5535b98684c2225c0973a152e88d6b31
 2021-12-13 09:15:37 +01:00
SpiritCroc
51756a9795 Message bubble as xml, and outlined bubble for notices 
Change-Id: Ieb16e917456e2b8dd4fea9de8b88684be0c8bff4
 2021-12-11 16:58:23 +01:00
Adam Brown
0150d830d4 flattening preview url view layout with custom view to reduce view hierarchy 2021-12-07 11:32:50 +00:00
SpiritCroc
4b63a9f939 Merge tag 'v1.3.9' into sc 
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/composer/MessageComposerViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
 2021-12-05 13:46:55 +01:00
Benoit Marty
6cb8a2458f Remove extra new lines in XML 2021-12-01 23:06:49 +01:00
Benoit Marty
6d3df0d802 Use @id and not @+id when referencing ids in layouts - ConstraintLayout 2021-12-01 22:13:21 +01:00
Benoit Marty
e15c84129c Use same values than for light theme, for a better rendering 
See https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998
 2021-11-22 10:20:01 +01:00
SpiritCroc
c03c6867f7 Merge branch 'merge-v1.3.8' into sc 
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38

Conflicts:
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
 2021-11-17 20:26:27 +01:00
SpiritCroc
d9a5991559 Merge tag 'v1.3.8' into HEAD 
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309

Conflicts:
	dependencies.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-11-17 20:17:45 +01:00
Benoit Marty
03b96a8a42 Update padding (#4285) 2021-11-16 16:33:28 +01:00
Benoit Marty
27d6e271ad Add a debug layout to see social login buttons 
For AS preview only
 2021-11-16 16:33:04 +01:00
Benoit Marty
6f13fb1634 Create file for Toast style (more generic) 
And improve fragment_create_poll.xml preview rendering
 2021-11-15 14:23:32 +01:00
Benoit Marty
223b33fa65 Create CallToAction button style 2021-11-15 14:16:22 +01:00
Benoit Marty
2aab94acb4 Create dedicated file for TextInputLayout styles 
And follow naming convention
 2021-11-15 14:11:15 +01:00
SpiritCroc
6bca1bf18b Change presence color to green for some accents 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/97

Change-Id: I31095c9677a5c00162d8cb2416a12c31ad77f372
 2021-11-12 12:16:47 +01:00
Onuray Sahin
a10253c003 Design review fixes. 2021-11-08 17:26:01 +03:00
SpiritCroc
c8d9e69c40 Fix presence theming 
Change-Id: Ief37c2a6c3d1ed7270ec0a69da122b56614a2adf
 2021-10-22 09:18:59 +02:00
SpiritCroc
978056e01f Merge tag 'v1.3.4' into sc 
Conflicts:
	dependencies.gradle
	gradle.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/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
 2021-10-21 17:31:11 +02:00
ariskotsomitopoulos
9ab59a543d * Implement Presence Service: 
- Get Presence Status
     - Set Presence Status
* Integrate presence in room details screen
* Integrate presence in room people's view
* Update UI to support presence
* Fix bug when insertOrUpdate was called on RoomMemberEventHandler and override the correct presence value in RoomMemberSummaryEntity
* Improve performance on updateUserPresence in RoomMemberSummaryEntity entity
* Remarks & linter fixes
* Disable presence when there is no m.presence events. In some servers like matrix.org is disabled atm.
* Enhance UI Presence on DM room lists to support dark/light theme
* Restore missing lines in gradle.properties to speed up debugging
 2021-10-06 18:00:02 +03:00
SpiritCroc
0c7981dc26 Revert "Revert "Revert "Use Java 11 source code""" 
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.

Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72

Conflicts:
	attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android-rx/build.gradle
	matrix-sdk-android/build.gradle
	vector/build.gradle
 2021-09-29 09:56:32 +02:00
SpiritCroc
4f93eb041c Merge tag 'v1.3.0' into sc 
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml
 2021-09-29 09:55:02 +02:00
SpiritCroc
b51bd743c7 Revert "Revert "Use Java 11 source code"" 
This will make the latest upstream merge easier.

This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
 2021-09-29 09:13:59 +02:00
SpiritCroc
756529e565 Revert "Use Java 11 source code" 
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.

Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.

This reverts commit 80f23f1f3c.

Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b
 2021-09-18 20:26:29 +02:00
Benoit Marty
744523b200
Merge pull request #4017 from vector-im/feature/aris/optimize_global_gradle_variables 
Optimize dependencies handling
 2021-09-17 15:28:49 +02:00
ariskotsomitopoulos
1dcf6b9539 Enhance dependencies handling to support Dependabot 2021-09-17 14:58:44 +03:00
Valere
932a43ef58 Add subspace action 2021-09-17 09:22:10 +02:00
SpiritCroc
d87c03c505 Theme mxid-based username colors 
TODO for follow-up commit: same for mxid-based room colors (maybe with
an extra setting?)

Change-Id: I827bd967e615f20e12f205c0ae5b24a777e90d45
 2021-09-16 09:04:13 +02:00
ariskotsomitopoulos
c89b2c0536 Optimize dependencies handling 2021-09-15 13:21:25 +03:00
SpiritCroc
1b8874e8cb Expose and theme some upstream colors concerning video conferences 
Change-Id: I8ed960c119c2b87a9e8af0bce60bbf60034f5a61
 2021-09-10 12:26:56 +02:00
SpiritCroc
133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
Benoit Marty
5a5d4fda2d DSL value has shorter alias now 2021-09-09 09:55:24 +02:00
Benoit Marty
529a7aedcb Cleanup useless values 2021-09-09 09:55:24 +02:00
Benoit Marty
b985092613 Fix lint issues 2021-09-02 10:36:29 +02:00
Benoit Marty
80f23f1f3c Use Java 11 source code 
https://developer.android.com/studio/releases/gradle-plugin#java-11
 2021-09-02 09:50:34 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
ganfra
4518962658 New voip design: clean after benoit review 2021-08-26 11:08:34 +02:00
David Langley
1d767d6e3f Fix keyword style, preference persistence and add comment to keyword ruleid 2021-08-25 17:38:12 +01:00
David Langley
238f772461 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings 2021-08-24 15:51:23 +01:00
SpiritCroc
1f64afd6bc Fix crash for SC dark theme when trying to remove rooms from spaces 
Change-Id: I835bc1e1f3ba96ebb8e5d39af2cbb722b821b609
 2021-08-22 11:20:31 +02:00
SpiritCroc
b8b4ddf0d1 Fix light/dark confusion 
Change-Id: I3f7a5df9cc202094d5b307dee0b1f99427c7a09e
 2021-08-22 11:20:08 +02:00
SpiritCroc
387459ae6b Fix material alert dialog brightening up the desired background color 
Change-Id: I0b805d1605d80765631fdf093ed645b5be35c57b
 2021-08-18 12:07:44 +02:00
ganfra
bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
SpiritCroc
1590740981 Properly theme verification request popup background 
Change-Id: Ia613b9cb6efe41a54cb9ec049828aac27f0968c7
 2021-08-10 10:09:40 +02:00
David Langley
8d7e3b6544 add keyword checkbox preference and chip/edit text for modificying keywords 2021-08-03 09:52:36 +01:00
SpiritCroc
6399e71e25 [merge-features] Fix and properly style voice message recording for SC 
Change-Id: Iba97f334b07e0fa1f4a4cc8fc92c97e53d919dd4
 2021-08-01 11:42:17 +02:00
SpiritCroc
3959a838d1 [merge-features] Fix voice messsage bubble layout + SC themes 
Change-Id: Idd2dddc8c8f6333ca90fa5411c69e084e3a4cdcf
 2021-08-01 10:31:17 +02:00
SpiritCroc
25ba52115b Merge tag 'v1.1.15' into sc 
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4

Conflicts:
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-08-01 09:37:33 +02:00