From 6249b537185cedc90b55e391562ccf5d4c16cd05 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Sun, 25 Feb 2024 16:20:26 +0100 Subject: [PATCH] Fix some warnings & recreate lint-baseline.xml (#4278) --- app/lint-baseline.xml | 164 +++++++++++------- app/lint.xml | 1 + .../media/AccountMediaRemoteMediator.kt | 2 +- .../account/media/AccountMediaViewModel.kt | 2 +- .../components/compose/ComposeActivity.kt | 2 +- .../compose/dialog/CaptionDialog.kt | 2 +- .../notifications/NotificationFetcher.kt | 2 +- .../viewthread/edits/ViewEditsAdapter.kt | 1 - .../viewthread/edits/ViewEditsFragment.kt | 1 - .../com/keylesspalace/tusky/entity/Filter.kt | 4 +- .../keylesspalace/tusky/entity/MastoList.kt | 2 +- .../tusky/entity/Notification.kt | 2 +- .../tusky/service/TuskyTileService.kt | 4 +- .../tusky/settings/SettingsConstants.kt | 2 +- .../tusky/util/AlertDialogExtensions.kt | 2 +- .../keylesspalace/tusky/util/LinkHelper.kt | 1 - 16 files changed, 119 insertions(+), 75 deletions(-) diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 9f06397e7..4270a991b 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -1,5 +1,27 @@ - + + + + + + + + + + message="Overriding `@layout/exo_player_control_view` which is marked as private in androidx.media3:media3-ui:1.2.1. If deliberate, use tools:override="true", otherwise pick a different name."> @@ -219,7 +241,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -230,7 +252,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -241,106 +263,106 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -351,7 +373,7 @@ errorLine2=" ~~~~~"> @@ -362,7 +384,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -373,7 +395,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -384,7 +406,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -395,7 +417,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -406,7 +428,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -417,7 +439,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -472,7 +494,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -483,7 +505,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -494,7 +516,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -505,7 +527,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -516,7 +538,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -593,7 +615,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -604,7 +626,7 @@ errorLine2=" ^"> @@ -615,7 +637,7 @@ errorLine2=" ^"> @@ -895,14 +917,36 @@ + id="RtlHardcoded" + message="Consider replacing `android:layout_marginLeft` with `android:layout_marginStart="8dp"` to better support right-to-left layouts" + errorLine1=" android:layout_marginLeft="8dp"" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> + file="src/main/res/layout/item_list.xml" + line="37" + column="9"/> + + + + + + + + + diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaRemoteMediator.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaRemoteMediator.kt index 52535a6a5..77fb1dfb1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaRemoteMediator.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaRemoteMediator.kt @@ -59,7 +59,7 @@ class AccountMediaRemoteMediator( } val attachments = statuses.flatMap { status -> - AttachmentViewData.list(status, activeAccount.alwaysShowSensitiveMedia ?: false) + AttachmentViewData.list(status, activeAccount.alwaysShowSensitiveMedia) } if (loadType == LoadType.REFRESH) { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaViewModel.kt index ee5ffd011..b42a7282d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaViewModel.kt @@ -27,7 +27,7 @@ import com.keylesspalace.tusky.viewdata.AttachmentViewData import javax.inject.Inject class AccountMediaViewModel @Inject constructor( - private val accountManager: AccountManager, + accountManager: AccountManager, api: MastodonApi ) : ViewModel() { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index 91383e381..ba13556a5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -966,7 +966,7 @@ class ComposeActivity : private fun onMediaPick() { addMediaBehavior.addBottomSheetCallback( - object : BottomSheetBehavior.BottomSheetCallback() { + object : BottomSheetCallback() { override fun onStateChanged(bottomSheet: View, newState: Int) { // Wait until bottom sheet is not collapsed and show next screen after if (newState == BottomSheetBehavior.STATE_COLLAPSED) { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt index 2edffbf15..154c83ed8 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt @@ -54,7 +54,7 @@ class CaptionDialog : DialogFragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ) = inflater.inflate(R.layout.dialog_image_description, container, false) + ): View = inflater.inflate(R.layout.dialog_image_description, container, false) override fun onViewCreated(view: View, savedInstanceState: Bundle?) { val imageView = binding.imageDescriptionView diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationFetcher.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationFetcher.kt index 3d73ec0eb..91e97a41d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationFetcher.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationFetcher.kt @@ -41,7 +41,7 @@ data class Links(val next: String?, val prev: String?) { * * Should only be called by a worker thread. * - * @see NotificationWorker + * @see com.keylesspalace.tusky.worker.NotificationWorker * @see Background worker */ @WorkerThread diff --git a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsAdapter.kt index f1b0df430..493610f8c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsAdapter.kt @@ -40,7 +40,6 @@ import org.xml.sax.XMLReader class ViewEditsAdapter( private val edits: List, - private val animateAvatars: Boolean, private val animateEmojis: Boolean, private val useBlurhash: Boolean, private val listener: LinkListener diff --git a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt index a2af2831c..d03ed9e8d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt @@ -135,7 +135,6 @@ class ViewEditsFragment : binding.recyclerView.adapter = ViewEditsAdapter( edits = uiState.edits, - animateAvatars = animateAvatars, animateEmojis = animateEmojis, useBlurhash = useBlurhash, listener = this@ViewEditsFragment diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt index d273d58c6..14f9f80c2 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Filter.kt @@ -21,7 +21,7 @@ data class Filter( HIDE("hide"); companion object { - fun from(action: String): Action = values().firstOrNull { it.action == action } ?: WARN + fun from(action: String): Action = entries.firstOrNull { it.action == action } ?: WARN } } enum class Kind(val kind: String) { @@ -32,7 +32,7 @@ data class Filter( ACCOUNT("account"); companion object { - fun from(kind: String): Kind = values().firstOrNull { it.kind == kind } ?: PUBLIC + fun from(kind: String): Kind = entries.firstOrNull { it.kind == kind } ?: PUBLIC } } diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt b/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt index 119f55299..d1e807f30 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/MastoList.kt @@ -35,7 +35,7 @@ data class MastoList( companion object { fun from(policy: String?): ReplyPolicy = - values().firstOrNull { it.policy == policy } ?: LIST + entries.firstOrNull { it.policy == policy } ?: LIST } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt index 471f036d2..03a61af54 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt @@ -69,7 +69,7 @@ data class Notification( companion object { @JvmStatic fun byString(s: String): Type { - values().forEach { + entries.forEach { if (s == it.presentation) { return it } diff --git a/app/src/main/java/com/keylesspalace/tusky/service/TuskyTileService.kt b/app/src/main/java/com/keylesspalace/tusky/service/TuskyTileService.kt index 74a58714b..86d64075c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/service/TuskyTileService.kt +++ b/app/src/main/java/com/keylesspalace/tusky/service/TuskyTileService.kt @@ -15,6 +15,7 @@ package com.keylesspalace.tusky.service +import android.annotation.SuppressLint import android.app.PendingIntent import android.content.Intent import android.os.Build @@ -28,6 +29,8 @@ import com.keylesspalace.tusky.components.compose.ComposeActivity */ class TuskyTileService : TileService() { + @SuppressLint("StartActivityAndCollapseDeprecated") + @Suppress("DEPRECATION") override fun onClick() { val intent = MainActivity.composeIntent(this, ComposeActivity.ComposeOptions()) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) @@ -36,7 +39,6 @@ class TuskyTileService : TileService() { val pendingIntent = PendingIntent.getActivity(this, 1, intent, PendingIntent.FLAG_IMMUTABLE) startActivityAndCollapse(pendingIntent) } else { - @Suppress("DEPRECATION") startActivityAndCollapse(intent) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt index ae8b15a73..6005c9600 100644 --- a/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt +++ b/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt @@ -9,7 +9,7 @@ enum class AppTheme(val value: String) { AUTO_SYSTEM_BLACK("auto_system_black"); companion object { - fun stringValues() = values().map { it.value }.toTypedArray() + fun stringValues() = entries.map { it.value }.toTypedArray() @JvmField val DEFAULT = AUTO_SYSTEM diff --git a/app/src/main/java/com/keylesspalace/tusky/util/AlertDialogExtensions.kt b/app/src/main/java/com/keylesspalace/tusky/util/AlertDialogExtensions.kt index b79671a53..70362db50 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/AlertDialogExtensions.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/AlertDialogExtensions.kt @@ -35,7 +35,7 @@ suspend fun AlertDialog.await( positiveText: String, negativeText: String? = null, neutralText: String? = null -) = suspendCancellableCoroutine { cont -> +) = suspendCancellableCoroutine { cont -> val listener = DialogInterface.OnClickListener { _, which -> cont.resume(which) { dismiss() } } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt index ed38db1d1..7770d54dc 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt @@ -41,7 +41,6 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent import androidx.core.net.toUri -import androidx.core.text.getSpans import androidx.preference.PreferenceManager import at.connyduck.sparkbutton.helpers.Utils import com.google.android.material.color.MaterialColors