Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-13 07:10:28 +00:00
Code Issues Releases Wiki Activity

Dismisses search dialog if active in (RecentTabsHeaderViewHolder, RecentBookmarksViewHolderTest) and adapts test for the changes.

Browse Source
This commit is contained in:
Vitaly V. Pinchuk 2021-08-03 12:27:09 +03:00 committed by mergify[bot]
parent cc380695b8
commit 5093e7a5d6
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarksViewHolder.kt
View File

@ -5,6 +5,7 @@
package org.mozilla.fenix.home.recentbookmarks.view
import android.view.View
import androidx.navigation.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL
import kotlinx.android.synthetic.main.component_recent_bookmarks.view.*
@ -31,6 +32,7 @@ class RecentBookmarksViewHolder(
}
showAllBookmarksButton.setOnClickListener {
dismissSearchDialogIfDisplayed()
interactor.onShowAllBookmarksClicked()
}
}
@ -39,6 +41,13 @@ class RecentBookmarksViewHolder(
recentBookmarksAdapter.submitList(bookmarks)
}
private fun dismissSearchDialogIfDisplayed() {
val navController = itemView.findNavController()
if (navController.currentDestination?.id == R.id.searchDialogFragment) {
navController.navigateUp()
}
}
companion object {
const val LAYOUT_ID = R.layout.component_recent_bookmarks
}

9
app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabsHeaderViewHolder.kt
View File

@ -5,6 +5,7 @@
package org.mozilla.fenix.home.recenttabs.view
import android.view.View
import androidx.navigation.findNavController
import org.mozilla.fenix.R
import org.mozilla.fenix.databinding.RecentTabsHeaderBinding
import org.mozilla.fenix.home.recenttabs.interactor.RecentTabInteractor
@ -24,10 +25,18 @@ class RecentTabsHeaderViewHolder(
val binding = RecentTabsHeaderBinding.bind(view)
binding.showAllButton.setOnClickListener {
dismissSearchDialogIfDisplayed()
interactor.onRecentTabShowAllClicked()
}
}
private fun dismissSearchDialogIfDisplayed() {
val navController = itemView.findNavController()
if (navController.currentDestination?.id == R.id.searchDialogFragment) {
navController.navigateUp()
}
}
companion object {
const val LAYOUT_ID = R.layout.recent_tabs_header
}

3
app/src/test/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarksViewHolderTest.kt
View File

@ -6,6 +6,7 @@ package org.mozilla.fenix.home.recentbookmarks.view
import android.view.LayoutInflater
import android.view.View
import androidx.navigation.Navigation
import io.mockk.mockk
import io.mockk.verify
import kotlinx.android.synthetic.main.recent_bookmarks_header.view.*
@ -39,7 +40,7 @@ class RecentBookmarksViewHolderTest {
fun setup() {
view = LayoutInflater.from(testContext)
.inflate(RecentBookmarksViewHolder.LAYOUT_ID, null)
Navigation.setViewNavController(view, mockk(relaxed = true))
interactor = mockk(relaxed = true)
}

5
app/src/test/java/org/mozilla/fenix/home/recenttabs/view/RecentTabsHeaderViewHolderTest.kt
View File

@ -6,6 +6,7 @@ package org.mozilla.fenix.home.recenttabs.view
import android.view.LayoutInflater
import android.view.View
import androidx.navigation.Navigation
import io.mockk.mockk
import io.mockk.verify
import kotlinx.android.synthetic.main.recent_tabs_header.view.*
@ -24,7 +25,9 @@ class RecentTabsHeaderViewHolderTest {
@Before
fun setup() {
view = LayoutInflater.from(testContext).inflate(RecentTabsHeaderViewHolder.LAYOUT_ID, null)
view = LayoutInflater.from(testContext)
.inflate(RecentTabsHeaderViewHolder.LAYOUT_ID, null)
Navigation.setViewNavController(view, mockk(relaxed = true))
interactor = mockk(relaxed = true)
}