javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Formatting

Browse Source
This commit is contained in:
arkon
2022-04-08 16:44:23 -04:00
parent 2dfafa387b
commit 5afff31f72
197 changed files with 481 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt
+1 -1
View File
@@ -48,5 +48,5 @@ private val strokeColor = Color.rgb(45, 45, 45)
// A span object with text outlining properties
private val spanOutline = OutlineSpan(
strokeColor = strokeColor,
strokeWidth = 4f
strokeWidth = 4f,
)
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+18 -18
View File
@@ -349,7 +349,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
action = MainActivity.SHORTCUT_MANGA
putExtra(MangaController.MANGA_EXTRA, id)
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
}
},
)
}
}
@@ -363,7 +363,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
override fun onStopTrackingTouch(slider: Slider) {
isScrollingThroughPages = false
}
})
},)
binding.pageSlider.addOnChangeListener { slider, value, fromUser ->
if (viewer != null && fromUser) {
isScrollingThroughPages = true
@@ -406,13 +406,13 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
it.foreground = RippleDrawable(
ColorStateList.valueOf(getThemeColor(android.R.attr.colorControlHighlight)),
null,
it.background
it.background,
)
}
val toolbarColor = ColorUtils.setAlphaComponent(
toolbarBackground.resolvedTintColor,
toolbarBackground.alpha
toolbarBackground.alpha,
)
window.statusBarColor = toolbarColor
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
@@ -431,7 +431,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
setOnClickListener {
popupMenu(
items = ReadingModeType.values().map { it.flagValue to it.stringRes },
selectedItemId = presenter.getMangaReadingMode(resolveDefault = false)
selectedItemId = presenter.getMangaReadingMode(resolveDefault = false),
) {
val newReadingMode = ReadingModeType.fromPreference(itemId)
@@ -465,7 +465,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
R.string.on
} else {
R.string.off
}
},
)
}
}
@@ -485,7 +485,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
popupMenu(
items = OrientationType.values().map { it.flagValue to it.stringRes },
selectedItemId = presenter.manga?.orientationType
?: preferences.defaultOrientationType()
?: preferences.defaultOrientationType(),
) {
val newOrientation = OrientationType.fromPreference(itemId)
@@ -530,7 +530,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
R.drawable.ic_crop_24dp
} else {
R.drawable.ic_crop_off_24dp
}
},
)
}
@@ -553,7 +553,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
// Fix status bar being translucent the first time it's opened.
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
}
}
},
)
binding.toolbar.startAnimation(toolbarAnimation)
@@ -579,7 +579,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
override fun onAnimationEnd(animation: Animation) {
binding.readerMenu.isVisible = false
}
}
},
)
binding.toolbar.startAnimation(toolbarAnimation)
@@ -610,7 +610,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
if (window.sharedElementEnterTransition is MaterialContainerTransform) {
// Wait until transition is complete to avoid crash on API 26
window.sharedElementEnterTransition.addListener(
onEnd = { setOrientation(presenter.getMangaOrientationType()) }
onEnd = { setOrientation(presenter.getMangaOrientationType()) },
)
} else {
setOrientation(presenter.getMangaOrientationType())
@@ -832,7 +832,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
val intent = uri.toShareIntent(
context = applicationContext,
message = getString(R.string.share_page_info, manga.title, chapter.name, page.number)
message = getString(R.string.share_page_info, manga.title, chapter.name, page.number),
)
startActivity(Intent.createChooser(intent, getString(R.string.action_share)))
}
@@ -878,7 +878,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
Success -> R.string.cover_updated
AddToLibraryFirst -> R.string.notification_first_add_to_library
Error -> R.string.notification_cover_update_failed
}
},
)
}
@@ -925,12 +925,12 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
-1f, 0f, 0f, 0f, 255f,
0f, -1f, 0f, 0f, 255f,
0f, 0f, -1f, 0f, 255f,
0f, 0f, 0f, 1f, 0f
)
)
0f, 0f, 0f, 1f, 0f,
),
),
)
}
}
},
)
}
}
@@ -947,7 +947,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
2 -> R.color.reader_background_dark
3 -> automaticBackgroundColor()
else -> android.R.color.black
}
},
)
}
.launchIn(lifecycleScope)
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+13 -13
View File
@@ -225,7 +225,7 @@ class ReaderPresenter(
{ _, _ ->
// Ignore onNext event
},
ReaderActivity::setInitialChapterError
ReaderActivity::setInitialChapterError,
)
}
@@ -260,7 +260,7 @@ class ReaderPresenter(
{ _, _ ->
// Ignore onNext event
},
ReaderActivity::setInitialChapterError
ReaderActivity::setInitialChapterError,
)
}
@@ -283,9 +283,9 @@ class ReaderPresenter(
ViewerChapters(
chapter,
chapterList.getOrNull(chapterPos - 1),
chapterList.getOrNull(chapterPos + 1)
chapterList.getOrNull(chapterPos + 1),
)
}
},
)
.observeOn(AndroidSchedulers.mainThread())
.doOnNext { newChapters ->
@@ -336,7 +336,7 @@ class ReaderPresenter(
},
{ _, _ ->
// Ignore onError event, viewers handle that state
}
},
)
}
@@ -531,7 +531,7 @@ class ReaderPresenter(
view.setManga(manga)
view.setChapters(currChapters)
}
})
},)
}
/**
@@ -562,7 +562,7 @@ class ReaderPresenter(
if (currChapters != null) {
view.setOrientation(getMangaOrientationType())
}
})
},)
}
/**
@@ -575,7 +575,7 @@ class ReaderPresenter(
val chapter = page.chapter.chapter
val filenameSuffix = " - ${page.number}"
return DiskUtil.buildValidFilename(
"${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize())
"${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize()),
) + filenameSuffix
}
@@ -603,8 +603,8 @@ class ReaderPresenter(
image = Image.Page(
inputStream = page.stream!!,
name = filename,
location = Location.Pictures.create(relativePath)
)
location = Location.Pictures.create(relativePath),
),
)
launchUI {
notifier.onComplete(uri)
@@ -640,8 +640,8 @@ class ReaderPresenter(
image = Image.Page(
inputStream = page.stream!!,
name = filename,
location = Location.Cache
)
location = Location.Cache,
),
)
launchUI {
view!!.onShareImageResult(uri, page)
@@ -683,7 +683,7 @@ class ReaderPresenter(
.observeOn(AndroidSchedulers.mainThread())
.subscribeFirst(
{ view, result -> view.onSetAsCoverResult(result) },
{ view, _ -> view.onSetAsCoverResult(SetAsCoverResult.Error) }
{ view, _ -> view.onSetAsCoverResult(SetAsCoverResult.Error) },
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
+3 -3
View File
@@ -47,7 +47,7 @@ class SaveImageNotifier(private val context: Context) {
},
onError = {
onError(null)
}
},
)
.build()
context.imageLoader.enqueue(request)
@@ -69,13 +69,13 @@ class SaveImageNotifier(private val context: Context) {
addAction(
R.drawable.ic_share_24dp,
context.getString(R.string.action_share),
NotificationReceiver.shareImagePendingBroadcast(context, uri.path!!, notificationId)
NotificationReceiver.shareImagePendingBroadcast(context, uri.path!!, notificationId),
)
// Delete action
addAction(
R.drawable.ic_delete_24dp,
context.getString(R.string.action_delete),
NotificationReceiver.deleteImagePendingBroadcast(context, uri.path!!, notificationId)
NotificationReceiver.deleteImagePendingBroadcast(context, uri.path!!, notificationId),
)
updateNotification()
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/EpubPageLoader.kt
+1 -1
View File
@@ -49,7 +49,7 @@ class EpubPageLoader(file: File) : PageLoader() {
Page.ERROR
} else {
Page.READY
}
},
)
}
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class HttpPageLoader(
if (error !is InterruptedException) {
logcat(LogPriority.ERROR, error)
}
}
},
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt
+1 -1
View File
@@ -63,7 +63,7 @@ class RarPageLoader(file: File) : PageLoader() {
Page.ERROR
} else {
Page.READY
}
},
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
+1 -1
View File
@@ -58,7 +58,7 @@ class ZipPageLoader(file: File) : PageLoader() {
Page.ERROR
} else {
Page.READY
}
},
)
}
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
+3 -3
View File
@@ -54,7 +54,7 @@ class ReaderSettingsSheet(
activity.setMenuVisibility(!isFilterTab)
}
}
})
},)
if (showColorFilterSettings) {
binding.tabs.getTabAt(filterTabIndex)?.select()
@@ -64,12 +64,12 @@ class ReaderSettingsSheet(
override fun getTabViews() = listOf(
readingModeSettings,
generalSettings,
colorFilterSettings
colorFilterSettings,
)
override fun getTabTitles() = listOf(
R.string.pref_category_reading_mode,
R.string.pref_category_general,
R.string.custom_filter
R.string.custom_filter,
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt
+6 -6
View File
@@ -102,7 +102,7 @@ open class ReaderPageImageView @JvmOverloads constructor(
override fun onImageLoadError(e: Exception) {
onImageLoadError()
}
}
},
)
}
}
@@ -123,7 +123,7 @@ open class ReaderPageImageView @JvmOverloads constructor(
.withEasing(EASE_IN_OUT_QUAD)
.withInterruptible(true)
.start()
}, 500)
}, 500,)
}
}
@@ -233,7 +233,7 @@ open class ReaderPageImageView @JvmOverloads constructor(
override fun onCenterChanged(newCenter: PointF?, origin: Int) {
// Not used
}
}
},
)
setOnClickListener { this@ReaderPageImageView.onViewClicked() }
}
@@ -271,7 +271,7 @@ open class ReaderPageImageView @JvmOverloads constructor(
override fun onImageLoadError(e: Exception) {
this@ReaderPageImageView.onImageLoadError()
}
}
},
)
when (image) {
@@ -314,7 +314,7 @@ open class ReaderPageImageView @JvmOverloads constructor(
this@ReaderPageImageView.onViewClicked()
return super.onSingleTapConfirmed(e)
}
}
},
)
setOnScaleChangeListener { _, _, _ ->
this@ReaderPageImageView.onScaleChanged(scale)
@@ -350,7 +350,7 @@ open class ReaderPageImageView @JvmOverloads constructor(
},
onError = {
this@ReaderPageImageView.onImageLoadError()
}
},
)
.crossfade(false)
.build()
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class ReaderProgressIndicator @JvmOverloads constructor(
Animation.RELATIVE_TO_SELF,
0.5F,
Animation.RELATIVE_TO_SELF,
0.5F
0.5F,
).apply {
interpolator = LinearInterpolator()
repeatCount = Animation.INFINITE
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerNavigation.kt
+1 -1
View File
@@ -24,7 +24,7 @@ abstract class ViewerNavigation {
fun invert(invertMode: PreferenceValues.TappingInvertMode): Region {
if (invertMode == PreferenceValues.TappingInvertMode.NONE) return this
return this.copy(
rectF = this.rectF.invert(invertMode)
rectF = this.rectF.invert(invertMode),
)
}
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/EdgeNavigation.kt
+4 -4
View File
@@ -18,15 +18,15 @@ class EdgeNavigation : ViewerNavigation() {
override var regions: List<Region> = listOf(
Region(
rectF = RectF(0f, 0f, 0.33f, 1f),
type = NavigationRegion.NEXT
type = NavigationRegion.NEXT,
),
Region(
rectF = RectF(0.33f, 0.66f, 0.66f, 1f),
type = NavigationRegion.PREV
type = NavigationRegion.PREV,
),
Region(
rectF = RectF(0.66f, 0f, 1f, 1f),
type = NavigationRegion.NEXT
)
type = NavigationRegion.NEXT,
),
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/KindlishNavigation.kt
+3 -3
View File
@@ -18,11 +18,11 @@ class KindlishNavigation : ViewerNavigation() {
override var regions: List<Region> = listOf(
Region(
rectF = RectF(0.33f, 0.33f, 1f, 1f),
type = NavigationRegion.NEXT
type = NavigationRegion.NEXT,
),
Region(
rectF = RectF(0f, 0.33f, 0.33f, 1f),
type = NavigationRegion.PREV
)
type = NavigationRegion.PREV,
),
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/LNavigation.kt
+5 -5
View File
@@ -18,19 +18,19 @@ open class LNavigation : ViewerNavigation() {
override var regions: List<Region> = listOf(
Region(
rectF = RectF(0f, 0.33f, 0.33f, 0.66f),
type = NavigationRegion.PREV
type = NavigationRegion.PREV,
),
Region(
rectF = RectF(0f, 0f, 1f, 0.33f),
type = NavigationRegion.PREV
type = NavigationRegion.PREV,
),
Region(
rectF = RectF(0.66f, 0.33f, 1f, 0.66f),
type = NavigationRegion.NEXT
type = NavigationRegion.NEXT,
),
Region(
rectF = RectF(0f, 0.66f, 1f, 1f),
type = NavigationRegion.NEXT
)
type = NavigationRegion.NEXT,
),
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/navigation/RightAndLeftNavigation.kt
+3 -3
View File
@@ -18,11 +18,11 @@ class RightAndLeftNavigation : ViewerNavigation() {
override var regions: List<Region> = listOf(
Region(
rectF = RectF(0f, 0f, 0.33f, 1f),
type = NavigationRegion.LEFT
type = NavigationRegion.LEFT,
),
Region(
rectF = RectF(0.66f, 0f, 1f, 1f),
type = NavigationRegion.RIGHT
)
type = NavigationRegion.RIGHT,
),
)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
+2 -2
View File
@@ -55,7 +55,7 @@ class PagerConfig(
theme = it
automaticBackground = it == 3
},
{ imagePropertyChangedListener?.invoke() }
{ imagePropertyChangedListener?.invoke() },
)
preferences.imageScaleType()
@@ -89,7 +89,7 @@ class PagerConfig(
{
imagePropertyChangedListener?.invoke()
dualPageSplitChangedListener?.invoke(it)
}
},
)
preferences.dualPageInvertPaged()
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+2 -2
View File
@@ -227,8 +227,8 @@ class PagerPageHolder(
minimumScaleType = viewer.config.imageScaleType,
cropBorders = viewer.config.imageCropBorders,
zoomStartPosition = viewer.config.imageZoomType,
landscapeZoom = viewer.config.landscapeZoom
)
landscapeZoom = viewer.config.landscapeZoom,
),
)
if (!isAnimated) {
pageBackground = background
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
+1 -1
View File
@@ -92,7 +92,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
override fun onPageScrollStateChanged(state: Int) {
isIdle = state == ViewPager.SCROLL_STATE_IDLE
}
}
},
)
pager.tapListener = f@{ event ->
val pos = PointF(event.rawX / pager.width, event.rawY / pager.height)
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
+2 -2
View File
@@ -260,8 +260,8 @@ class WebtoonPageHolder(
ReaderPageImageView.Config(
zoomDuration = viewer.config.doubleTapAnimDuration,
minimumScaleType = SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH,
cropBorders = viewer.config.imageCropBorders
)
cropBorders = viewer.config.imageCropBorders,
),
)
}
// Keep the Rx stream alive to close the input stream only when unsubscribed
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt
+1 -1
View File
@@ -164,7 +164,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor(
currentScale *= scaleFactor
currentScale = currentScale.coerceIn(
MIN_RATE,
MAX_SCALE_RATE
MAX_SCALE_RATE,
)
setScaleRate(currentScale)
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
+2 -2
View File
@@ -104,7 +104,7 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr
}
}
}
}
},
)
recycler.tapListener = f@{ event ->
val pos = PointF(event.rawX / recycler.width, event.rawY / recycler.height)
@@ -344,7 +344,7 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr
adapter.refresh()
adapter.notifyItemRangeChanged(
max(0, position - 3),
min(position + 3, adapter.itemCount - 1)
min(position + 3, adapter.itemCount - 1),
)
}
}