mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-26 02:48:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
12565 commits 7 branches 124 tags 230 MiB
Commit graph

72 commits

Author SHA1 Message Date
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
5a19533b4a Use correct value, but I do not see any effect on emulator with API 12 2021-11-15 12:25:42 +01:00
Benoit Marty
1082771f7c Fix lint issue "Incorrect constant" 2021-11-15 12:24:48 +01: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
Benoit Marty
85983562fa No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4 
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
 2021-10-19 19:06:27 +02:00
SpiritCroc
dffc0c1d65 Merge tag 'v1.3.2' into sc 
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.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/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TextComposerView.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.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
 2021-10-11 09:55:26 +02:00
Benoit Marty
d1e9f3131a Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing" 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
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
ariskotsomitopoulos
1dcf6b9539 Enhance dependencies handling to support Dependabot 2021-09-17 14:58:44 +03:00
ariskotsomitopoulos
87fefdc7bb Add more dependencies to common dependencies.gradle 2021-09-15 20:22:52 +03:00
ariskotsomitopoulos
c89b2c0536 Optimize dependencies handling 2021-09-15 13:21:25 +03: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
dependabot[bot]
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1 
Bumps appcompat from 1.3.0 to 1.3.1.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-22 12:13:24 +00:00
Benoit Marty
692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0 
Bump material from 1.3.0 to 1.4.0
 2021-07-05 21:29:49 +02:00
dependabot[bot]
9ff1e20f07
Bump material from 1.3.0 to 1.4.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-02 23:07:53 +00:00
dependabot[bot]
752290424c
Bump core-ktx from 1.5.0 to 1.6.0 
Bumps core-ktx from 1.5.0 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:07:55 +00: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
a67f8ca4dc Add some missing style. Default is not workong (?) 2021-06-15 19:00:07 +02:00
Benoit Marty
9c9d0a5d21 Add dep on ui_style to attachment viewer 2021-06-15 18:22:26 +02:00
Benoit Marty
070dae78e7 textSize 12sp -> Caption or Default 2021-06-14 21:22:56 +02:00
dependabot[bot]
37176b9770
Bump recyclerview from 1.2.0 to 1.2.1 
Bumps recyclerview from 1.2.0 to 1.2.1.

---
updated-dependencies:
- dependency-name: androidx.recyclerview:recyclerview
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-03 06:50:02 +00:00
dependabot[bot]
9b6a2c91f4
Bump core-ktx from 1.3.2 to 1.5.0 
Bumps core-ktx from 1.3.2 to 1.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-20 13:08:12 +00:00
Benoit Marty
4cf38951ef Fix warning after bump appcompat from 1.2.0 to 1.3.0 2021-05-20 13:00:49 +02:00
dependabot[bot]
5629d30932
Bump appcompat from 1.2.0 to 1.3.0 
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-19 06:20:33 +00:00
Benoit Marty
796bb80868
Merge pull request #3252 from vector-im/dependabot/gradle/com.github.chrisbanes-PhotoView-2.3.0 
Bump PhotoView from 2.1.4 to 2.3.0
 2021-05-12 16:51:12 +02:00
Benoit Marty
a377a595b9 Cleanup file, this belongs to the main build.gradle file 2021-05-03 21:13:25 +02:00
dependabot[bot]
5a53838194
Bump PhotoView from 2.1.4 to 2.3.0 
Bumps [PhotoView](https://github.com/Baseflow/PhotoView) from 2.1.4 to 2.3.0.
- [Release notes](https://github.com/Baseflow/PhotoView/releases)
- [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-30 07:06:20 +00:00
dependabot[bot]
68efa63de4
Bump recyclerview from 1.2.0-rc01 to 1.2.0 
Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:33 +00:00
dependabot[bot]
30515492ca
Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01 
Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:31:57 +00:00
Benoit Marty
d3b2306b3d Remove unused file 2021-03-01 14:33:52 +01:00
dependabot[bot]
8c23b0561b
Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02 
Bumps recyclerview from 1.2.0-beta01 to 1.2.0-beta02.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-25 07:20:31 +00:00
Benoit Marty
c985639691
Merge pull request #2883 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta01 
Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01
 2021-02-21 00:09:48 +01:00
dependabot[bot]
a7adcbcd78
Bump rxkotlin from 2.3.0 to 2.4.0 
Bumps [rxkotlin](https://github.com/ReactiveX/RxKotlin) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/ReactiveX/RxKotlin/releases)
- [Commits](https://github.com/ReactiveX/RxKotlin/compare/2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:20:10 +00:00
dependabot[bot]
a5a857f036
Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01 
Bumps recyclerview from 1.2.0-alpha06 to 1.2.0-beta01.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:19:35 +00:00
dependabot[bot]
108a81d338
Bump material from 1.3.0-alpha04 to 1.3.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0-alpha04 to 1.3.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0-alpha04...1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:22:53 +00: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
Onuray Sahin
869eb262f3 Lint fixes. 2021-01-06 12:49:11 +03:00
Onuray Sahin
23623b8895 Migrate to Android 11, API 30. 2021-01-04 17:12:49 +03:00
Benoit Marty
11367488e6 Fix crash in AttachmentViewerActivity (after ViewBindings) 
And improve code a bit
 2021-01-04 14:21:57 +01:00
Benoit Marty
18bf9856fe Migrate to ViewBindings (#1072) - WIP 2020-12-16 03:57:19 +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
706736273c Migrate to ViewBindings (#1072) - WIP 2020-12-16 00:46:52 +01:00
Benoit Marty
c426364618 Remove unused dependencies 2020-12-02 12:45:31 +01:00
Benoit Marty
ff0f42900d Do not use deprecated Fragment.startActivityForResult anymore 2020-10-07 16:02:01 +02:00