From d3830af78bc7c398b7ffcb84aefa6dbd1b29a908 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 10 Jan 2024 19:33:39 +0100 Subject: [PATCH] Fix ktlint issues --- .../ContributesNodeCodeGenerator.kt | 1 - .../element/android/x/ElementXApplication.kt | 1 - .../io/element/android/x/MainActivity.kt | 1 - .../kotlin/io/element/android/x/MainNode.kt | 1 - .../io/element/android/x/di/AppBindings.kt | 4 ++++ .../io/element/android/x/di/AppComponent.kt | 1 - .../io/element/android/x/di/AppModule.kt | 19 ++++++++++------- .../x/di/DefaultRoomComponentFactory.kt | 1 - .../x/di/DefaultSessionComponentFactory.kt | 1 - .../io/element/android/x/di/RoomComponent.kt | 1 - .../element/android/x/di/SessionComponent.kt | 1 - .../android/x/initializer/CrashInitializer.kt | 1 - .../x/initializer/TracingInitializer.kt | 1 - .../x/intent/IntentProviderImplTest.kt | 1 - .../android/appconfig/LockScreenConfig.kt | 1 - .../android/appconfig/MatrixConfiguration.kt | 2 +- .../android/appconfig/NotificationConfig.kt | 4 ++-- .../element/android/appconfig/PushConfig.kt | 2 +- .../android/appconfig/RoomListConfig.kt | 6 +++--- .../android/appconfig/SecureBackupConfig.kt | 2 +- .../android/appconfig/TimelineConfig.kt | 2 +- .../android/appnav/LoggedInEventProcessor.kt | 1 - .../android/appnav/LoggedInFlowNode.kt | 1 - .../io/element/android/appnav/RootFlowNode.kt | 1 - .../android/appnav/di/MatrixClientsHolder.kt | 1 - .../android/appnav/loggedin/LoggedInEvents.kt | 21 ------------------- .../android/appnav/loggedin/LoggedInNode.kt | 1 - .../appnav/loggedin/LoggedInPresenter.kt | 1 - .../android/appnav/room/LoadingRoomState.kt | 1 - .../android/appnav/room/RoomFlowNode.kt | 1 - .../android/appnav/room/RoomLoadedFlowNode.kt | 1 - .../appnav/root/RootNavStateFlowFactory.kt | 1 - .../android/appnav/root/RootPresenter.kt | 1 - .../android/appnav/RoomFlowNodeTest.kt | 4 ---- .../appnav/loggedin/LoggedInPresenterTest.kt | 1 - .../room/LoadingRoomStateFlowFactoryTest.kt | 1 - build.gradle.kts | 4 ++-- .../features/call/CallForegroundService.kt | 1 - .../features/call/data/WidgetMessage.kt | 1 - .../features/call/ui/CallScreenPresenter.kt | 1 - .../call/utils/CallIntentDataParser.kt | 1 - .../utils/WebViewWidgetMessageInterceptor.kt | 1 - .../call/utils/WidgetMessageSerializer.kt | 1 - .../features/call/MapWebkitPermissionsTest.kt | 1 - .../call/ui/CallScreenPresenterTest.kt | 1 - .../call/utils/CallIntentDataParserTest.kt | 1 - .../utils/DefaultCallWidgetProviderTest.kt | 1 - .../call/utils/FakeCallWidgetProvider.kt | 1 - .../receipt/TimelineItemReadReceiptView.kt | 6 +++--- .../impl/components/RoomListTopBar.kt | 6 +++--- .../impl/root/SecureBackupRootNode.kt | 2 +- .../clipboard/AndroidClipboardHelper.kt | 1 - .../clipboard/FakeClipboardHelper.kt | 1 - .../androidutils/diff/DefaultDiffCallback.kt | 1 - .../libraries/androidutils/diff/DiffCache.kt | 1 - .../androidutils/diff/DiffCacheInvalidator.kt | 1 - .../androidutils/diff/DiffCacheUpdater.kt | 1 - .../libraries/architecture/AsyncAction.kt | 1 - .../libraries/architecture/AsyncData.kt | 1 - .../overlay/HideOverlayBackPressHandler.kt | 1 - .../libraries/architecture/overlay/Overlay.kt | 1 - .../architecture/overlay/operation/Hide.kt | 1 - .../architecture/overlay/operation/Show.kt | 1 - .../libraries/architecture/AsyncDataKtTest.kt | 1 - .../libraries/core/cache/CircularCache.kt | 1 - .../core/extensions/BasicExtensions.kt | 14 ------------- .../libraries/core/log/logger/LoggerTag.kt | 1 - .../core/extensions/BasicExtensionsTest.kt | 1 - .../libraries/core/extensions/ResultTest.kt | 1 - .../libraries/deeplink/DeepLinkCreatorTest.kt | 1 - .../components/avatar/AvatarData.kt | 1 - .../components/button/ButtonVisuals.kt | 1 - .../components/keyboard/Keyboard.kt | 3 ++- .../components/preferences/PreferencePage.kt | 1 - .../preferences/PreferenceTextField.kt | 2 +- .../designsystem/theme/components/Button.kt | 7 +++++-- .../theme/components/FloatingActionButton.kt | 3 ++- .../designsystem/theme/components/ListItem.kt | 1 - .../theme/components/ListSupportingText.kt | 1 - .../theme/components/SearchBar.kt | 1 - .../designsystem/theme/components/Slider.kt | 2 +- .../bottomsheet/CustomBottomSheetScaffold.kt | 8 +++---- .../bottomsheet/CustomSheetState.kt | 1 - .../utils/snackbar/SnackbarHost.kt | 3 ++- .../designsystem/colors/AvatarColorsTest.kt | 1 - .../utils/snackbar/SnackbarDispatcherTests.kt | 1 - .../RandomSecretPassphraseProvider.kt | 1 - .../libraries/maplibre/compose/MapApplier.kt | 1 - .../libraries/maplibre/compose/MapUpdater.kt | 1 - .../matrix/api/permalink/MatrixToConverter.kt | 2 +- .../matrix/api/permalink/PermalinkBuilder.kt | 4 ++-- .../ui/components/AttachmentThumbnail.kt | 8 ++++++- .../matrix/ui/media/CoilMediaFetcher.kt | 5 +---- .../matrix/ui/media/MediaRequestData.kt | 1 - .../matrixui/messages/ToHtmlDocumentTest.kt | 1 - .../matrixui/messages/ToPlainTextTest.kt | 1 - .../interceptors/FormattedJsonHttpLogger.kt | 1 - .../libraries/push/impl/PushersManager.kt | 4 ++-- .../action/MarkAsReadActionFactory.kt | 2 +- .../action/QuickReplyActionFactory.kt | 2 +- 100 files changed, 66 insertions(+), 158 deletions(-) delete mode 100644 appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt diff --git a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt index 576a52df89..d9e58f6482 100644 --- a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt +++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt @@ -58,7 +58,6 @@ import java.io.File */ @AutoService(CodeGenerator::class) class ContributesNodeCodeGenerator : CodeGenerator { - override fun isApplicable(context: AnvilContext): Boolean = true override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection): Collection { diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt index 03f0b20429..437c6700f5 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt @@ -27,7 +27,6 @@ import io.element.android.x.initializer.CrashInitializer import io.element.android.x.initializer.TracingInitializer class ElementXApplication : Application(), DaggerComponentOwner { - override val daggerComponent: AppComponent = DaggerAppComponent.factory().create(this) override fun onCreate() { diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt index 00d8a48d9a..99d940c5f5 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt @@ -51,7 +51,6 @@ import timber.log.Timber private val loggerTag = LoggerTag("MainActivity") class MainActivity : NodeActivity() { - private lateinit var mainNode: MainNode private lateinit var appBindings: AppBindings diff --git a/app/src/main/kotlin/io/element/android/x/MainNode.kt b/app/src/main/kotlin/io/element/android/x/MainNode.kt index 6abd0add67..e4f16d323e 100644 --- a/app/src/main/kotlin/io/element/android/x/MainNode.kt +++ b/app/src/main/kotlin/io/element/android/x/MainNode.kt @@ -48,7 +48,6 @@ class MainNode( plugins = plugins, ), DaggerComponentOwner { - override val daggerComponent = (context as DaggerComponentOwner).daggerComponent override fun resolve(navTarget: RootNavTarget, buildContext: BuildContext): Node { diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt index 96439ff973..a6ce26c237 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt @@ -27,8 +27,12 @@ import io.element.android.libraries.matrix.api.tracing.TracingService @ContributesTo(AppScope::class) interface AppBindings { fun snackbarDispatcher(): SnackbarDispatcher + fun tracingService(): TracingService + fun bugReporter(): BugReporter + fun lockScreenService(): LockScreenService + fun preferencesStore(): PreferencesStore } diff --git a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt index 80e61d96d4..4e8c631281 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt @@ -28,7 +28,6 @@ import io.element.android.libraries.di.SingleIn @SingleIn(AppScope::class) @MergeComponent(AppScope::class) interface AppComponent : NodeFactoriesBindings { - @Component.Factory interface Factory { fun create( diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt index 037cec1e71..995dcf61e5 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt @@ -46,7 +46,6 @@ import java.io.File @Module @ContributesTo(AppScope::class) object AppModule { - @Provides fun providesBaseDirectory(@ApplicationContext context: Context): File { return File(context.filesDir, "sessions") @@ -82,14 +81,20 @@ object AppModule { buildType = buildType, applicationName = context.getString(R.string.app_name), applicationId = BuildConfig.APPLICATION_ID, - lowPrivacyLoggingEnabled = false, // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE, + // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE, + lowPrivacyLoggingEnabled = false, versionName = BuildConfig.VERSION_NAME, versionCode = BuildConfig.VERSION_CODE, - gitRevision = "TODO", // BuildConfig.GIT_REVISION, - gitRevisionDate = "TODO", // BuildConfig.GIT_REVISION_DATE, - gitBranchName = "TODO", // BuildConfig.GIT_BRANCH_NAME, - flavorDescription = "TODO", // BuildConfig.FLAVOR_DESCRIPTION, - flavorShortDescription = "TODO", // BuildConfig.SHORT_FLAVOR_DESCRIPTION, + // BuildConfig.GIT_REVISION, + gitRevision = "TODO", + // BuildConfig.GIT_REVISION_DATE, + gitRevisionDate = "TODO", + // BuildConfig.GIT_BRANCH_NAME, + gitBranchName = "TODO", + // BuildConfig.FLAVOR_DESCRIPTION, + flavorDescription = "TODO", + // BuildConfig.SHORT_FLAVOR_DESCRIPTION, + flavorShortDescription = "TODO", ) @Provides diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt index 44fc54570d..830ca4a65d 100644 --- a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt +++ b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt @@ -26,7 +26,6 @@ import javax.inject.Inject class DefaultRoomComponentFactory @Inject constructor( private val roomComponentBuilder: RoomComponent.Builder ) : RoomComponentFactory { - override fun create(room: MatrixRoom): Any { return roomComponentBuilder.room(room).build() } diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt index 922d25f6af..7ea85e81a8 100644 --- a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt +++ b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt @@ -26,7 +26,6 @@ import javax.inject.Inject class DefaultSessionComponentFactory @Inject constructor( private val sessionComponentBuilder: SessionComponent.Builder ) : SessionComponentFactory { - override fun create(client: MatrixClient): Any { return sessionComponentBuilder.client(client).build() } diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt index 68c700bdb8..55d0b9c653 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt @@ -29,7 +29,6 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom @SingleIn(RoomScope::class) @MergeSubcomponent(RoomScope::class) interface RoomComponent : NodeFactoriesBindings { - @Subcomponent.Builder interface Builder { @BindsInstance diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt index 54e8c27498..4ef2840e8e 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt +++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt @@ -29,7 +29,6 @@ import io.element.android.libraries.matrix.api.MatrixClient @SingleIn(SessionScope::class) @MergeSubcomponent(SessionScope::class) interface SessionComponent : NodeFactoriesBindings { - @Subcomponent.Builder interface Builder { @BindsInstance diff --git a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt index c947bc20e3..af381c2dcf 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt @@ -21,7 +21,6 @@ import androidx.startup.Initializer import io.element.android.features.rageshake.impl.crash.VectorUncaughtExceptionHandler class CrashInitializer : Initializer { - override fun create(context: Context) { VectorUncaughtExceptionHandler(context).activate() } diff --git a/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt b/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt index 8dc0bf0e0e..5a7bf0fb82 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt +++ b/app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt @@ -31,7 +31,6 @@ import io.element.android.x.di.AppBindings import timber.log.Timber class TracingInitializer : Initializer { - override fun create(context: Context) { val appBindings = context.bindings() val tracingService = appBindings.tracingService() diff --git a/app/src/test/kotlin/io/element/android/x/intent/IntentProviderImplTest.kt b/app/src/test/kotlin/io/element/android/x/intent/IntentProviderImplTest.kt index 9f0cde38cf..340af6f4a8 100644 --- a/app/src/test/kotlin/io/element/android/x/intent/IntentProviderImplTest.kt +++ b/app/src/test/kotlin/io/element/android/x/intent/IntentProviderImplTest.kt @@ -31,7 +31,6 @@ import org.robolectric.RuntimeEnvironment @RunWith(RobolectricTestRunner::class) class IntentProviderImplTest { - @Test fun `test getViewRoomIntent with Session`() { val sut = createIntentProviderImpl() diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt index 4d6b3a624c..02586bea0d 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt @@ -46,7 +46,6 @@ data class LockScreenConfig( @ContributesTo(AppScope::class) @Module object LockScreenConfigModule { - @Provides fun providesLockScreenConfig(): LockScreenConfig = LockScreenConfig( isPinMandatory = false, diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt index e4d6ee7ca2..2dcdb6e458 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt @@ -17,6 +17,6 @@ package io.element.android.appconfig object MatrixConfiguration { - const val matrixToPermalinkBaseUrl: String = "https://matrix.to/#/" + const val MATRIX_TO_PERMALINK_BASE_URL: String = "https://matrix.to/#/" val clientPermalinkBaseUrl: String? = null } diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt index 30940cbcaf..8d41a2a207 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt @@ -18,8 +18,8 @@ package io.element.android.appconfig object NotificationConfig { // TODO EAx Implement and set to true at some point - const val supportMarkAsReadAction = false + const val SUPPORT_MARK_AS_READ_ACTION = false // TODO EAx Implement and set to true at some point - const val supportQuickReplyAction = false + const val SUPPORT_QUICK_REPLY_ACTION = false } diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt index 1836a5acb6..592c7c4b9e 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/PushConfig.kt @@ -20,5 +20,5 @@ object PushConfig { /** * Note: pusher_app_id cannot exceed 64 chars. */ - const val pusher_app_id: String = "im.vector.app.android" + const val PUSHER_APP_ID: String = "im.vector.app.android" } diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt index b464d9794c..b6565a2129 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt @@ -17,8 +17,8 @@ package io.element.android.appconfig object RoomListConfig { - const val showInviteMenuItem = false - const val showReportProblemMenuItem = false + const val SHOW_INVITE_MENU_ITEM = false + const val SHOW_REPORT_PROBLEM_MENU_ITEM = false - const val hasDropdownMenu = showInviteMenuItem || showReportProblemMenuItem + const val HAS_DROP_DOWN_MENU = SHOW_INVITE_MENU_ITEM || SHOW_REPORT_PROBLEM_MENU_ITEM } diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/SecureBackupConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/SecureBackupConfig.kt index 61f015d239..47ce0e48c6 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/SecureBackupConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/SecureBackupConfig.kt @@ -17,5 +17,5 @@ package io.element.android.appconfig object SecureBackupConfig { - const val LearnMoreUrl: String = "https://element.io/help#encryption5" + const val LEARN_MORE_URL: String = "https://element.io/help#encryption5" } diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt index 625282f1e8..c309e01277 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt @@ -17,5 +17,5 @@ package io.element.android.appconfig object TimelineConfig { - const val maxReadReceiptToDisplay = 3 + const val MAX_READ_RECEIPT_TO_DISPLAY = 3 } diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt index 6bf7687fef..b59c1cebdf 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt @@ -36,7 +36,6 @@ class LoggedInEventProcessor @Inject constructor( roomMembershipObserver: RoomMembershipObserver, sessionVerificationService: SessionVerificationService, ) { - private var observingJob: Job? = null private val displayLeftRoomMessage = roomMembershipObserver.updates diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt index 566855ec72..3985128b21 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt @@ -111,7 +111,6 @@ class LoggedInFlowNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins ) { - interface Callback : Plugin { fun onOpenBugReport() } diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt index 836947ef21..42c9869523 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt @@ -81,7 +81,6 @@ class RootFlowNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins ) { - override fun onBuilt() { matrixClientsHolder.restoreWithSavedState(buildContext.savedStateMap) super.onBuilt() diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt index c330d522d0..517becef2a 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixClientsHolder.kt @@ -37,7 +37,6 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHold @SingleIn(AppScope::class) @ContributesBinding(AppScope::class) class MatrixClientsHolder @Inject constructor(private val authenticationService: MatrixAuthenticationService) : MatrixClientProvider { - private val sessionIdsToMatrixClient = ConcurrentHashMap() private val restoreMutex = Mutex() diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt deleted file mode 100644 index be784ea7c9..0000000000 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2023 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.element.android.appnav.loggedin - -// sealed interface LoggedInEvents { -// data object MyEvent : LoggedInEvents -// } diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt index 5ddbb164d8..a61e6b69b6 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt @@ -35,7 +35,6 @@ class LoggedInNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins ) { - @Composable override fun View(modifier: Modifier) { val loggedInState = loggedInPresenter.present() diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt index 7683b7278f..a9c4a6ecf8 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt @@ -35,7 +35,6 @@ class LoggedInPresenter @Inject constructor( private val networkMonitor: NetworkMonitor, private val pushService: PushService, ) : Presenter { - @Composable override fun present(): LoggedInState { LaunchedEffect(Unit) { diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomState.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomState.kt index 3836fbff74..0798979812 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomState.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/room/LoadingRoomState.kt @@ -47,7 +47,6 @@ open class LoadingRoomStateProvider : PreviewParameterProvider @SingleIn(SessionScope::class) class LoadingRoomStateFlowFactory @Inject constructor(private val matrixClient: MatrixClient) { - fun create(lifecycleScope: CoroutineScope, roomId: RoomId): StateFlow = getRoomFlow(roomId) .map { room -> diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt index 4cbb7facc8..b45207b034 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt @@ -66,7 +66,6 @@ class RoomFlowNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins ) { - data class Inputs( val roomId: RoomId, val initialElement: RoomLoadedFlowNode.NavTarget = RoomLoadedFlowNode.NavTarget.Messages, diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomLoadedFlowNode.kt index 045823be6f..d6ea4fc533 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomLoadedFlowNode.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomLoadedFlowNode.kt @@ -71,7 +71,6 @@ class RoomLoadedFlowNode @AssistedInject constructor( buildContext = buildContext, plugins = plugins, ), DaggerComponentOwner { - interface Callback : Plugin { fun onOpenRoom(roomId: RoomId) fun onForwardedToSingleRoom(roomId: RoomId) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt index e6a46f5950..13c0204f79 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt @@ -41,7 +41,6 @@ class RootNavStateFlowFactory @Inject constructor( private val matrixClientsHolder: MatrixClientsHolder, private val loginUserStory: LoginUserStory, ) { - private var currentCacheIndex = 0 fun create(savedStateMap: SavedStateMap?): Flow { diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt index cffc4cf35c..8ec673ceec 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt @@ -30,7 +30,6 @@ class RootPresenter @Inject constructor( private val rageshakeDetectionPresenter: RageshakeDetectionPresenter, private val appErrorStateService: AppErrorStateService, ) : Presenter { - @Composable override fun present(): RootState { val rageshakeDetectionState = rageshakeDetectionPresenter.present() diff --git a/appnav/src/test/kotlin/io/element/android/appnav/RoomFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/RoomFlowNodeTest.kt index 09ca595080..ecc6a5dad0 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/RoomFlowNodeTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/RoomFlowNodeTest.kt @@ -41,7 +41,6 @@ import org.junit.Rule import org.junit.Test class RoomFlowNodeTest { - @get:Rule val instantTaskExecutorRule = InstantTaskExecutorRule() @@ -49,7 +48,6 @@ class RoomFlowNodeTest { val mainDispatcherRule = MainDispatcherRule() private class FakeMessagesEntryPoint : MessagesEntryPoint { - var nodeId: String? = null var callback: MessagesEntryPoint.Callback? = null @@ -68,12 +66,10 @@ class RoomFlowNodeTest { } private class FakeRoomDetailsEntryPoint : RoomDetailsEntryPoint { - var nodeId: String? = null override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomDetailsEntryPoint.NodeBuilder { return object : RoomDetailsEntryPoint.NodeBuilder { - override fun params(params: RoomDetailsEntryPoint.Params): RoomDetailsEntryPoint.NodeBuilder { return this } diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt index d7b951fbbc..079ccab17a 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt @@ -36,7 +36,6 @@ import org.junit.Rule import org.junit.Test class LoggedInPresenterTest { - @get:Rule val warmUpRule = WarmUpRule() diff --git a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt index f2de790709..58e35b2d58 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt @@ -28,7 +28,6 @@ import kotlinx.coroutines.test.runTest import org.junit.Test class LoadingRoomStateFlowFactoryTest { - @Test fun `flow should emit Loading and then Loaded when there is a room in cache`() = runTest { val room = FakeMatrixRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID) diff --git a/build.gradle.kts b/build.gradle.kts index 3d152052f8..dfd0c009e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -100,8 +100,8 @@ allprojects { kotlinOptions.allWarningsAsErrors = project.properties["allWarningsAsErrors"] == "true" kotlinOptions { - // Uncomment to suppress Compose Kotlin compiler compatibility warning /* + // Uncomment to suppress Compose Kotlin compiler compatibility warning freeCompilerArgs += listOf( "-P", "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true" @@ -194,7 +194,7 @@ subprojects { // Workaround for https://github.com/airbnb/Showkase/issues/335 subprojects { - tasks.withType() { + tasks.withType { doLast { fileTree(layout.buildDirectory).apply { include("**/*ShowkaseExtension*.kt") }.files.forEach { file -> ReplaceRegExp().apply { diff --git a/features/call/src/main/kotlin/io/element/android/features/call/CallForegroundService.kt b/features/call/src/main/kotlin/io/element/android/features/call/CallForegroundService.kt index 7396ff34ab..5f12ace0ac 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/CallForegroundService.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/CallForegroundService.kt @@ -30,7 +30,6 @@ import io.element.android.features.call.ui.ElementCallActivity import io.element.android.libraries.designsystem.utils.CommonDrawables class CallForegroundService : Service() { - companion object { fun start(context: Context) { val intent = Intent(context, CallForegroundService::class.java) diff --git a/features/call/src/main/kotlin/io/element/android/features/call/data/WidgetMessage.kt b/features/call/src/main/kotlin/io/element/android/features/call/data/WidgetMessage.kt index 0d13c845b9..0d9be99cf7 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/data/WidgetMessage.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/data/WidgetMessage.kt @@ -28,7 +28,6 @@ data class WidgetMessage( @SerialName("action") val action: Action, @SerialName("data") val data: JsonElement? = null, ) { - @Serializable enum class Direction { @SerialName("fromWidget") diff --git a/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenPresenter.kt b/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenPresenter.kt index a7dfe5a33a..1ec75ed47d 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenPresenter.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenPresenter.kt @@ -63,7 +63,6 @@ class CallScreenPresenter @AssistedInject constructor( private val matrixClientsProvider: MatrixClientProvider, private val appCoroutineScope: CoroutineScope, ) : Presenter { - @AssistedFactory interface Factory { fun create(callType: CallType, navigator: CallScreenNavigator): CallScreenPresenter diff --git a/features/call/src/main/kotlin/io/element/android/features/call/utils/CallIntentDataParser.kt b/features/call/src/main/kotlin/io/element/android/features/call/utils/CallIntentDataParser.kt index 0814216745..c9f4532951 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/utils/CallIntentDataParser.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/utils/CallIntentDataParser.kt @@ -20,7 +20,6 @@ import android.net.Uri import javax.inject.Inject class CallIntentDataParser @Inject constructor() { - private val validHttpSchemes = sequenceOf("https") fun parse(data: String?): String? { diff --git a/features/call/src/main/kotlin/io/element/android/features/call/utils/WebViewWidgetMessageInterceptor.kt b/features/call/src/main/kotlin/io/element/android/features/call/utils/WebViewWidgetMessageInterceptor.kt index 92e5f67d51..c4676ac9dc 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/utils/WebViewWidgetMessageInterceptor.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/utils/WebViewWidgetMessageInterceptor.kt @@ -28,7 +28,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow class WebViewWidgetMessageInterceptor( private val webView: WebView, ) : WidgetMessageInterceptor { - companion object { // We call both the WebMessageListener and the JavascriptInterface objects in JS with this // 'listenerName' so they can both receive the data from the WebView when diff --git a/features/call/src/main/kotlin/io/element/android/features/call/utils/WidgetMessageSerializer.kt b/features/call/src/main/kotlin/io/element/android/features/call/utils/WidgetMessageSerializer.kt index 5ed9db028c..aa7424e9a3 100644 --- a/features/call/src/main/kotlin/io/element/android/features/call/utils/WidgetMessageSerializer.kt +++ b/features/call/src/main/kotlin/io/element/android/features/call/utils/WidgetMessageSerializer.kt @@ -20,7 +20,6 @@ import io.element.android.features.call.data.WidgetMessage import kotlinx.serialization.json.Json object WidgetMessageSerializer { - private val coder = Json { ignoreUnknownKeys = true } fun deserialize(message: String): Result { diff --git a/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt index fa60b348b1..6a24698efa 100644 --- a/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt +++ b/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt @@ -23,7 +23,6 @@ import io.element.android.features.call.ui.mapWebkitPermissions import org.junit.Test class MapWebkitPermissionsTest { - @Test fun `given Webkit's RESOURCE_AUDIO_CAPTURE returns Android's RECORD_AUDIO permission`() { val permission = mapWebkitPermissions(arrayOf(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) diff --git a/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt index 98e941b876..8eecc94e78 100644 --- a/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt +++ b/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt @@ -48,7 +48,6 @@ import org.junit.Rule import org.junit.Test class CallScreenPresenterTest { - @get:Rule val warmUpRule = WarmUpRule() diff --git a/features/call/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt index 1de1554846..093b6aab3b 100644 --- a/features/call/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt +++ b/features/call/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt @@ -24,7 +24,6 @@ import java.net.URLEncoder @RunWith(RobolectricTestRunner::class) class CallIntentDataParserTest { - private val callIntentDataParser = CallIntentDataParser() @Test diff --git a/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt index f7f17d794d..50d8c54998 100644 --- a/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt +++ b/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt @@ -32,7 +32,6 @@ import kotlinx.coroutines.test.runTest import org.junit.Test class DefaultCallWidgetProviderTest { - @Test fun `getWidget - fails if the session does not exist`() = runTest { val provider = createProvider(matrixClientProvider = FakeMatrixClientProvider { Result.failure(Exception("Session not found")) }) diff --git a/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt b/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt index e7a40d70ca..27e47ee708 100644 --- a/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt +++ b/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt @@ -25,7 +25,6 @@ class FakeCallWidgetProvider( private val widgetDriver: FakeWidgetDriver = FakeWidgetDriver(), private val url: String = "https://call.element.io", ) : CallWidgetProvider { - var getWidgetCalled = false private set diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt index a0ca30f199..5d15006e8b 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt @@ -152,7 +152,7 @@ private fun ReadReceiptsAvatars( contentAlignment = Alignment.CenterEnd, ) { receipts - .take(TimelineConfig.maxReadReceiptToDisplay) + .take(TimelineConfig.MAX_READ_RECEIPT_TO_DISPLAY) .reversed() .forEachIndexed { index, readReceiptData -> Box( @@ -170,9 +170,9 @@ private fun ReadReceiptsAvatars( } } } - if (receipts.size > TimelineConfig.maxReadReceiptToDisplay) { + if (receipts.size > TimelineConfig.MAX_READ_RECEIPT_TO_DISPLAY) { Text( - text = "+" + (receipts.size - TimelineConfig.maxReadReceiptToDisplay), + text = "+" + (receipts.size - TimelineConfig.MAX_READ_RECEIPT_TO_DISPLAY), style = ElementTheme.typography.fontBodyXsRegular, color = ElementTheme.colors.textSecondary, ) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt index c87b0ec68f..e6aae4da6e 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt @@ -229,7 +229,7 @@ private fun DefaultRoomListTopBar( contentDescription = stringResource(CommonStrings.action_search), ) } - if (RoomListConfig.hasDropdownMenu) { + if (RoomListConfig.HAS_DROP_DOWN_MENU) { var showMenu by remember { mutableStateOf(false) } IconButton( onClick = { showMenu = !showMenu } @@ -243,7 +243,7 @@ private fun DefaultRoomListTopBar( expanded = showMenu, onDismissRequest = { showMenu = false } ) { - if (RoomListConfig.showInviteMenuItem) { + if (RoomListConfig.SHOW_INVITE_MENU_ITEM) { DropdownMenuItem( onClick = { showMenu = false @@ -259,7 +259,7 @@ private fun DefaultRoomListTopBar( } ) } - if (RoomListConfig.showReportProblemMenuItem) { + if (RoomListConfig.SHOW_REPORT_PROBLEM_MENU_ITEM) { DropdownMenuItem( onClick = { showMenu = false diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt index 0723568881..e2e602c2b5 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt @@ -69,7 +69,7 @@ class SecureBackupRootNode @AssistedInject constructor( } private fun onLearnMoreClicked(uriHandler: UriHandler) { - uriHandler.openUri(SecureBackupConfig.LearnMoreUrl) + uriHandler.openUri(SecureBackupConfig.LEARN_MORE_URL) } @Composable diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt index cecf47eb1b..d7f7d5f4a6 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/AndroidClipboardHelper.kt @@ -31,7 +31,6 @@ import javax.inject.Inject class AndroidClipboardHelper @Inject constructor( @ApplicationContext private val context: Context, ) : ClipboardHelper { - private val clipboardManager = requireNotNull(context.getSystemService()) override fun copyPlainText(text: String) { diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt index 03cd70c768..1d93a207c6 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/clipboard/FakeClipboardHelper.kt @@ -17,7 +17,6 @@ package io.element.android.libraries.androidutils.clipboard class FakeClipboardHelper : ClipboardHelper { - var clipboardContents: Any? = null override fun copyPlainText(text: String) { diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt index 219441d5e6..9c58e2baa5 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DefaultDiffCallback.kt @@ -26,7 +26,6 @@ internal class DefaultDiffCallback( private val newList: List, private val areItemsTheSame: (oldItem: T?, newItem: T?) -> Boolean, ) : DiffUtil.Callback() { - override fun getOldListSize(): Int { return oldList.size } diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt index 3d1161e2e0..b0f93227cc 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCache.kt @@ -40,7 +40,6 @@ interface MutableDiffCache : DiffCache { * */ class MutableListDiffCache(private val mutableList: MutableList = ArrayList()) : MutableDiffCache { - override fun removeAt(index: Int): E? { return mutableList.removeAt(index) } diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt index 4ebdc3224f..d99aad185c 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheInvalidator.kt @@ -36,7 +36,6 @@ interface DiffCacheInvalidator { * It invalidates the cache by setting values to null. */ class DefaultDiffCacheInvalidator : DiffCacheInvalidator { - override fun onChanged(position: Int, count: Int, cache: MutableDiffCache) { for (i in position until position + count) { // Invalidate cache diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt index 500edcb135..d7d5125b58 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/diff/DiffCacheUpdater.kt @@ -36,7 +36,6 @@ class DiffCacheUpdater( private val cacheInvalidator: DiffCacheInvalidator = DefaultDiffCacheInvalidator(), private val areItemsTheSame: (oldItem: ListItem?, newItem: ListItem?) -> Boolean, ) { - private val lock = Object() private var prevOriginalList: List = emptyList() diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt index ef64c973df..38de169db3 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt @@ -27,7 +27,6 @@ import kotlin.contracts.contract */ @Stable sealed interface AsyncAction { - /** * Represents an uninitialized operation (i.e. yet to be run by the user). */ diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt index de547d87e6..75bb503390 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncData.kt @@ -27,7 +27,6 @@ import kotlin.contracts.contract */ @Stable sealed interface AsyncData { - /** * Represents a failed operation. * diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt index 82d5651825..126f95bdb7 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/HideOverlayBackPressHandler.kt @@ -25,7 +25,6 @@ import kotlinx.coroutines.flow.map class HideOverlayBackPressHandler : BaseBackPressHandlerStrategy() { - override val canHandleBackPressFlow: Flow by lazy { navModel.elements.map(::areThereElements) } diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt index e8f3e3ebc5..ebae1a3381 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/Overlay.kt @@ -40,7 +40,6 @@ class Overlay( savedStateMap = savedStateMap, key = key, ) { - override val initialElements: NavElements get() = emptyList() } diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt index e782d4537f..db3b71c2ef 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Hide.kt @@ -24,7 +24,6 @@ import kotlinx.parcelize.Parcelize @Parcelize class Hide : OverlayOperation { - override fun isApplicable(elements: BackStackElements): Boolean = elements.any { it.targetState == BackStack.State.ACTIVE } diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt index 90561127ef..1ed00e65b2 100644 --- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt +++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/overlay/operation/Show.kt @@ -29,7 +29,6 @@ import kotlinx.parcelize.RawValue data class Show( private val element: @RawValue T ) : OverlayOperation { - override fun isApplicable(elements: BackStackElements): Boolean = element != elements.activeElement diff --git a/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt b/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt index 32995d57ef..f661e6f61c 100644 --- a/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt +++ b/libraries/architecture/src/test/kotlin/io/element/android/libraries/architecture/AsyncDataKtTest.kt @@ -84,7 +84,6 @@ class AsyncDataKtTest { private class TestableMutableState( value: T ) : MutableState { - @Suppress("ktlint:standard:property-naming") private val _deque = ArrayDeque(listOf(value)) diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt index f5305f006b..48cc6e2e82 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/cache/CircularCache.kt @@ -21,7 +21,6 @@ package io.element.android.libraries.core.cache * This class is not thread safe. */ class CircularCache(cacheSize: Int, factory: (Int) -> Array) { - companion object { inline fun create(cacheSize: Int) = CircularCache(cacheSize) { Array(cacheSize) { null } } } diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt index 343f5ce351..d839be9dee 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt @@ -26,20 +26,6 @@ inline fun T.ooi(block: (T) -> Unit): T = also(block) */ fun CharSequence?.orEmpty() = this ?: "" -/** - * Check if a CharSequence is a phone number. - */ -/* -fun CharSequence.isMsisdn(): Boolean { - return try { - PhoneNumberUtil.getInstance().parse(ensurePrefix("+"), null) - true - } catch (e: NumberParseException) { - false - } -} - */ - /** * Useful to append a String at the end of a filename but before the extension if any * Ex: diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt index 1bec5524cd..eaafdf6f61 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/log/logger/LoggerTag.kt @@ -23,7 +23,6 @@ package io.element.android.libraries.core.log.logger * Timber.tag(loggerTag.value).v("My log message") */ open class LoggerTag(name: String, parentTag: LoggerTag? = null) { - object PushLoggerTag : LoggerTag("Push") object NotificationLoggerTag : LoggerTag("Notification", PushLoggerTag) diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt index 5a3baa1297..b9d6a91cb1 100644 --- a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt +++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/BasicExtensionsTest.kt @@ -20,7 +20,6 @@ import org.junit.Assert.assertEquals import org.junit.Test class BasicExtensionsTest { - @Test(expected = IllegalArgumentException::class) fun `test ellipsize at 0`() { "1234567890".ellipsize(0) diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt index 7f83c9de8f..42ac6cd31e 100644 --- a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt +++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt @@ -20,7 +20,6 @@ import com.google.common.truth.Truth.assertThat import org.junit.Test class ResultTest { - @Test fun testFlatMap() { val initial = Result.success("initial") diff --git a/libraries/deeplink/src/test/kotlin/io/element/android/libraries/deeplink/DeepLinkCreatorTest.kt b/libraries/deeplink/src/test/kotlin/io/element/android/libraries/deeplink/DeepLinkCreatorTest.kt index 70c047f8ed..5c43624655 100644 --- a/libraries/deeplink/src/test/kotlin/io/element/android/libraries/deeplink/DeepLinkCreatorTest.kt +++ b/libraries/deeplink/src/test/kotlin/io/element/android/libraries/deeplink/DeepLinkCreatorTest.kt @@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.test.A_THREAD_ID import org.junit.Test class DeepLinkCreatorTest { - @Test fun room() { val sut = DeepLinkCreator() diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt index 7bcb8bf1dd..810e0cae10 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarData.kt @@ -25,7 +25,6 @@ data class AvatarData( val url: String? = null, val size: AvatarSize, ) { - val initial by lazy { (name?.takeIf { it.isNotBlank() } ?: id) .let { dn -> diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt index 3da88c49a4..491d0637b0 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/ButtonVisuals.kt @@ -29,7 +29,6 @@ import io.element.android.libraries.designsystem.theme.components.TextButton */ @Immutable sealed interface ButtonVisuals { - val action: () -> Unit /** diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt index 1ebb67f75a..c96f7f5963 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt @@ -29,7 +29,8 @@ import androidx.lifecycle.Lifecycle * Inspired from https://stackoverflow.com/questions/68847559/how-can-i-detect-keyboard-opening-and-closing-in-jetpack-compose */ enum class Keyboard { - Opened, Closed + Opened, + Closed } // Note: it does not work as expected... diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt index 66c99fda45..063c17aac1 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt @@ -95,7 +95,6 @@ private fun PreferenceTopAppBar( overflow = TextOverflow.Ellipsis ) } - ) } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt index 648ea97434..0c3735547b 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt @@ -55,7 +55,7 @@ fun PreferenceTextField( style: ListItemStyle = ListItemStyle.Default, ) { var displayTextFieldDialog by rememberSaveable { mutableStateOf(false) } - val valueToDisplay = if (displayValue(value)) { value } else supportingText + val valueToDisplay = if (displayValue(value)) value else supportingText ListItem( modifier = modifier, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt index d80c32510a..a1f6e8ebcc 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt @@ -259,11 +259,14 @@ sealed interface IconSource { } enum class ButtonSize { - Medium, Large + Medium, + Large } internal enum class ButtonStyle { - Filled, Outlined, Text; + Filled, + Outlined, + Text; @Composable fun getColors(destructive: Boolean): ButtonColors = when (this) { diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt index 9a01cfe69c..0148f7e9a1 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/FloatingActionButton.kt @@ -38,7 +38,8 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup fun FloatingActionButton( onClick: () -> Unit, modifier: Modifier = Modifier, - shape: Shape = CircleShape, // FloatingActionButtonDefaults.shape, + // FloatingActionButtonDefaults.shape + shape: Shape = CircleShape, containerColor: Color = FloatingActionButtonDefaults.containerColor, contentColor: Color = contentColorFor(containerColor), elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(), diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt index b90d147983..081cc02e02 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt @@ -378,7 +378,6 @@ internal fun ListItemDisabledWithIconPreview() = PreviewItems.OneLineListItemPre @Suppress("ModifierMissing") private object PreviewItems { - @Composable fun ThreeLinesListItemPreview( modifier: Modifier = Modifier, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt index e6305d4dc2..aca326279d 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt @@ -81,7 +81,6 @@ fun ListSupportingText( } object ListSupportingTextDefaults { - /** Specifies the padding to use for the supporting text. */ @Immutable sealed interface Padding { diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt index d32d7de685..470f0d7b4e 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt @@ -151,7 +151,6 @@ fun SearchBar( } object ElementSearchBarDefaults { - @OptIn(ExperimentalMaterial3Api::class) @Composable fun inactiveColors() = SearchBarDefaults.colors( diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt index 2041d7998d..1ada4eb363 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt @@ -37,7 +37,7 @@ fun Slider( modifier: Modifier = Modifier, enabled: Boolean = true, valueRange: ClosedFloatingPointRange = 0f..1f, - /*@IntRange(from = 0)*/ + // @IntRange(from = 0) steps: Int = 0, onValueChangeFinished: (() -> Unit)? = null, colors: SliderColors = SliderDefaults.colors(), diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomBottomSheetScaffold.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomBottomSheetScaffold.kt index 734291ecd9..1cccaf0744 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomBottomSheetScaffold.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomBottomSheetScaffold.kt @@ -282,11 +282,13 @@ private fun CustomStandardBottomSheet( if (anchoredDraggableState.anchors.size > 1 && sheetSwipeEnabled) { if (currentValue == SheetValue.PartiallyExpanded) { expand(expandActionLabel) { - scope.launch { expand() }; true + scope.launch { expand() } + true } } else { collapse(partialExpandActionLabel) { - scope.launch { partialExpand() }; true + scope.launch { partialExpand() } + true } } if (!state.skipHiddenState) { @@ -314,7 +316,6 @@ private fun CustomStandardBottomSheet( */ @ExperimentalFoundationApi class DraggableAnchorsConfig { - internal val anchors = mutableMapOf() /** @@ -344,7 +345,6 @@ internal fun DraggableAnchors( ): DraggableAnchors = MapDraggableAnchors(DraggableAnchorsConfig().apply(builder).anchors) private class MapDraggableAnchors(private val anchors: Map) : DraggableAnchors { - override fun positionOf(value: T): Float = anchors[value] ?: Float.NaN override fun hasAnchorFor(value: T) = anchors.containsKey(value) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomSheetState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomSheetState.kt index 080681c0d8..d861a38a6a 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomSheetState.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/bottomsheet/CustomSheetState.kt @@ -51,7 +51,6 @@ constructor( confirmValueChange: (SheetValue) -> Boolean = { true }, internal val skipHiddenState: Boolean = false, ) { - /** * State of a sheet composable, such as [ModalBottomSheet] * diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt index 2eb4dda75d..11074f759b 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarHost.kt @@ -30,7 +30,8 @@ import io.element.android.libraries.designsystem.theme.components.Snackbar fun SnackbarHost(hostState: SnackbarHostState, modifier: Modifier = Modifier) { androidx.compose.material3.SnackbarHost(hostState, modifier) { data -> Snackbar( - modifier = Modifier.padding(12.dp), // Add default padding + // Add default padding + modifier = Modifier.padding(12.dp), message = data.visuals.message, action = data.visuals.actionLabel?.let { ButtonVisuals.Text(it, data::performAction) }, dismissAction = if (data.visuals.withDismissAction) { diff --git a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt index 2db042cdd0..29a1478b4d 100644 --- a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt +++ b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/colors/AvatarColorsTest.kt @@ -22,7 +22,6 @@ import io.element.android.compound.theme.avatarColorsLight import org.junit.Test class AvatarColorsTest { - @Test fun `ensure the size of the avatar color are equal for light and dark theme`() { assertThat(avatarColorsDark.size).isEqualTo(avatarColorsLight.size) diff --git a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTests.kt b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTests.kt index 65418141c5..68cded1601 100644 --- a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTests.kt +++ b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTests.kt @@ -22,7 +22,6 @@ import kotlinx.coroutines.test.runTest import org.junit.Test class SnackbarDispatcherTests { - @Test fun `given an empty queue the flow emits a null item`() = runTest { val snackbarDispatcher = SnackbarDispatcher() diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt index dd09188bc4..ce8a365bc4 100644 --- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt +++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt @@ -33,7 +33,6 @@ class RandomSecretPassphraseProvider( private val file: File, private val secretSize: Int = 256, ) : PassphraseProvider { - override fun getPassphrase(): ByteArray { val encryptedFile = EncryptedFileFactory(context).create(file) return if (!file.exists()) { diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt index b6cfff034a..650e9d27ef 100644 --- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt +++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapApplier.kt @@ -36,7 +36,6 @@ internal class MapApplier( val style: Style, val symbolManager: SymbolManager, ) : AbstractApplier(MapNodeRoot) { - private val decorations = mutableListOf() override fun onClear() { diff --git a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt index aad4701a2c..759061ac3d 100644 --- a/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt +++ b/libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapUpdater.kt @@ -42,7 +42,6 @@ internal class MapPropertiesNode( cameraPositionState: CameraPositionState, locationSettings: MapLocationSettings, ) : MapNode { - init { map.locationComponent.activateLocationComponent( LocationComponentActivationOptions.Builder(context, style) diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt index 19e71db332..b0470ed762 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverter.kt @@ -34,7 +34,7 @@ object MatrixToConverter { */ fun convert(uri: Uri): Uri? { val uriString = uri.toString() - val baseUrl = MatrixConfiguration.matrixToPermalinkBaseUrl + val baseUrl = MatrixConfiguration.MATRIX_TO_PERMALINK_BASE_URL return when { // URL is already a matrix.to diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt index 2a388ae580..36bcd9014b 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilder.kt @@ -26,7 +26,7 @@ object PermalinkBuilder { private const val ROOM_PATH = "room/" private const val USER_PATH = "user/" - private val permalinkBaseUrl get() = (MatrixConfiguration.clientPermalinkBaseUrl ?: MatrixConfiguration.matrixToPermalinkBaseUrl).also { + private val permalinkBaseUrl get() = (MatrixConfiguration.clientPermalinkBaseUrl ?: MatrixConfiguration.MATRIX_TO_PERMALINK_BASE_URL).also { var baseUrl = it if (!baseUrl.endsWith("/")) { baseUrl += "/" @@ -80,7 +80,7 @@ object PermalinkBuilder { private fun escapeId(value: String) = value.replace("/", "%2F") - private fun isMatrixTo(): Boolean = permalinkBaseUrl.startsWith(MatrixConfiguration.matrixToPermalinkBaseUrl) + private fun isMatrixTo(): Boolean = permalinkBaseUrl.startsWith(MatrixConfiguration.MATRIX_TO_PERMALINK_BASE_URL) } sealed class PermalinkBuilderError : Throwable() { diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt index e0f3e7748c..3e8534e415 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AttachmentThumbnail.kt @@ -136,7 +136,13 @@ fun AttachmentThumbnail( @Parcelize enum class AttachmentThumbnailType : Parcelable { - Image, Video, File, Audio, Location, Voice, Poll + Image, + Video, + File, + Audio, + Location, + Voice, + Poll, } @Parcelize diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt index 8945c46817..455041aabd 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt @@ -41,7 +41,6 @@ internal class CoilMediaFetcher( private val mediaData: MediaRequestData?, private val options: Options ) : Fetcher { - override suspend fun fetch(): FetchResult? { if (mediaData?.source == null) return null return when (mediaData.kind) { @@ -126,9 +125,7 @@ internal class CoilMediaFetcher( class AvatarFactory( private val context: Context, private val client: MatrixClient - ) : - Fetcher.Factory { - + ) : Fetcher.Factory { override fun create( data: AvatarData, options: Options, diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt index 5fdf6cb422..18629aa0e9 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaRequestData.kt @@ -33,7 +33,6 @@ data class MediaRequestData( val source: MediaSource?, val kind: Kind ) { - sealed interface Kind { data object Content : Kind data class File(val body: String?, val mimeType: String) : Kind diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToHtmlDocumentTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToHtmlDocumentTest.kt index d6c740b77d..704b87c593 100644 --- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToHtmlDocumentTest.kt +++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToHtmlDocumentTest.kt @@ -26,7 +26,6 @@ import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class ToHtmlDocumentTest { - @Test fun `toHtmlDocument - returns null if format is not HTML`() { val body = FormattedBody( diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToPlainTextTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToPlainTextTest.kt index 0bf72c9d0e..7c61075584 100644 --- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToPlainTextTest.kt +++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrixui/messages/ToPlainTextTest.kt @@ -28,7 +28,6 @@ import org.robolectric.RobolectricTestRunner @RunWith(RobolectricTestRunner::class) class ToPlainTextTest { - @Test fun `Document toPlainText - returns a plain text version of the document`() { val document = Jsoup.parse( diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt index e10bee2261..47048da5e9 100644 --- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt +++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/FormattedJsonHttpLogger.kt @@ -25,7 +25,6 @@ import timber.log.Timber internal class FormattedJsonHttpLogger( private val level: HttpLoggingInterceptor.Level ) : HttpLoggingInterceptor.Logger { - companion object { private const val INDENT_SPACE = 2 } diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt index d2650f853d..be7ed6bb8b 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt @@ -50,7 +50,7 @@ class PushersManager @Inject constructor( pushGatewayNotifyRequest.execute( PushGatewayNotifyRequest.Params( url = "TODO", // unifiedPushHelper.getPushGateway() ?: return, - appId = PushConfig.pusher_app_id, + appId = PushConfig.PUSHER_APP_ID, pushKey = "TODO", // unifiedPushHelper.getEndpointOrToken().orEmpty(), eventId = TEST_EVENT_ID ) @@ -85,7 +85,7 @@ class PushersManager @Inject constructor( ): SetHttpPusherData = SetHttpPusherData( pushKey = pushKey, - appId = PushConfig.pusher_app_id, + appId = PushConfig.PUSHER_APP_ID, profileTag = DEFAULT_PUSHER_FILE_TAG + "_" /* TODO + abs(activeSessionHolder.getActiveSession().myUserId.hashCode())*/, lang = "en", // TODO localeProvider.current().language, appDisplayName = buildMeta.applicationName, diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt index 7e208f414a..2dc724fb3d 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt @@ -38,7 +38,7 @@ class MarkAsReadActionFactory @Inject constructor( private val clock: SystemClock, ) { fun create(roomInfo: RoomEventGroupInfo): NotificationCompat.Action? { - if (!NotificationConfig.supportMarkAsReadAction) return null + if (!NotificationConfig.SUPPORT_MARK_AS_READ_ACTION) return null val sessionId = roomInfo.sessionId.value val roomId = roomInfo.roomId.value val intent = Intent(context, NotificationBroadcastReceiver::class.java) diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt index fd89ce455f..53af2c71d5 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt @@ -43,7 +43,7 @@ class QuickReplyActionFactory @Inject constructor( private val clock: SystemClock, ) { fun create(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): NotificationCompat.Action? { - if (!NotificationConfig.supportQuickReplyAction) return null + if (!NotificationConfig.SUPPORT_QUICK_REPLY_ACTION) return null val sessionId = roomInfo.sessionId val roomId = roomInfo.roomId return buildQuickReplyIntent(sessionId, roomId, threadId)?.let { replyPendingIntent ->