Commit Graph

93 Commits

Author SHA1 Message Date
ariskotsomitopoulos 3bd21d04d8 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
Valere 3f0122be01 Update nb of enum classes 2022-01-10 09:44:11 +01:00
ariskotsomitopoulos ac5caccdf9 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.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/database/model/EventEntity.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/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Adam Brown 12abd3b019 updating enum class counter 2022-01-06 10:25:41 +00:00
Benoit Marty 48e15b1c36 Restore line deleted during GitHub conflict fixing by mistake 2022-01-04 16:15:25 +01:00
Benoit Marty 7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty 2dc88d1477 Fix code quality 2022-01-03 20:22:57 +01:00
Benoit Marty b39caeb04d 2 new enums 2022-01-03 15:27:59 +01:00
ariskotsomitopoulos 0d9bc188d7 Fix code quality issues 2021-12-26 00:48:11 +02:00
Benoit Marty be33a53e56 code quality 2021-12-14 09:06:43 +01:00
Adam Brown 6a3d4044ef removing unused imports and increasing enum allowance 2021-12-03 15:30:55 +00:00
Benoit Marty 6624039413 Use `@id` and not `@+id` when referencing ids in layouts - RelativeLayout and toolbarId 2021-12-01 22:44:07 +01:00
Benoit Marty e106ff8de0 Use `@id` and not `@+id` when referencing ids in layouts - ConstraintLayout 2021-12-01 22:19:33 +01:00
Benoit Marty 2d17156861 Use `@id` and not `@+id` when referencing ids in layouts - accessibilityTraversal 2021-12-01 22:16:28 +01:00
Benoit Marty 6d3df0d802 Use `@id` and not `@+id` when referencing ids in layouts - ConstraintLayout 2021-12-01 22:13:21 +01:00
yostyle 6ddf3f6e5a Fix lint errors 2021-11-10 22:31:23 +01:00
Adam Brown d3234b33d3 increase enum class allowance by 1 2021-10-26 20:03:10 +01:00
Benoit Marty 920f467231 Disqble some check, not true anymore 2021-10-01 14:11:26 +02:00
Valere 8fd784e275 Improve leave space (all + none) 2021-09-16 09:20:25 +02:00
Valere aaa9c7e795 fix rebase 2021-07-30 19:05:47 +02:00
Valere 5adceaca23 Code quality 2021-07-30 18:44:14 +02:00
Onuray Sahin 1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
Valere 57c75f8039 Ugrade unstable room notice in settings
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +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 f0b28742ac textSize *sp -> style 2021-06-15 10:30:54 +02:00
Benoit Marty 03df4aac77 Cleanup 2021-06-14 21:46:05 +02:00
Benoit Marty 3473d669d3 Use MaterialToolbar and AppBarLayout in all screens 2021-06-11 10:12:31 +02:00
Benoit Marty 047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00
Benoit Marty a9c61dc309 Fix code quality 2021-05-21 15:02:14 +02:00
Valere eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Valere 8146d8ab1e Add Rooms to space 2021-04-28 11:15:58 +02:00
Valere 49381db2e3 cleaning 2021-04-28 11:15:58 +02:00
Valere 48fef45ce3 Code quality 2021-04-28 11:15:58 +02:00
Valere 41176c3e26 Support only notif display mode
+ code quality fixes
2021-03-31 18:04:27 +02:00
Benoit Marty 274aef8f24 Code qual 2021-03-22 19:15:06 +01:00
Benoit Marty c9c4a203d1 Code quality 2021-03-10 11:10:23 +01:00
Benoit Marty 7eec98ea23 Ensure we will not use the template string by mistake 2021-03-03 18:08:05 +01:00
Benoit Marty b8498aecd9 Code quality 2021-03-03 15:17:41 +01:00
Benoit Marty 259ead106f Fix code quality issue 2021-03-03 09:28:35 +01:00
Benoit Marty c181f7e421 Please code quality check 2021-02-23 10:31:58 +01:00
ganfra 88e18a8640 VoIP: fix a bunch of issues 2021-01-27 16:55:34 +01:00
ganfra dd67e8c5b5 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-08 16:30:37 +01:00
Benoit Marty 9f3176c49c Fix code quality 2020-12-28 14:41:23 +01:00
ganfra 14288b545b Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-22 11:38:41 +01:00
Benoit Marty 6f04f4109d It seems we need to use `findViewById` sometimes 2020-12-16 14:35:30 +01:00
Benoit Marty dba65dcd22 Migrate to ViewBindings (#1072) - WIP 2020-12-16 02:05:38 +01:00
Benoit Marty 838340bbc8 Remove dependency to Butterknife 2020-12-15 20:33:55 +01:00
Valere d8a1939c69 Fix number of enum 2020-12-11 17:50:59 +01:00
ganfra 8bb98d9ecc VoIP: clean code 2020-12-09 18:22:06 +01:00