mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-24 16:53:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
7764 commits 7 branches 125 tags 235 MiB
Commit graph

287 commits

Author SHA1 Message Date
SpiritCroc
04f4e13230 Merge tag 'v1.0.17' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
 2021-02-10 11:05:22 +01:00
Benoit Marty
1212bb8d70 Change app name from "Element (Riot.im)" to "Element" 2021-02-08 12:39:35 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
Benoit Marty
d11ed8c4ef Version++ 2021-02-04 15:17:46 +01:00
Benoit Marty
a65f846929 Version++ 2021-02-03 17:09:32 +01:00
SpiritCroc
417bf48dd1 Increment version 
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
 2021-01-23 11:58:10 +01:00
Benoit Marty
4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration 
Migrate to Android 11, API 30.
 2021-01-22 17:17:04 +01:00
SpiritCroc
53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.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/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/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/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	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_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
ganfra
2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
Benoit Marty
72ee1ace48 Version++ 2021-01-15 11:14:59 +01:00
Onuray Sahin
23623b8895 Migrate to Android 11, API 30. 2021-01-04 17:12:49 +03:00
SpiritCroc
7ecf8073ef Increment version 
Change-Id: Icd9bbfe6db69fc8a7b2de5626f4292d3664f4c5e
 2020-12-27 11:29:47 +01:00
SpiritCroc
8da4044de6 Merge tag 'v1.0.13' into sc 
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
 2020-12-22 09:24:31 +01:00
Benoit Marty
2b780a8b76
Merge pull request #2542 from vector-im/feature/bma/view_bindings 
View bindings
 2020-12-18 15:57:34 +01:00
Benoit Marty
0518e5f18d Version++ 2020-12-18 11:03:01 +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
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
Benoit Marty
6cdb192955 Version++ 2020-12-15 14:18:35 +01:00
Valere
7da8b13cde Chat Effects 2020-12-15 09:39:16 +01:00
Onuray Sahin
d54571d0a6 Emoji library added with Google style. 2020-12-09 18:45:33 +03:00
SpiritCroc
3defe44eff Increment version 
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
 2020-12-05 11:02:41 +01:00
Benoit Marty
c4577f28b2 Remove unnecessary dependency (we have -ktx dependency) 2020-12-02 16:43:52 +01:00
Benoit Marty
89a7ec6d4b Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable) 2020-12-02 12:46:15 +01:00
Benoit Marty
42bc4d2445 Upgrade some dependencies and Kotlin version 2020-12-02 12:09:56 +01:00
SpiritCroc
0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
 2020-11-29 12:51:43 +01:00
Benoit Marty
b84d7f0834 Version** 2020-11-27 20:42:02 +01:00
SpiritCroc
ac89fb97f8 Increment version 
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
 2020-11-24 16:13:49 +01:00
Benoit Marty
07c805a019 Create sanity test with all screens path 
Introduce `com.schibsted.spain:barista`
 2020-11-09 16:56:20 +01:00
SpiritCroc
164848e0aa Increment version 
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
 2020-11-07 11:37:55 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
Benoit Marty
17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
SpiritCroc
07e6cf2a8d Increment version 
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
 2020-11-02 13:20:05 +01:00
Benoit Marty
60556d0fa0 Version code: apply workaround from https://issuetracker.google.com/issues/171133218 2020-10-22 16:10:08 +02:00
Benoit Marty
c05147a019 Merge branch 'hotfix/bma/versionCode' into develop 2020-10-19 12:31:35 +02:00
Benoit Marty
a59c92f55a Fix issue with VersionCode 2020-10-19 12:29:20 +02:00
SpiritCroc
5853709c97 Increment version 
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
 2020-10-17 17:05:03 +02:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.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/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.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/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
Benoit Marty
1b7158a61d Version++ 2020-10-16 17:34:10 +02:00
ganfra
9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
SpiritCroc
ca60a769d2 Increment version 
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
 2020-10-13 15:42:19 +02:00
Constantin Wartenburger
7e5ee8f951
Made it backwards compatible 2020-10-11 22:09:19 +02:00
Benoit Marty
9e0ebc94c5 Upgrade other dependencies, and remove unused dependencies 2020-10-06 15:44:30 +02:00
Benoit Marty
1a0dba7422 Upgrade Moshi to 1.11.0, Dagger to 2.29.1, Epoxy to 4.1.0 2020-10-06 14:47:57 +02:00
Benoit Marty
5056615eb0 Upgrade kotlin version from 1.3.72 to 1.4.10 and kotlin coroutines version from 1.3.8 to 1.3.9 2020-10-06 12:33:40 +02:00
SpiritCroc
96aa885819 Increment version 
Change-Id: I68a3f7a7806795a2f5ae7a1b582bb6d9e572872b
 2020-09-30 12:23:15 +02:00
Valere
2908a5d345 Added first ui bootstrap test 2020-09-30 10:13:59 +02:00
Benoit Marty
487bbe42a9
Merge branch 'develop' into feature/ui_test 2020-09-29 16:13:44 +02:00
ganfra
8bc0afa75e Timeline: add glide preloading 2020-09-29 15:42:21 +02:00
Benoit Marty
b14d22550b PR Review 
Cleanup and Add command line to run the UI tests
 2020-09-29 15:12:25 +02:00