From fdac8a03800e9fa3042e57c1abf42b4d39a54118 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 11 Apr 2021 18:16:15 -0400 Subject: [PATCH] Lint fixes/ignore some errors (cherry picked from commit a3f1b721269b421dde67b8fd4e7017cf6c891c06) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt --- .../kanade/tachiyomi/data/preference/PreferenceValues.kt | 4 ++++ .../browse/source/globalsearch/GlobalSearchController.kt | 7 ++++++- build.gradle.kts | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 7a089eb97..a91ed03c0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -5,6 +5,8 @@ package eu.kanade.tachiyomi.data.preference */ object PreferenceValues { + /* ktlint-disable experimental:enum-entry-name-case */ + // Keys are lowercase to match legacy string values enum class ThemeMode { light, @@ -28,6 +30,8 @@ object PreferenceValues { hotpink, } + /* ktlint-enable experimental:enum-entry-name-case */ + enum class DisplayMode { COMPACT_GRID, COMFORTABLE_GRID, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt index 9991eba15..ac44e90d2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt @@ -1,7 +1,12 @@ package eu.kanade.tachiyomi.ui.browse.source.globalsearch import android.os.Bundle -import android.view.* +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup import androidx.appcompat.widget.SearchView import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager diff --git a/build.gradle.kts b/build.gradle.kts index 6ecabefce..fde3520ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,6 +20,9 @@ subprojects { kotlinter { experimentalRules = true + + // Doesn't play well with Android Studio + disabledRules = arrayOf("experimental:argument-list-wrapping") } }