mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 09:39:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

rewrite next/previous episode functions

Browse source
This commit is contained in:
jmir1 2022-04-10 17:49:44 +02:00
parent 56b2c12a97
commit 6de403b404
7 changed files with 40 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt
View file

@ -68,7 +68,8 @@ abstract class SearchableNucleusController<VB : ViewBinding, P : BasePresenter<*
editable.getSpans(0, editable.length, CharacterStyle::class.java)
.forEach { editable.removeSpan(it) }
}
},)
},
)
searchView.queryTextEvents()
.onEach {

65
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
View file

@ -307,8 +307,8 @@ class PlayerActivity :
binding.playbackSeekbar.setOnSeekBarChangeListener(seekBarChangeListener)
// player.playFile(currentVideoList!!.first().videoUrl!!.toString())
binding.nextBtn.setOnClickListener { goNextEpisode() }
binding.prevBtn.setOnClickListener { goPreviousEpisode() }
binding.nextBtn.setOnClickListener { switchEpisode(false) }
binding.prevBtn.setOnClickListener { switchEpisode(true) }
if (presenter?.needsInit() == true) {
val anime = intent.extras!!.getLong("anime", -1)
@ -323,39 +323,30 @@ class PlayerActivity :
playerIsDestroyed = false
}
private fun goNextEpisode() {
/**
* Switches to the previous episode if [previous] is true,
* to the next episode if [previous] is false
*/
private fun switchEpisode(previous: Boolean) {
val switchMethod = if (previous) presenter::previousEpisode else presenter::nextEpisode
val errorRes = if (previous) R.string.no_previous_episode else R.string.no_next_episode
presenter.saveEpisodeProgress(player.timePos, player.duration)
presenter.saveEpisodeHistory()
val wasPlayerPaused = player.paused
player.paused = true
showLoadingIndicator(true)
val nEpTxt = presenter.nextEpisode {
val epTxt = switchMethod {
if (wasPlayerPaused == false) {
player.paused = false
}
}
when {
nEpTxt == "Invalid" -> return
nEpTxt == null -> { launchUI { toast(R.string.no_next_episode) }; showLoadingIndicator(false) }
isInPipMode -> launchUI { toast(nEpTxt) }
}
}
private fun goPreviousEpisode() {
val wasPlayerPaused = player.paused
player.paused = true
showLoadingIndicator(true)
val pEpTxt = presenter.previousEpisode {
if (wasPlayerPaused == false) {
player.paused = false
}
}
when {
pEpTxt == "Invalid" -> return
pEpTxt == null -> { launchUI { toast(R.string.no_previous_episode) }; showLoadingIndicator(false) }
isInPipMode -> launchUI { toast(pEpTxt) }
epTxt == "Invalid" -> return
epTxt == null -> { launchUI { toast(errorRes) }; showLoadingIndicator(false) }
isInPipMode -> launchUI { toast(epTxt) }
}
}
@ -848,11 +839,11 @@ class PlayerActivity :
updatePictureInPictureActions(false)
}
CONTROL_TYPE_PREVIOUS -> {
goPreviousEpisode()
switchEpisode(true)
player.paused?.let { updatePictureInPictureActions(!it) }
}
CONTROL_TYPE_NEXT -> {
goNextEpisode()
switchEpisode(false)
player.paused?.let { updatePictureInPictureActions(!it) }
}
}
@ -882,7 +873,7 @@ class PlayerActivity :
iconResId: Int,
titleResId: Int,
requestCode: Int,
controlType: Int
controlType: Int,
): RemoteAction {
return RemoteAction(
Icon.createWithResource(this, iconResId),
@ -893,14 +884,14 @@ class PlayerActivity :
requestCode,
Intent(ACTION_MEDIA_CONTROL)
.putExtra(EXTRA_CONTROL_TYPE, controlType),
PendingIntent.FLAG_IMMUTABLE
)
PendingIntent.FLAG_IMMUTABLE,
),
)
}
@RequiresApi(Build.VERSION_CODES.O)
fun updatePictureInPictureActions(
playing: Boolean
playing: Boolean,
): PictureInPictureParams {
val mPictureInPictureParams = PictureInPictureParams.Builder()
// Set action items for the picture-in-picture mode. These are the only custom controls
@ -912,7 +903,7 @@ class PlayerActivity :
R.drawable.ic_skip_previous_24dp,
R.string.action_previous_episode,
CONTROL_TYPE_PREVIOUS,
REQUEST_PREVIOUS
REQUEST_PREVIOUS,
),
if (playing) {
@ -920,24 +911,24 @@ class PlayerActivity :
R.drawable.ic_pause_24dp,
R.string.action_pause,
CONTROL_TYPE_PAUSE,
REQUEST_PAUSE
REQUEST_PAUSE,
)
} else {
createRemoteAction(
R.drawable.ic_play_arrow_24dp,
R.string.action_play,
CONTROL_TYPE_PLAY,
REQUEST_PLAY
REQUEST_PLAY,
)
},
createRemoteAction(
R.drawable.ic_skip_next_24dp,
R.string.action_next_episode,
CONTROL_TYPE_NEXT,
REQUEST_NEXT
)
REQUEST_NEXT,
),
)
),
)
.setAspectRatio(player.videoAspect?.times(10000)?.let { Rational(it.toInt(), 10000) })
.build()

3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -363,7 +363,8 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
override fun onStopTrackingTouch(slider: Slider) {
isScrollingThroughPages = false
}
},)
},
)
binding.pageSlider.addOnChangeListener { slider, value, fromUser ->
if (viewer != null && fromUser) {
isScrollingThroughPages = true

3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
View file

@ -54,7 +54,8 @@ class ReaderSettingsSheet(
activity.setMenuVisibility(!isFilterTab)
}
}
},)
},
)
if (showColorFilterSettings) {
binding.tabs.getTabAt(filterTabIndex)?.select()

3
app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt
View file

@ -120,7 +120,8 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor(
currentAnimator = null
postInvalidate()
}
},)
},
)
}
internal class SavedState : AbsSavedState {

3
app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreference.kt
View file

@ -42,7 +42,8 @@ class ThemesPreference @JvmOverloads constructor(context: Context, attrs: Attrib
super.onScrolled(recyclerView, dx, dy)
lastScrollPosition = recyclerView.computeHorizontalScrollOffset()
}
},)
},
)
lastScrollPosition?.let { scrollToOffset(it) }
}

3
app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt
View file

@ -49,6 +49,7 @@ class BottomSheetViewPager @JvmOverloads constructor(
override fun onPageSelected(position: Int) {
requestLayout()
}
},)
},
)
}
}