mirror of
https://github.com/null2264/yokai.git
synced 2025-06-21 10:44:42 +00:00
Fix change week when custom period (#1405)
* Fix change week when custom period * Remove cancel job for now since starDate may be updated while endDate is not * Cancel job when clicking on arrow to allow multiple clicks * Add year check just in case Co-authored-by: Jays2Kings <jays2kings@gmail.com>
This commit is contained in:
nzoba
GitHub
parent
7ad3f2b504
commit
79e54c33eb
3 changed files with 53 additions and 55 deletions
|
|
@ -57,13 +57,13 @@ import eu.kanade.tachiyomi.util.system.toInt
|
|||
import eu.kanade.tachiyomi.util.system.toLocalCalendar
|
||||
import eu.kanade.tachiyomi.util.system.toUtcCalendar
|
||||
import eu.kanade.tachiyomi.util.system.withIOContext
|
||||
import eu.kanade.tachiyomi.util.system.withUIContext
|
||||
import eu.kanade.tachiyomi.util.view.backgroundColor
|
||||
import eu.kanade.tachiyomi.util.view.compatToolTipText
|
||||
import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsetsCompat
|
||||
import eu.kanade.tachiyomi.util.view.isControllerVisible
|
||||
import eu.kanade.tachiyomi.util.view.liftAppbarWith
|
||||
import eu.kanade.tachiyomi.util.view.setOnQueryTextChangeListener
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.launch
|
||||
import timber.log.Timber
|
||||
import java.util.Calendar
|
||||
|
|
@ -90,6 +90,7 @@ class StatsDetailsController :
|
|||
* Selected day in the read duration stat
|
||||
*/
|
||||
private var highlightedDay: Calendar? = null
|
||||
private var jobReadDuration: Job? = null
|
||||
|
||||
/**
|
||||
* Returns the toolbar title to show when this controller is attached.
|
||||
|
|
@ -234,7 +235,7 @@ class StatsDetailsController :
|
|||
|
||||
dialog.dismiss()
|
||||
presenter.sortCurrentStats()
|
||||
resetLayout(updateChipsVisibility = false, resetReadDuration = false)
|
||||
resetLayout()
|
||||
updateStats()
|
||||
}
|
||||
.setNegativeButton(android.R.string.cancel, null)
|
||||
|
|
@ -254,15 +255,15 @@ class StatsDetailsController :
|
|||
dialog.addOnPositiveButtonClickListener { utcMillis ->
|
||||
binding.progress.isVisible = true
|
||||
viewScope.launch {
|
||||
withIOContext {
|
||||
presenter.updateReadDurationPeriod(
|
||||
utcMillis.first.toLocalCalendar()?.timeInMillis ?: utcMillis.first,
|
||||
utcMillis.second.toLocalCalendar()?.timeInMillis
|
||||
?: utcMillis.second,
|
||||
)
|
||||
}
|
||||
presenter.updateReadDurationPeriod(
|
||||
utcMillis.first.toLocalCalendar()?.timeInMillis ?: utcMillis.first,
|
||||
utcMillis.second.toLocalCalendar()?.timeInMillis
|
||||
?: utcMillis.second,
|
||||
)
|
||||
withIOContext { presenter.updateMangaHistory() }
|
||||
binding.statsDateText.text = presenter.getPeriodString()
|
||||
statsBarChart.highlightValues(null)
|
||||
highlightedDay = null
|
||||
presenter.getStatisticData()
|
||||
}
|
||||
}
|
||||
|
|
@ -328,66 +329,59 @@ class StatsDetailsController :
|
|||
/**
|
||||
* Changes dates of the read duration stat with the arrows
|
||||
* @param referenceDate date used to determine if should change week
|
||||
* @param weeksToAdd number of weeks to add or remove
|
||||
* @param toAdd whether to add or remove
|
||||
*/
|
||||
private fun changeDatesReadDurationWithArrow(referenceDate: Calendar, weeksToAdd: Int) {
|
||||
private fun changeDatesReadDurationWithArrow(referenceDate: Calendar, toAdd: Int) {
|
||||
jobReadDuration?.cancel()
|
||||
with(binding) {
|
||||
if (highlightedDay == null) {
|
||||
changeWeekReadDuration(weeksToAdd)
|
||||
changeReadDurationPeriod(toAdd)
|
||||
} else {
|
||||
val newDaySelected = highlightedDay?.get(Calendar.DAY_OF_MONTH)
|
||||
val endDay = referenceDate.get(Calendar.DAY_OF_MONTH)
|
||||
val daySelected = highlightedDay?.get(Calendar.DAY_OF_YEAR)
|
||||
val endDay = referenceDate.get(Calendar.DAY_OF_YEAR)
|
||||
statsBarChart.highlightValues(null)
|
||||
if (newDaySelected == endDay) {
|
||||
changeWeekReadDuration(weeksToAdd)
|
||||
if (!statsBarChart.isVisible) {
|
||||
highlightedDay = null
|
||||
return
|
||||
}
|
||||
}
|
||||
highlightedDay = Calendar.getInstance().apply {
|
||||
timeInMillis = highlightedDay!!.timeInMillis
|
||||
add(Calendar.DAY_OF_WEEK, weeksToAdd)
|
||||
add(Calendar.DAY_OF_YEAR, toAdd)
|
||||
}
|
||||
val highlightValue = presenter.historyByDayAndManga.keys.toTypedArray()
|
||||
.indexOfFirst { it.get(Calendar.DAY_OF_MONTH) == highlightedDay?.get(Calendar.DAY_OF_MONTH) }
|
||||
if (highlightValue == -1) {
|
||||
highlightedDay = null
|
||||
changeDatesReadDurationWithArrow(referenceDate, weeksToAdd)
|
||||
return
|
||||
}
|
||||
statsBarChart.highlightValue(highlightValue.toFloat(), 0)
|
||||
statsBarChart.marker.refreshContent(
|
||||
statsBarChart.data.dataSets[0].getEntryForXValue(highlightValue.toFloat(), 0f),
|
||||
statsBarChart.getHighlightByTouchPoint(highlightValue.toFloat(), 0f),
|
||||
)
|
||||
if (daySelected == endDay) {
|
||||
changeReadDurationPeriod(toAdd)
|
||||
} else updateHighlightedValue()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes week of the read duration stat
|
||||
* @param weeksToAdd number of weeks to add or remove
|
||||
* @param toAdd whether to add or remove
|
||||
*/
|
||||
private fun changeWeekReadDuration(weeksToAdd: Int) {
|
||||
if (weeksToAdd > 0) {
|
||||
presenter.startDate.apply {
|
||||
time = presenter.endDate.time
|
||||
add(Calendar.DAY_OF_YEAR, 1)
|
||||
}
|
||||
} else {
|
||||
presenter.startDate.apply {
|
||||
add(Calendar.WEEK_OF_YEAR, -1)
|
||||
}
|
||||
}
|
||||
private fun changeReadDurationPeriod(toAdd: Int) {
|
||||
val millionSeconds = presenter.endDate.timeInMillis - presenter.startDate.timeInMillis
|
||||
val days = TimeUnit.MILLISECONDS.toDays(millionSeconds) + 1
|
||||
presenter.startDate.add(Calendar.DAY_OF_YEAR, toAdd * days.toInt())
|
||||
presenter.updateReadDurationPeriod(presenter.startDate.timeInMillis, days.toInt())
|
||||
binding.progress.isVisible = true
|
||||
viewScope.launchIO {
|
||||
presenter.updateReadDurationPeriod(presenter.startDate.timeInMillis)
|
||||
withUIContext { binding.statsDateText.text = presenter.getPeriodString() }
|
||||
jobReadDuration = viewScope.launchIO {
|
||||
presenter.updateMangaHistory()
|
||||
presenter.getStatisticData()
|
||||
}
|
||||
}
|
||||
|
||||
private fun updateHighlightedValue() {
|
||||
with(binding) {
|
||||
val highlightValue = presenter.historyByDayAndManga.keys.toTypedArray().indexOfFirst {
|
||||
it.get(Calendar.DAY_OF_YEAR) == highlightedDay?.get(Calendar.DAY_OF_YEAR) &&
|
||||
it.get(Calendar.YEAR) == highlightedDay?.get(Calendar.YEAR)
|
||||
}
|
||||
if (highlightValue == -1) return
|
||||
statsBarChart.highlightValue(highlightValue.toFloat(), 0)
|
||||
statsBarChart.marker.refreshContent(
|
||||
statsBarChart.data.dataSets[0].getEntryForXValue(highlightValue.toFloat(), 0f),
|
||||
statsBarChart.getHighlightByTouchPoint(highlightValue.toFloat(), 0f),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
|
||||
inflater.inflate(R.menu.stats_bar, menu)
|
||||
searchItem = menu.findItem(R.id.action_search)
|
||||
|
|
@ -466,7 +460,7 @@ class StatsDetailsController :
|
|||
*/
|
||||
private fun resetAndSetup(
|
||||
updateChipsVisibility: Boolean = true,
|
||||
resetReadDuration: Boolean = updateChipsVisibility,
|
||||
resetReadDuration: Boolean = true,
|
||||
) {
|
||||
resetLayout(updateChipsVisibility, resetReadDuration)
|
||||
presenter.getStatisticData()
|
||||
|
|
@ -487,7 +481,7 @@ class StatsDetailsController :
|
|||
* @param updateChipsVisibility whether to update the chips visibility
|
||||
* @param resetReadDuration whether to reset the read duration values
|
||||
*/
|
||||
private fun resetLayout(updateChipsVisibility: Boolean = false, resetReadDuration: Boolean = updateChipsVisibility) {
|
||||
private fun resetLayout(updateChipsVisibility: Boolean = false, resetReadDuration: Boolean = false) {
|
||||
with(binding) {
|
||||
progress.isVisible = true
|
||||
scrollView.isInvisible = true
|
||||
|
|
@ -519,6 +513,7 @@ class StatsDetailsController :
|
|||
statsPieChart.isVisible = false
|
||||
statsBarChart.isVisible = false
|
||||
statsLineChart.isVisible = false
|
||||
highlightedDay = null
|
||||
} else {
|
||||
binding.noChartData.hide()
|
||||
handleLayout()
|
||||
|
|
@ -526,6 +521,7 @@ class StatsDetailsController :
|
|||
scrollView.isVisible = true
|
||||
progress.isVisible = false
|
||||
totalDurationStatsText.text = adapter?.list?.sumOf { it.readDuration }?.getReadDuration()
|
||||
if (highlightedDay != null) updateHighlightedValue() else statsDateText.text = presenter.getPeriodString()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ class StatsDetailsPresenter(
|
|||
/**
|
||||
* Update the start date and end date according to time selected and fetch the history of the period
|
||||
*/
|
||||
fun updateReadDurationPeriod(millis: Long) {
|
||||
fun updateReadDurationPeriod(millis: Long, days: Int) {
|
||||
startDate = Calendar.getInstance().apply {
|
||||
timeInMillis = millis
|
||||
set(Calendar.HOUR_OF_DAY, 0)
|
||||
|
|
@ -567,8 +567,11 @@ class StatsDetailsPresenter(
|
|||
}
|
||||
endDate = Calendar.getInstance().apply {
|
||||
timeInMillis = startDate.timeInMillis - 1
|
||||
add(Calendar.WEEK_OF_YEAR, 1)
|
||||
add(Calendar.DAY_OF_YEAR, days)
|
||||
}
|
||||
}
|
||||
|
||||
fun updateMangaHistory() {
|
||||
history = getMangaHistoryGroupedByDay()
|
||||
}
|
||||
|
||||
|
|
@ -589,7 +592,6 @@ class StatsDetailsPresenter(
|
|||
add(Calendar.DAY_OF_YEAR, 1)
|
||||
timeInMillis -= 1
|
||||
}
|
||||
history = getMangaHistoryGroupedByDay()
|
||||
}
|
||||
|
||||
fun convertCalendarToLongString(calendar: Calendar): String {
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintDimensionRatio="@fraction/chartRatio"
|
||||
app:layout_constraintEnd_toStartOf="@id/manga_stats_status_recycler_view"
|
||||
app:layout_constraintHeight_max="300dp"
|
||||
app:layout_constraintHeight_max="600dp"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue