mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 04:18:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
7509 commits 7 branches 124 tags 230 MiB
Commit graph

7509 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
4ddc8e706d Fix issue with coordinator Layout 2020-12-16 13:23:42 +01:00
Benoit Marty
da2a0abf45 Provide CoordinatorLayout when available 2020-12-16 12:39:22 +01:00
Benoit Marty
53a0e0ce10 Remove useless @Inject 2020-12-16 12:22:28 +01:00
Benoit Marty
7f02c0596e Fix strange crash 2020-12-16 12:21:25 +01:00
Benoit Marty
e081c3b249 Add TODO 2020-12-16 12:09:23 +01:00
Benoit Marty
8db4da5473 Fix crash 2020-12-16 11:45:06 +01:00
Benoit Marty
d389581d96 Better binding 2020-12-16 11:18:25 +01:00
Benoit Marty
018574a21e Rename some view ids 2020-12-16 11:10:49 +01:00
Benoit Marty
9e3eb993ee Fix some crashes 2020-12-16 10:36:33 +01:00
Benoit Marty
6c64fb2169 Fix some crashes 2020-12-16 10:16:33 +01:00
Benoit Marty
2e70808bbd Fix some crashes 2020-12-16 04:16:34 +01:00
Benoit Marty
18bf9856fe Migrate to ViewBindings (#1072) - WIP 2020-12-16 03:57:19 +01:00
Benoit Marty
f09ee5016a Migrate to ViewBindings (#1072) - WIP 2020-12-16 03:41:02 +01:00
Benoit Marty
4d3c4b5afc Migrate to ViewBindings (#1072) - WIP 2020-12-16 03:38:07 +01:00
Benoit Marty
7de2494af2 Migrate to ViewBindings (#1072) - WIP 2020-12-16 03:25:17 +01:00
Benoit Marty
409d7e50bb Migrate to ViewBindings (#1072) - WIP 2020-12-16 02:59:03 +01:00
Benoit Marty
c1222737d6 Migrate to ViewBindings (#1072) - WIP 2020-12-16 02:49:22 +01:00
Benoit Marty
d02da1b97e Migrate to ViewBindings (#1072) - WIP 2020-12-16 02:39:58 +01:00
Benoit Marty
a8c6b1cdf7 Migrate to ViewBindings (#1072) - WIP 2020-12-16 02:33:52 +01:00
Benoit Marty
dba65dcd22 Migrate to ViewBindings (#1072) - WIP 2020-12-16 02:05:38 +01:00
Benoit Marty
706736273c Migrate to ViewBindings (#1072) - WIP 2020-12-16 00:46:52 +01:00
Benoit Marty
838340bbc8 Remove dependency to Butterknife 2020-12-15 20:33:55 +01:00
Benoit Marty
75ec9ba3d9 Reduce dependency on Butterknife: remove usage of @BindView 2020-12-15 20:32:26 +01:00
Benoit Marty
876359539f Reduce dependency on Butterknife: remove usage of @OnClick and @OnTextChange 2020-12-15 18:52:36 +01:00
SpiritCroc
77bfa1a687 Automatic SchildiChat string correction 
Change-Id: Ib449487f435c24214e5856311683d857844d3047
 2020-12-15 16:18:37 +01:00
SpiritCroc
a51b44a40d merge_helpers: allow adding extra args to revert_last 
Change-Id: I5ef98b8130fe373d5a9f3d469140117c4570906e
 2020-12-15 16:05:43 +01:00
SpiritCroc
b0d09313e7 Automatic upstream merge postprocessing 
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
 2020-12-15 15:55:57 +01:00
SpiritCroc
a35e246c4d Automatic color correction 
Change-Id: I83f5aed8537cf48dc2f9317b1481b84d63625e64
 2020-12-15 15:55:57 +01:00
SpiritCroc
38b82fb823 Merge tag 'v1.0.12' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
 2020-12-15 15:55:14 +01:00
SpiritCroc
299902feed [TMP] Automatic upstream merge preparation 
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
 2020-12-15 15:00:31 +01:00
SpiritCroc
310b7a262c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I77578d6304946bb60a67134b1b2e034c919d0e73
 2020-12-15 15:00:31 +01:00
Benoit Marty
6cdb192955 Version++ 2020-12-15 14:18:35 +01:00
Benoit Marty
1946058c8e Merge branch 'release/1.0.12' 2020-12-15 14:16:17 +01:00
Benoit Marty
2927f1ff1c Merge branch 'release/1.0.12' into develop 2020-12-15 14:16:15 +01:00
Benoit Marty
e230cd8ee3 Prepare release 1.0.12 2020-12-15 14:16:08 +01:00
Benoit Marty
45225e883e
Merge pull request #2539 from vector-im/feature/bma/cleanup 
Small cleanup before the release
 2020-12-15 14:11:31 +01:00
Benoit Marty
bb9a08d429 /confetti /snow commands: send emote if text is blank (iso Element Web) 2020-12-15 12:19:31 +01:00
Benoit Marty
6ddcd046d4 Import SAS strings 2020-12-15 12:19:31 +01:00
Benoit Marty
88a4dfd094 Ensure the message is understood as a debug indication (#2509) 2020-12-15 12:19:31 +01:00
Benoit Marty
7828e3f501
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_events 
Fix UTD when hiding member state events.
 2020-12-15 12:16:27 +01:00
Benoit Marty
b4b302c1f2
Merge pull request #2535 from vector-im/feature/bca/confetti 
Chat Effects XMAS PR ❄️ 🎉
 2020-12-15 11:41:29 +01:00
Benoit Marty
487ef870f9 Add /snow command 2020-12-15 10:56:05 +01:00
Benoit Marty
6957768567 PR Review 2020-12-15 10:21:12 +01:00
Valere
7da8b13cde Chat Effects 2020-12-15 09:39:16 +01:00
Benoit Marty
a027ef29e5
Merge pull request #2484 from vector-im/feature/bca/social_login 
Social Login
 2020-12-14 18:19:23 +01:00
Benoit Marty
211c158e23 Remove bad translation 2020-12-14 17:42:52 +01:00
Benoit Marty
338650cea7
Merge pull request #2537 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-12-14 17:37:51 +01:00
Benoit Marty
2d4eeb64c5 Translated using Weblate (French) 
Currently translated at 98.2% (1982 of 2018 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-12-14 16:37:12 +00:00
Benoit Marty
4f98031c6d
Merge pull request #2536 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-12-14 17:27:10 +01:00
Weblate
3813f6d659 Merge branch 'origin/develop' into Weblate. 2020-12-14 15:45:20 +00:00