blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #6607 Add button to no tab content pane

master
mcarare 2020-02-28 16:51:29 +02:00 committed by Jeff Boek
parent 5b7a800f98
commit df80a5240b
8 changed files with 174 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -202,7 +202,8 @@ class HomeFragment : Fragment() {
registerCollectionStorageObserver = ::registerCollectionStorageObserver,
scrollToTheTop = ::scrollToTheTop,
showDeleteCollectionPrompt = ::showDeleteCollectionPrompt,
openSettingsScreen = ::openSettingsScreen
openSettingsScreen = ::openSettingsScreen,
openSearchScreen = ::navigateToSearch
)
)
updateLayout(view)

16
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
View File

@ -23,6 +23,7 @@ import org.mozilla.fenix.home.Tab
import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionHeaderViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.NoContentMessageViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.NoContentMessageWithActionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.SaveTabGroupViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.TabHeaderViewHolder
@ -81,6 +82,15 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
@StringRes val description: Int
) : AdapterItem(NoContentMessageViewHolder.LAYOUT_ID)
data class NoContentMessageWithAction(
@DrawableRes val icon: Int,
@StringRes val header: Int,
@StringRes val description: Int,
@DrawableRes val buttonIcon: Int = 0,
@StringRes val buttonText: Int = 0,
val listener: (() -> Unit)? = null
) : AdapterItem(NoContentMessageWithActionViewHolder.LAYOUT_ID)
object CollectionHeader : AdapterItem(CollectionHeaderViewHolder.LAYOUT_ID)
data class CollectionItem(
val collection: TabCollection,
@ -161,6 +171,7 @@ class SessionControlAdapter(
SaveTabGroupViewHolder.LAYOUT_ID -> SaveTabGroupViewHolder(view, interactor)
PrivateBrowsingDescriptionViewHolder.LAYOUT_ID -> PrivateBrowsingDescriptionViewHolder(view, interactor)
NoContentMessageViewHolder.LAYOUT_ID -> NoContentMessageViewHolder(view)
NoContentMessageWithActionViewHolder.LAYOUT_ID -> NoContentMessageWithActionViewHolder(view)
CollectionHeaderViewHolder.LAYOUT_ID -> CollectionHeaderViewHolder(view)
CollectionViewHolder.LAYOUT_ID -> CollectionViewHolder(view, interactor)
TabInCollectionViewHolder.LAYOUT_ID -> TabInCollectionViewHolder(view, interactor)
@ -195,6 +206,11 @@ class SessionControlAdapter(
is TopSiteViewHolder -> {
holder.bind((item as AdapterItem.TopSiteList).topSites)
}
is NoContentMessageWithActionViewHolder -> {
val listener = { interactor.onOpenNewTabClicked() }
val (icon, header, description, buttonIcon, buttonText) = item as AdapterItem.NoContentMessageWithAction
holder.bind(icon, header, description, buttonIcon, buttonText, listener)
}
is NoContentMessageViewHolder -> {
val (icon, header, description) = item as AdapterItem.NoContentMessage
holder.bind(icon, header, description)

12
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
View File

@ -148,6 +148,11 @@ interface SessionControlController {
* @see [CollectionInteractor.onToggleCollectionExpanded]
*/
fun handleToggleCollectionExpanded(collection: TabCollection, expand: Boolean)
/**
* @see [TabSessionInteractor.onOpenNewTabClicked]
*/
fun handleonOpenNewTabClicked()
}
@SuppressWarnings("TooManyFunctions", "LargeClass")
@ -165,7 +170,8 @@ class DefaultSessionControlController(
private val registerCollectionStorageObserver: () -> Unit,
private val scrollToTheTop: () -> Unit,
private val showDeleteCollectionPrompt: (tabCollection: TabCollection) -> Unit,
private val openSettingsScreen: () -> Unit
private val openSettingsScreen: () -> Unit,
private val openSearchScreen: () -> Unit
) : SessionControlController {
private val metrics: MetricController
get() = activity.components.analytics.metrics
@ -379,6 +385,10 @@ class DefaultSessionControlController(
store.dispatch(HomeFragmentAction.CollectionExpanded(collection, expand))
}
override fun handleonOpenNewTabClicked() {
openSearchScreen()
}
private fun showCollectionCreationFragment(
step: SaveCollectionStep,
selectedTabIds: Array<String>? = null,

9
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
View File

@ -153,6 +153,11 @@ interface TabSessionInteractor {
* mode or tab header menu item.
*/
fun onShareTabs()
/**
* Opens a new tab
*/
fun onOpenNewTabClicked()
}
/**
@ -274,4 +279,8 @@ class SessionControlInteractor(
override fun onToggleCollectionExpanded(collection: TabCollection, expand: Boolean) {
controller.handleToggleCollectionExpanded(collection, expand)
}
override fun onOpenNewTabClicked() {
controller.handleonOpenNewTabClicked()
}
}

6
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
View File

@ -22,10 +22,12 @@ import org.mozilla.fenix.home.Mode
import org.mozilla.fenix.home.OnboardingState
import org.mozilla.fenix.home.Tab
val noTabMessage = AdapterItem.NoContentMessage(
val noTabMessage = AdapterItem.NoContentMessageWithAction(
R.drawable.ic_tabs,
R.string.no_open_tabs_header_2,
R.string.no_open_tabs_description
R.string.no_open_tabs_description,
R.drawable.ic_new,
R.string.home_screen_shortcut_open_new_tab_2
)
val noCollectionMessage = AdapterItem.NoContentMessage(

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageViewHolder.kt
View File

@ -12,7 +12,7 @@ import kotlinx.android.synthetic.main.no_content_message.view.*
import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
import org.mozilla.fenix.R
class NoContentMessageViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
open class NoContentMessageViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
fun bind(
@DrawableRes icon: Int,

54
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt 100644
View File

@ -0,0 +1,54 @@
/* 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/. */
package org.mozilla.fenix.home.sessioncontrol.viewholders
import android.view.View
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.core.view.isVisible
import kotlinx.android.synthetic.main.no_content_message_with_action.view.button_icon
import kotlinx.android.synthetic.main.no_content_message_with_action.view.button_layout
import kotlinx.android.synthetic.main.no_content_message_with_action.view.button_text
import org.mozilla.fenix.R
class NoContentMessageWithActionViewHolder(
private val view: View
) : NoContentMessageViewHolder(view) {
/**
* @param icon The visible label for header text this menu item.
* @param header ID of string resource for title text.
* @param description ID of string resource for description text.
* @param buttonIcon Optional ID of drawable resource for button icon.
* @param buttonText Optional ID of string resource for button text.
* @param listener Optional Callback to be invoked when the button is clicked.
*/
@Suppress("LongParameterList")
fun bind(
@DrawableRes icon: Int,
@StringRes header: Int,
@StringRes description: Int,
@DrawableRes buttonIcon: Int = 0,
@StringRes buttonText: Int = 0,
listener: (() -> Unit)? = null
) {
super.bind(icon, header, description)
with(view.context) {
if (buttonIcon != 0 || buttonText != 0) {
view.button_layout.isVisible = true
view.button_icon.setImageDrawable(getDrawable(buttonIcon))
view.button_text.text = getString(buttonText)
view.button_layout.setOnClickListener {
listener?.invoke()
}
}
}
}
companion object {
const val LAYOUT_ID = R.layout.no_content_message_with_action
}
}

77
app/src/main/res/layout/no_content_message_with_action.xml 100644
View File

@ -0,0 +1,77 @@
<?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/. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/no_content_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/empty_session_control_background"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/no_content_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:drawablePadding="8dp"
android:textAppearance="@style/HeaderTextStyle"
android:textSize="16sp"
app:drawableTint="?primaryText"
tools:drawableEnd="@drawable/ic_tabs"
tools:text="@tools:sample/lorem" />
<TextView
android:id="@+id/no_content_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textAlignment="viewStart"
android:textColor="?primaryText"
android:textSize="14sp"
android:textStyle="normal"
tools:text="@tools:sample/lorem" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/button_layout"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="4dp"
android:background="@drawable/button_background_grey"
android:clickable="true"
android:focusable="true"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/button_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_text"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@drawable/ic_new" />
<TextView
android:id="@+id/button_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:textColor="?primaryText"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/home_screen_shortcut_open_new_tab_2" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>