|
|
@ -5,6 +5,7 @@
|
|
|
|
package org.mozilla.fenix.library.history
|
|
|
|
package org.mozilla.fenix.library.history
|
|
|
|
|
|
|
|
|
|
|
|
import android.content.Context
|
|
|
|
import android.content.Context
|
|
|
|
|
|
|
|
import android.text.format.DateUtils
|
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.View
|
|
|
|
import android.view.View
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import android.view.ViewGroup
|
|
|
@ -18,13 +19,15 @@ import kotlinx.android.synthetic.main.history_header.view.*
|
|
|
|
import kotlinx.android.synthetic.main.history_list_item.view.*
|
|
|
|
import kotlinx.android.synthetic.main.history_list_item.view.*
|
|
|
|
import mozilla.components.browser.menu.BrowserMenu
|
|
|
|
import mozilla.components.browser.menu.BrowserMenu
|
|
|
|
import org.mozilla.fenix.components.SectionedAdapter
|
|
|
|
import org.mozilla.fenix.components.SectionedAdapter
|
|
|
|
import java.util.*
|
|
|
|
import java.lang.IllegalStateException
|
|
|
|
|
|
|
|
import java.util.Date
|
|
|
|
|
|
|
|
import java.util.Calendar
|
|
|
|
|
|
|
|
|
|
|
|
class HistoryList(val history: List<HistoryItem>) {
|
|
|
|
private class HistoryList(val history: List<HistoryItem>) {
|
|
|
|
enum class Range {
|
|
|
|
enum class Range {
|
|
|
|
Today, ThisWeek, ThisMonth, Older;
|
|
|
|
Today, ThisWeek, ThisMonth, Older;
|
|
|
|
|
|
|
|
|
|
|
|
fun humanReadable(context: Context) : String = when (this) {
|
|
|
|
fun humanReadable(context: Context): String = when (this) {
|
|
|
|
Today -> context.getString(R.string.history_today)
|
|
|
|
Today -> context.getString(R.string.history_today)
|
|
|
|
ThisWeek -> context.getString(R.string.history_this_week)
|
|
|
|
ThisWeek -> context.getString(R.string.history_this_week)
|
|
|
|
ThisMonth -> context.getString(R.string.history_this_month)
|
|
|
|
ThisMonth -> context.getString(R.string.history_this_month)
|
|
|
@ -39,19 +42,21 @@ class HistoryList(val history: List<HistoryItem>) {
|
|
|
|
return grouped[range] ?: listOf()
|
|
|
|
return grouped[range] ?: listOf()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fun item(range: Range, index: Int): HistoryItem? = grouped[range]?.let { it[index] }
|
|
|
|
|
|
|
|
|
|
|
|
private val grouped: Map<Range, List<HistoryItem>>
|
|
|
|
private val grouped: Map<Range, List<HistoryItem>>
|
|
|
|
|
|
|
|
|
|
|
|
init {
|
|
|
|
init {
|
|
|
|
val oneDayAgo = getDaysAgo(1).time
|
|
|
|
val oneDayAgo = getDaysAgo(zero_days).time
|
|
|
|
val sevenDaysAgo = getDaysAgo(7).time
|
|
|
|
val sevenDaysAgo = getDaysAgo(seven_days).time
|
|
|
|
val thirtyDaysAgo = getDaysAgo(30).time
|
|
|
|
val thirtyDaysAgo = getDaysAgo(thirty_days).time
|
|
|
|
|
|
|
|
|
|
|
|
val lastWeek = LongRange(sevenDaysAgo, oneDayAgo)
|
|
|
|
val lastWeek = LongRange(sevenDaysAgo, oneDayAgo)
|
|
|
|
val lastMonth = LongRange(thirtyDaysAgo, sevenDaysAgo)
|
|
|
|
val lastMonth = LongRange(thirtyDaysAgo, sevenDaysAgo)
|
|
|
|
|
|
|
|
|
|
|
|
grouped = history.groupBy { item ->
|
|
|
|
grouped = history.groupBy { item ->
|
|
|
|
when {
|
|
|
|
when {
|
|
|
|
item.visitedAt > oneDayAgo -> Range.Today
|
|
|
|
DateUtils.isToday(item.visitedAt) -> Range.Today
|
|
|
|
lastWeek.contains(item.visitedAt) -> Range.ThisWeek
|
|
|
|
lastWeek.contains(item.visitedAt) -> Range.ThisWeek
|
|
|
|
lastMonth.contains(item.visitedAt) -> Range.ThisMonth
|
|
|
|
lastMonth.contains(item.visitedAt) -> Range.ThisMonth
|
|
|
|
else -> Range.Older
|
|
|
|
else -> Range.Older
|
|
|
@ -65,6 +70,12 @@ class HistoryList(val history: List<HistoryItem>) {
|
|
|
|
|
|
|
|
|
|
|
|
return calendar.time
|
|
|
|
return calendar.time
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
companion object {
|
|
|
|
|
|
|
|
private const val zero_days = 0
|
|
|
|
|
|
|
|
private const val seven_days = 7
|
|
|
|
|
|
|
|
private const val thirty_days = 30
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class HistoryAdapter(
|
|
|
|
class HistoryAdapter(
|
|
|
@ -88,12 +99,17 @@ class HistoryAdapter(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun onCreateItemViewHolder(parent: ViewGroup): RecyclerView.ViewHolder {
|
|
|
|
override fun onCreateItemViewHolder(parent: ViewGroup): RecyclerView.ViewHolder {
|
|
|
|
val view = LayoutInflater.from(parent.context).inflate(HistoryListItemViewHolder.LAYOUT_ID, parent, false)
|
|
|
|
val view = LayoutInflater
|
|
|
|
|
|
|
|
.from(parent.context)
|
|
|
|
|
|
|
|
.inflate(HistoryListItemViewHolder.LAYOUT_ID, parent, false)
|
|
|
|
return HistoryListItemViewHolder(view, actionEmitter)
|
|
|
|
return HistoryListItemViewHolder(view, actionEmitter)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
override fun onBindItemViewHolder(holder: RecyclerView.ViewHolder, row: SectionType.Row) {
|
|
|
|
override fun onBindItemViewHolder(holder: RecyclerView.ViewHolder, row: SectionType.Row) {
|
|
|
|
(holder as? HistoryListItemViewHolder)?.bind(historyList.itemsInRange(historyList.ranges[row.section])[row.row], mode)
|
|
|
|
val item = historyList.ranges[row.section]
|
|
|
|
|
|
|
|
.let { historyList.item(it, row.row) } ?: throw IllegalStateException("No item for row: $row")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(holder as? HistoryListItemViewHolder)?.bind(item, mode)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class HistoryListItemViewHolder(
|
|
|
|
class HistoryListItemViewHolder(
|
|
|
|