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

120 commits

Author SHA1 Message Date
SpiritCroc
a9d5700d2b Merge tag 'v1.3.16' into sc 
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
	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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/RoomDetailViewState.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/detail/composer/MessageComposerViewState.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.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/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.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/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-29 12:18:19 +01:00
Adam Brown
42e6c54e8f fixing line length 2022-01-12 13:51:53 +00:00
Adam Brown
1ae112daae adding feature flag and entry point for the _wip_ usecase screen 2022-01-12 12:06:09 +00:00
Adam Brown
7cea0352f9 adding debug feature flag for the splash carousel 2022-01-12 12:05:37 +00:00
Adam Brown
0d2ad2d85d adding back debug option to enable carousel (was rebased away) 2022-01-07 13:47:20 +00:00
Adam Brown
773d335add adding debug feature flag for the splash carousel 2022-01-06 19:54:47 +00:00
Adam Brown
41f931e466 renaming parameters and properties to avoid clashing with kotlin/java8 keywords 2022-01-06 14:17:23 +00:00
Adam Brown
c6396ac03a updating debug feature label to explain that it's related to the ftue auth 2022-01-06 10:03:13 +00:00
Adam Brown
e3c0b34651 adding support for the boolean features and adding a new flag for the already have an account 2022-01-06 10:03:13 +00:00
Adam Brown
98078da13d renaming the ftue domain to onboarding and ftue to ftue auth 2022-01-05 10:32:31 +00:00
Benoit Marty
bb0725b2e2
Merge pull request #4656 from vector-im/feature/adm/dynamic-login-flow 
Feature based FTUE flows
 2021-12-30 10:29:52 +01:00
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
Adam Brown
fd0e1e44c4 renaming login version to variants to better describe the different flows 2021-12-14 08:50:57 +00:00
Benoit Marty
ea9a524048 Fix compilation issue after merge develop 2021-12-13 23:23:18 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Benoit Marty
5ea7f3cbca
Merge pull request #4652 from vector-im/feature/bma/avoid_useless_codegen 
Use viewBindingIgnore="true" when we do not need the ViewBinding.
 2021-12-13 12:51:05 +01:00
Benoit Marty
3620a265d0
Merge pull request #4650 from vector-im/feature/bma/id_ref 
Cleanup id ref. Use type views instead.
 2021-12-13 11:32:18 +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
Adam Brown
cb79d20327 updating binding method to reflect the type 2021-12-07 16:54:24 +00:00
Adam Brown
05ce1414b9 updating the debug features to use the datastore api 
- we're using the blocking api due to only needing to suspend in the debug variant, we may look to change this in the future
 2021-12-07 16:52:02 +00:00
Benoit Marty
bb959b6b1e Use viewBindingIgnore="true" when we do not need the ViewBinding. 2021-12-07 17:32:52 +01:00
Benoit Marty
d3a1746475 Use id from existing views instead of "hard-coded" values 
And improve our extension
 2021-12-07 16:56:27 +01:00
Adam Brown
90d00b96b7 avoiding unneeded cast by providing more types 2021-12-07 15:51:35 +00:00
Adam Brown
6c21ed8eab switching to vector base activity and injecting epoxy controller for project consistency 2021-12-07 15:28:50 +00:00
Adam Brown
440de9741b extracting the debug feature state creation to its own factory 2021-12-07 15:19:28 +00:00
Adam Brown
2d74eb060c adding debug screen to override features 
- adds enum support with persistence via class names
 2021-12-07 15:19:28 +00:00
Benoit Marty
673cbb29de Merge branch 'develop' into feature/bma/posthog 2021-12-07 14:26:31 +01:00
Benoit Marty
9d4835ab25 Avoid mistake by getting the id using an existing view 2021-12-07 14:23:07 +01:00
Benoit Marty
c1438f0a65 Analytics: iterate on the config - and disable by default on forks 2021-12-07 12:01:01 +01:00
Benoit Marty
74e573ecdc Analytics: small fixes 2021-12-06 18:19:05 +01:00
Benoit Marty
3689a62aae Analytics: add actions in debug screen to manually test the optin screen 2021-12-06 12:57:11 +01:00
Benoit Marty
6cb8a2458f Remove extra new lines in XML 2021-12-01 23:06:49 +01:00
Benoit Marty
aee34ad552 Cleanup the ViewModels 2021-11-22 16:45:18 +01:00
Benoit Marty
e10af6476f invalidate does not work on Activity :/ 2021-11-22 16:24:14 +01:00
Benoit Marty
aa0f031910 invalidate does not work on Activity :/ 2021-11-22 16:18:57 +01:00
Benoit Marty
86d76e76a4 Fix DI 2021-11-22 15:41:54 +01:00
Benoit Marty
2586b376f5 Add a debug screen to display private settings, and use it to force display of Dialpad Tab 2021-11-22 15:05:18 +01:00
Adam Brown
272baa52ec adding remaining activity missing hilt injection annotations 2021-10-26 17:56:22 +01:00
ganfra
e6e8c7f7d1 Hilt: clean code and add changelog 2021-10-22 12:41:06 +02:00
ganfra
ac1e4e9e9c Hilt: remove usage of ScreenComponent 2021-10-21 10:10:59 +02:00
ganfra
92cd79c550 Hilt: migrate activities 2021-10-19 18:53:17 +02:00
Benoit Marty
a1caccbcc8 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "chain-wrapping" 2021-10-01 13:31:15 +02:00
Benoit Marty
2ca3c68611 Big annoying commit: execute command ./gradlew ktlintFormat - Fix "import-ordering" 2021-10-01 13:31:15 +02:00
Benoit Marty
34723ce4f7 Cleanup 2021-07-13 10:27:29 +02:00
Benoit Marty
067349f602 Fix some misunderstanding about the permissions request - step 2 2021-07-13 00:22:23 +02:00
Benoit Marty
80657251a5 Fix some misunderstanding about the permissions request - step 1 2021-07-12 23:47:33 +02:00
Benoit Marty
fabbd6da9e Add action to see permission status in the DebugActivity 2021-07-12 22:12:51 +02:00
Benoit Marty
cca9a8007c Use new permission request management 
I do not know why all has not been migrated in the previous rework
 2021-07-12 21:18:01 +02:00
Benoit Marty
d0a7265975 Reorder buttons 2021-06-23 13:01:48 +02:00
Benoit Marty
1a898f0404 Rename themes follow Android conventions 2021-06-16 12:34:14 +02:00