prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Koitharu
2025-02-18 20:05:26 +02:00
parent cb36772fd9
commit ed9ed8e964
24 changed files with 30 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
View File

@@ -1,38 +0,0 @@
package org.koitharu.kotatsu.bookmarks.ui.adapter
import androidx.lifecycle.LifecycleOwner
import coil3.ImageLoader
import coil3.request.allowRgb565
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
import org.koitharu.kotatsu.core.util.ext.bookmarkExtra
import org.koitharu.kotatsu.core.util.ext.decodeRegion
import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
import org.koitharu.kotatsu.core.util.ext.enqueueWith
import org.koitharu.kotatsu.core.util.ext.newImageRequest
import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
// TODO check usages
fun bookmarkListAD(
coil: ImageLoader,
lifecycleOwner: LifecycleOwner,
clickListener: OnListItemClickListener<Bookmark>,
) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
) {
AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
bind {
binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
size(CoverSizeResolver(binding.imageViewThumb))
defaultPlaceholders(context)
allowRgb565(true)
bookmarkExtra(item)
decodeRegion(item.scroll)
enqueueWith(coil)
}
}
}

2
app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt
View File

@@ -610,7 +610,7 @@ class AppRouter private constructor(
Intent(context, CloudFlareActivity::class.java).apply {
data = exception.url.toUri()
putExtra(KEY_SOURCE, exception.source?.name)
exception.headers.get(CommonHeaders.USER_AGENT)?.let {
exception.headers[CommonHeaders.USER_AGENT]?.let {
putExtra(KEY_USER_AGENT, it)
}
}

2
app/src/main/kotlin/org/koitharu/kotatsu/core/os/NetworkState.kt
View File

@@ -69,7 +69,7 @@ class NetworkState(
return true
}
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
activeNetwork?.let { isOnline(it) } ?: false
activeNetwork?.let { isOnline(it) } == true
} else {
@Suppress("DEPRECATION")
activeNetworkInfo?.isConnected == true

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScrollRecyclerView.kt
View File

@@ -37,8 +37,8 @@ class FastScrollRecyclerView @JvmOverloads constructor(
init {
fastScroller.id = R.id.fast_scroller
fastScroller.layoutParams = ViewGroup.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT,
)
}

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt
View File

@@ -229,7 +229,7 @@ class FastScroller @JvmOverloads constructor(
*
* @param params The [ViewGroup.LayoutParams] for this view, cannot be null
*/
override fun setLayoutParams(params: ViewGroup.LayoutParams) {
override fun setLayoutParams(params: LayoutParams) {
params.width = LayoutParams.WRAP_CONTENT
super.setLayoutParams(params)
}
@@ -529,7 +529,7 @@ class FastScroller @JvmOverloads constructor(
private fun findValidParent(view: View): ViewGroup? = view.ancestors.firstNotNullOfOrNull { p ->
if (p is FrameLayout || p is ConstraintLayout || p is CoordinatorLayout || p is RelativeLayout) {
p as ViewGroup
p
} else {
null
}

2
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/IconsView.kt
View File

@@ -15,7 +15,7 @@ class IconsView @JvmOverloads constructor(
attrs: AttributeSet? = null,
) : LinearLayout(context, attrs) {
private var iconSize = LinearLayout.LayoutParams.WRAP_CONTENT
private var iconSize = LayoutParams.WRAP_CONTENT
private var iconSpacing = 0
val iconsCount: Int

2
app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/pages/PagesViewModel.kt
View File

@@ -137,7 +137,7 @@ class PagesViewModel @Inject constructor(
this += PageThumbnail(
isCurrent = readerState?.let {
page.chapterId == it.chapterId && page.index == it.page
} ?: false,
} == true,
page = page,
)
}

2
app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterFieldLayout.kt
View File

@@ -47,7 +47,7 @@ class FilterFieldLayout @JvmOverloads constructor(
if (!isInitialized) {
return
}
assert(child.id != View.NO_ID)
assert(child.id != NO_ID)
val lp = (child.layoutParams as? LayoutParams) ?: (generateDefaultLayoutParams() as LayoutParams)
lp.alignWithParent = true
lp.width = 0

2
app/src/main/kotlin/org/koitharu/kotatsu/list/domain/ReadingProgress.kt
View File

@@ -31,7 +31,7 @@ data class ReadingProgress(
CHAPTERS_LEFT -> totalChapters > 0 && percent in 0f..1f
}
fun isCompleted() = Companion.isCompleted(percent)
fun isCompleted() = isCompleted(percent)
fun isReversed() = mode == PERCENT_LEFT || mode == CHAPTERS_LEFT

2
app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt
View File

@@ -54,7 +54,7 @@ class PreviewViewModel @Inject constructor(
return@combine null
}
val b = m.getPreferredBranch(history)
val chapters = m.getChapters(b).orEmpty()
val chapters = m.getChapters(b)
FooterInfo(
percent = history?.percent ?: PROGRESS_NONE,
currentChapter = history?.chapterId?.let {

2
app/src/main/kotlin/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt
View File

@@ -63,7 +63,7 @@ class LocalChaptersRemoveService : CoroutineIntentService() {
.setAutoCancel(true)
.setContentIntent(ErrorReporterReceiver.getPendingIntent(applicationContext, error))
.build()
val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
val nm = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
nm.notify(NOTIFICATION_ID + startId, notification)
}

2
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt
View File

@@ -132,7 +132,7 @@ class WebtoonImageView @JvmOverloads constructor(
val paint = debugPaint ?: Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = android.graphics.Color.RED
strokeWidth = context.resources.resolveDp(2f)
textAlign = android.graphics.Paint.Align.LEFT
textAlign = Paint.Align.LEFT
textSize = context.resources.resolveDp(14f)
debugPaint = this
}

2
app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/adapter/SearchResultsAD.kt
View File

@@ -1,7 +1,6 @@
package org.koitharu.kotatsu.search.ui.multi.adapter
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.lifecycle.LifecycleOwner
import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
import coil3.ImageLoader
@@ -46,7 +45,6 @@ fun searchResultsAD(
bind {
binding.textViewTitle.text = item.getTitle(context)
binding.buttonMore.isVisible = item.hasMore
adapter.items = item.list
adapter.notifyDataSetChanged()
binding.recyclerView.isGone = item.list.isEmpty()

3
app/src/main/kotlin/org/koitharu/kotatsu/settings/reader/ReaderTapGridConfigActivity.kt
View File

@@ -116,8 +116,7 @@ class ReaderTapGridConfigActivity : BaseActivity<ActivityReaderTapActionsBinding
view.background = createBackground(actions?.tapAction)
}
}
@Suppress("IfThenToElvis") // lint bug
// lint bug
private fun TapAction?.getText(): String = if (this != null) {
getString(nameStringResId)
} else {

3
app/src/main/kotlin/org/koitharu/kotatsu/widget/recent/RecentWidgetConfigActivity.kt
View File

@@ -1,6 +1,5 @@
package org.koitharu.kotatsu.widget.recent
import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.os.Bundle
@@ -47,7 +46,7 @@ class RecentWidgetConfigActivity :
config.hasBackground = viewBinding.switchBackground.isChecked
updateWidget()
setResult(
Activity.RESULT_OK,
RESULT_OK,
Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId),
)
finish()

2
app/src/main/kotlin/org/koitharu/kotatsu/widget/shelf/ShelfWidgetConfigActivity.kt
View File

@@ -67,7 +67,7 @@ class ShelfWidgetConfigActivity :
config.hasBackground = viewBinding.switchBackground.isChecked
updateWidget()
setResult(
Activity.RESULT_OK,
RESULT_OK,
Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, config.widgetId),
)
finish()

64
app/src/main/res/layout/layout_reading_progress.xml
View File

@@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="?materialCardViewOutlinedStyle"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp">
<TextView
android:id="@+id/textView_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:textAppearance="?textAppearanceTitleSmall"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="46 chapters" />
<TextView
android:id="@+id/textView_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:textAppearance="?textAppearanceSubtitle1"
app:layout_constraintBaseline_toBaselineOf="@id/textView_title"
app:layout_constraintEnd_toEndOf="parent"
tools:text="12%" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progress"
style="@style/Widget.Material3.LinearProgressIndicator"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:indeterminate="false"
android:max="100"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textView_title"
tools:progress="12" />
<TextView
android:id="@+id/textView_secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:textAppearance="?textAppearanceBodySmall"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/progress"
tools:text="@string/incognito_mode" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>

6
app/src/main/res/values-hr/strings.xml
View File

@@ -690,8 +690,8 @@
<string name="demographic_kodomo">Kodomo</string>
<string name="pages_saved">Stranice su spremljene</string>
<string name="unstable_feature">Nestabilna funkcija</string>
<string name="no_fix_required">s\\ ne zahtijeva popravljanje</string>
<string name="no_alternatives_found">Za s\\ nisu pronađene alternative</string>
<string name="no_fix_required">%s ne zahtijeva popravljanje</string>
<string name="no_alternatives_found">Za %s nisu pronađene alternative</string>
<string name="popular_in_hour">Popularno u ovom satu</string>
<string name="popular_today">Popularno danas</string>
<string name="popular_in_month">Popularno ovaj mjesec</string>
@@ -764,4 +764,4 @@
<string name="source">Izvor</string>
<string name="author">Autor</string>
<string name="telegram_chat_id">Telegram chat ID</string>
</resources>
</resources>

1
app/src/main/res/values-in/strings.xml
View File

@@ -770,6 +770,5 @@
<string name="handle_links">Menangani tautan</string>
<string name="handle_links_summary">Menangani tautan manga dari aplikasi eksternal (misalnya browser web). Anda mungkin juga perlu mengaktifkannya secara manual di pengaturan sistem aplikasi.</string>
<string name="any">Setiap</string>
<string name="plugin_incompatible_with_cause">Daftar</string>
<string name="author">Pengarang</string>
</resources>

2
app/src/main/res/values-sr/strings.xml
View File

@@ -592,7 +592,7 @@
<string name="migration_completed">Премештање је завршено</string>
<string name="alternatives">Замене</string>
<string name="migrate">Премести</string>
<string name="migrate_confirmation">Манга 1$s из 2$s ће бити замењена са 3$s из 4$s у вашој Историји и Омиљеним (ако постоји)</string>
<string name="migrate_confirmation">Манга %1$s из %2$s ће бити замењена са %3$s из %4$s у вашој Историји и Омиљеним (ако постоји)</string>
<string name="delete_read_chapters_summary">Избриши поглавља која си већ прочитао из локалне меморије да би ослободио простор</string>
<string name="delete_read_chapters_prompt">Ово ће трајно избрисати сва поглавља означена као прочитана из твог локалног складишта. Можеш их поново преузети касније, али увезена поглавља могу бити изгубљена заувек</string>
<string name="long_ago_read">Давно прочитано</string>

6
app/src/main/res/values-ta/strings.xml
View File

@@ -552,7 +552,7 @@
<string name="periodic_backups_enable">அவ்வப்போது காப்புப்பிரதிகளை இயக்கவும்</string>
<string name="backups_output_directory">காப்புப்பிரதிகள் வெளியீட்டு அடைவு</string>
<string name="last_successful_backup">கடைசி வெற்றிகரமான காப்புப்பிரதி: %s</string>
<string name="speed_value">எக்ச்%.1 எஃப்</string>
<string name="speed_value">எக்ச்%.1f எஃப்</string>
<string name="content_type_manga">மங்கா</string>
<string name="content_type_hentai">என்டாய்</string>
<string name="content_type_comics">காமிக்ச்</string>
@@ -709,7 +709,7 @@
<string name="downloads_background">பின்னணி பதிவிறக்கங்கள்</string>
<string name="download_new_chapters">புதிய அத்தியாயங்களைப் பதிவிறக்கவும்</string>
<string name="manga_with_downloaded_chapters">பதிவிறக்கம் செய்யப்பட்ட அத்தியாயங்களுடன் மங்கா</string>
<string name="manga_replaced">மங்கா \"%1$s\" (%2$s) \"%3$s\" (%4 $ S) உடன் மாற்றப்பட்டது</string>
<string name="manga_replaced">மங்கா \"%1$s\" (%2$s) \"%3$s\" (%4$s) உடன் மாற்றப்பட்டது</string>
<string name="fixing_manga">மங்காவை சரிசெய்தல்</string>
<string name="fixed">வெற்றிகரமாக சரி செய்யப்பட்டது</string>
<string name="no_fix_required">\"%s\" க்கு பிழைத்திருத்தம் தேவையில்லை</string>
@@ -765,4 +765,4 @@
<string name="enable_all_sources">அனைத்து மங்கா ஆதாரங்களையும் இயக்கவும்</string>
<string name="enable_all_sources_summary">கிடைக்கக்கூடிய அனைத்து மங்கா ஆதாரங்களும் நிரந்தரமாக இயக்கப்படும்</string>
<string name="demographic_kodomo">கோடோமோ</string>
</resources>
</resources>

4
app/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

4
app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>