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

108 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
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
Benoit Marty
ece9d19d8c Rename again the style to follow Android convention (G's review) 2021-06-16 11:59:08 +02:00
Benoit Marty
858bbfd8d2 Rename style to follow naming conventions 
And move some files to the module
 2021-06-15 21:37:27 +02:00
Benoit Marty
0590acd31a Fix crash on default theme 2021-06-15 20:23:37 +02:00
Benoit Marty
bbbe76b91c Move test style Activity and layout to the new ui-style module 2021-06-15 18:17:36 +02:00
Benoit Marty
f0b28742ac textSize *sp -> style 2021-06-15 10:30:54 +02:00
Benoit Marty
f90ee45d8c Use style to take into account lineHeight 2021-06-14 23:06:56 +02:00
Benoit Marty
dbdf9b05fa textSize 16sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle" 2021-06-14 21:29:12 +02:00
Benoit Marty
070dae78e7 textSize 12sp -> Caption or Default 2021-06-14 21:22:56 +02:00
Benoit Marty
1793885ec6 TextAppearances: import from figma and apply to login screens 2021-06-14 20:20:19 +02:00
Benoit Marty
8103c76030 Create dedicated menu to avoid crash due to missing theme attr 2021-06-11 10:12:31 +02:00
Benoit Marty
3473d669d3 Use MaterialToolbar and AppBarLayout in all screens 2021-06-11 10:12:31 +02:00
Benoit Marty
3dc0b07edf Rename file 2021-06-11 10:12:31 +02:00