From 08d6c604bc65755ec635c4cc425b4adf0284c4ee Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 25 Dec 2025 17:42:40 -0500 Subject: [PATCH] Cleanup --- .../tachiyomi/data/track/mangaupdates/MangaUpdates.kt | 2 +- .../tachiyomi/ui/browse/source/browse/AutoCompleteItem.kt | 6 +++--- .../tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt | 2 +- app/src/main/java/exh/log/XLogLogcatLogger.kt | 1 - app/src/main/java/exh/ui/login/EhLoginActivity.kt | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt index a66f2391c..61ddeb3be 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt @@ -118,7 +118,7 @@ class MangaUpdates(id: Long) : BaseTracker(id, "MangaUpdates"), DeletableTracker override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { val series = api.getSeries(track) - return series?.let { + return series.let { TrackMangaMetadata( it.seriesId, it.title?.htmlDecode(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/AutoCompleteItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/AutoCompleteItem.kt index 19cb1652e..08bd2321d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/AutoCompleteItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/AutoCompleteItem.kt @@ -11,13 +11,13 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExposedDropdownMenuAnchorType import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.InputChip import androidx.compose.material3.InputChipDefaults import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -155,7 +155,7 @@ fun AutoCompleteTextField( null }, modifier = Modifier - .menuAnchor(MenuAnchorType.PrimaryEditable) + .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryEditable) .fillMaxWidth() .runOnEnterKeyPressed { submit() }, singleLine = true, @@ -190,7 +190,7 @@ fun AutoCompleteTextField( if (value.text.length > 2 && filteredValues.isNotEmpty()) { ExposedDropdownMenu( modifier = Modifier - .exposedDropdownSize(matchTextFieldWidth = true), + .exposedDropdownSize(matchAnchorWidth = true), expanded = expanded, onDismissRequest = { expanded = false }, ) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt index 8e93f628d..a1d2ab4eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt @@ -146,7 +146,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { // Will skip insert page otherwise if (insertPageLastPage != null) { - viewer.moveToPage(insertPageLastPage!!) + viewer.moveToPage(insertPageLastPage) } } diff --git a/app/src/main/java/exh/log/XLogLogcatLogger.kt b/app/src/main/java/exh/log/XLogLogcatLogger.kt index e60de448f..a27923fa4 100644 --- a/app/src/main/java/exh/log/XLogLogcatLogger.kt +++ b/app/src/main/java/exh/log/XLogLogcatLogger.kt @@ -18,7 +18,6 @@ class XLogLogcatLogger : LogcatLogger { LogPriority.INFO -> LogLevel.Info.int LogPriority.DEBUG -> LogLevel.Debug.int LogPriority.VERBOSE -> LogLevel.Verbose.int - else -> LogLevel.All.int } } } diff --git a/app/src/main/java/exh/ui/login/EhLoginActivity.kt b/app/src/main/java/exh/ui/login/EhLoginActivity.kt index ed793c441..16aa4c176 100644 --- a/app/src/main/java/exh/ui/login/EhLoginActivity.kt +++ b/app/src/main/java/exh/ui/login/EhLoginActivity.kt @@ -155,9 +155,9 @@ class EhLoginActivity : BaseActivity() { if (memberId == null || passHash == null || igneous == null) return false // Update prefs - exhPreferences.memberIdVal().set(memberId!!) - exhPreferences.passHashVal().set(passHash!!) - exhPreferences.igneousVal().set(igneous!!) + exhPreferences.memberIdVal().set(memberId) + exhPreferences.passHashVal().set(passHash) + exhPreferences.igneousVal().set(igneous) return true }