From f5cb980020cee44a0d482af1c873703926ab50fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 30 Sep 2022 09:39:01 +0200 Subject: [PATCH] Fix dependencies and code issues --- dependencies_groups.gradle | 2 ++ .../java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt | 2 +- vector/build.gradle | 7 ------- .../attachments/preview/AttachmentsPreviewFragment.kt | 4 ++-- .../app/features/home/room/detail/TimelineFragment.kt | 4 ++-- .../vector/app/features/home/room/list/RoomListFragment.kt | 2 +- .../features/home/room/list/home/HomeRoomListFragment.kt | 2 +- .../features/pin/lockscreen/biometrics/BiometricHelper.kt | 2 +- .../VectorSettingsNotificationsTroubleshootFragment.kt | 2 +- .../app/features/spaces/manage/SpaceAddRoomFragment.kt | 2 +- 10 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index a97d80bc7f..61ab038b6e 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -47,6 +47,7 @@ ext.groups = [ ], mavenCentral: [ regex: [ + 'com\\.google\\.auto\\.*', ], group: [ 'app.cash.paparazzi', @@ -101,6 +102,7 @@ ext.groups = [ 'com.googlecode.json-simple', 'com.googlecode.libphonenumber', 'com.ibm.icu', + 'com.intellij', 'com.jakewharton.android.repackaged', 'com.jakewharton.timber', 'com.kgurgul.flipper', diff --git a/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt index fbf6f88bc3..719ce29045 100644 --- a/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt +++ b/library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt @@ -62,7 +62,7 @@ class JSonViewerFragment : Fragment(), MavericksView { } recyclerView = inflate.findViewById(R.id.jvRecyclerView) recyclerView.layoutManager = - LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) recyclerView.setController(epoxyController) epoxyController.setStyle(args?.styleProvider) registerForContextMenu(recyclerView) diff --git a/vector/build.gradle b/vector/build.gradle index ff0d907212..c88f81857a 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -17,13 +17,6 @@ static def gitRevision() { return cmd.execute().text.trim() } -project.android.buildTypes.all { buildType -> - buildType.javaCompileOptions.annotationProcessorOptions.arguments = - [ - validateEpoxyModelUsage: String.valueOf(buildType.name == 'debug') - ] -} - initScreenshotTests(project) android { diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt index 20b155d11e..e7ab8c9804 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt @@ -207,13 +207,13 @@ class AttachmentsPreviewFragment : attachmentMiniaturePreviewController.callback = this views.attachmentPreviewerMiniatureList.let { - it.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) + it.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) it.setHasFixedSize(true) it.adapter = attachmentMiniaturePreviewController.adapter } views.attachmentPreviewerBigList.let { - it.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) + it.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) it.attachSnapHelperWithListener( PagerSnapHelper(), SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE, diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index bba607eeb4..7bbdc431b9 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -1434,8 +1434,8 @@ class TimelineFragment : timelineEventController.timeline = timelineViewModel.timeline views.timelineRecyclerView.trackItemsVisibilityChange() - layoutManager = object : LinearLayoutManager(context, RecyclerView.VERTICAL, true) { - override fun onLayoutCompleted(state: RecyclerView.State?) { + layoutManager = object : LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, true) { + override fun onLayoutCompleted(state: RecyclerView.State) { super.onLayoutCompleted(state) updateJumpToReadMarkerViewVisibility() jumpToBottomViewVisibilityManager.maybeShowJumpToBottomViewVisibilityWithDelay() diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt index 9591048725..970b1c34e1 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt @@ -285,7 +285,7 @@ class RoomListFragment : } private fun setupRecyclerView() { - val layoutManager = LinearLayoutManager(context) + val layoutManager = LinearLayoutManager(requireContext()) stateRestorer = LayoutManagerStateRestorer(layoutManager).register() views.roomListView.layoutManager = layoutManager views.roomListView.itemAnimator = RoomListAnimator() diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt index 5677f3e4a8..d8c71e3e17 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt @@ -137,7 +137,7 @@ class HomeRoomListFragment : private fun setupRecyclerView() { views.stateView.state = StateView.State.Content - val layoutManager = LinearLayoutManager(context) + val layoutManager = LinearLayoutManager(requireContext()) firstItemObserver = FirstItemUpdatedObserver(layoutManager) { layoutManager.scrollToPosition(0) } diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt index 026ee159ed..bf2075d3a8 100644 --- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt +++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt @@ -20,7 +20,7 @@ import android.content.Context import android.os.Build import androidx.annotation.MainThread import androidx.annotation.VisibleForTesting -import androidx.annotation.VisibleForTesting.PRIVATE +import androidx.annotation.VisibleForTesting.Companion.PRIVATE import androidx.biometric.BiometricManager import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt index 137f1c8722..9fc55d14aa 100644 --- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt @@ -65,7 +65,7 @@ class VectorSettingsNotificationsTroubleshootFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val layoutManager = LinearLayoutManager(context) + val layoutManager = LinearLayoutManager(requireContext()) views.troubleshootTestRecyclerView.layoutManager = layoutManager val dividerItemDecoration = DividerItemDecoration(view.context, layoutManager.orientation) diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt index d0115d561a..edc18a8816 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt @@ -214,7 +214,7 @@ class SpaceAddRoomFragment : roomEpoxyController.submitList(it) } listenItemCount(viewModel.roomCountFlow) { roomEpoxyController.totalSize = it } - views.roomList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + views.roomList.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) views.roomList.setHasFixedSize(true) }