Fix suggestions, extract layout for tab history
parent
6152469ffd
commit
5ddf8beea7
|
@ -23,7 +23,7 @@ class TabHistoryAdapter(
|
|||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TabHistoryViewHolder {
|
||||
val view = LayoutInflater.from(parent.context)
|
||||
.inflate(R.layout.history_list_item, parent, false)
|
||||
.inflate(R.layout.tab_history_list_item, parent, false)
|
||||
return TabHistoryViewHolder(view, interactor)
|
||||
}
|
||||
|
||||
|
|
|
@ -57,7 +57,6 @@ class TabHistoryView(
|
|||
init {
|
||||
tabHistoryRecyclerView.adapter = adapter
|
||||
tabHistoryRecyclerView.layoutManager = layoutManager
|
||||
tabHistoryRecyclerView.itemAnimator = null
|
||||
}
|
||||
|
||||
fun updateState(state: BrowserState) {
|
||||
|
|
|
@ -7,7 +7,8 @@ package org.mozilla.fenix.tabhistory
|
|||
import android.view.View
|
||||
import androidx.core.text.bold
|
||||
import androidx.core.text.buildSpannedString
|
||||
import kotlinx.android.synthetic.main.history_list_item.*
|
||||
import androidx.core.view.isVisible
|
||||
import kotlinx.android.synthetic.main.tab_history_list_item.*
|
||||
import org.mozilla.fenix.library.LibrarySiteItemView
|
||||
import org.mozilla.fenix.utils.view.ViewHolder
|
||||
|
||||
|
@ -19,13 +20,14 @@ class TabHistoryViewHolder(
|
|||
private lateinit var item: TabHistoryItem
|
||||
|
||||
init {
|
||||
itemView.setOnClickListener { interactor.goToHistoryItem(item) }
|
||||
history_layout.setOnClickListener { interactor.goToHistoryItem(item) }
|
||||
}
|
||||
|
||||
fun bind(item: TabHistoryItem) {
|
||||
this.item = item
|
||||
|
||||
history_layout.displayAs(LibrarySiteItemView.ItemType.SITE)
|
||||
history_layout.overflowView.isVisible = false
|
||||
history_layout.urlView.text = item.url
|
||||
history_layout.loadFavicon(item.url)
|
||||
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
<org.mozilla.fenix.library.LibrarySiteItemView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/history_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="@dimen/library_item_height" />
|
||||
|
|
@ -28,7 +28,7 @@ class TabHistoryViewHolderTest {
|
|||
MockKAnnotations.init(this)
|
||||
onClick = slot()
|
||||
|
||||
every { view.setOnClickListener(capture(onClick)) } just Runs
|
||||
every { siteItemView.setOnClickListener(capture(onClick)) } just Runs
|
||||
every { view.findViewById<LibrarySiteItemView>(R.id.history_layout) } returns siteItemView
|
||||
|
||||
holder = TabHistoryViewHolder(view, interactor)
|
||||
|
|
Loading…
Reference in New Issue