blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10877 - Show 'no tabs' message when no tabs are open (#10960)

master
David Walsh 2020-05-28 10:17:55 -05:00 committed by GitHub
parent 43a78c4fd6
commit ea4c342797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
View File

@ -145,12 +145,13 @@ class TabTrayView(
}
fun updateState(state: BrowserState) {
val shouldHide = if (isPrivateModeSelected) {
val hasNoTabs = if (isPrivateModeSelected) {
state.privateTabs.isEmpty()
} else {
state.normalTabs.isEmpty()
}
view?.tab_tray_overflow?.isVisible = !shouldHide
view?.tab_tray_empty_view?.isVisible = hasNoTabs
view?.tab_tray_overflow?.isVisible = !hasNoTabs
}
override fun onTabClosed(tab: Tab) {

20
app/src/main/res/layout/component_tabstray.xml
View File

@ -14,6 +14,7 @@
style="@style/BottomSheetModal"
android:backgroundTint="@color/foundation_normal_theme"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<View
android:id="@+id/handle"
android:layout_width="0dp"
@ -24,6 +25,22 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintWidth_percent="0.1"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tab_tray_empty_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center_horizontal"
android:paddingTop="80dp"
android:text="@string/no_open_tabs_description"
android:textColor="?secondaryText"
android:textSize="16sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tabsTray" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="0dp"
@ -52,6 +69,7 @@
android:contentDescription="@string/tabs_header_private_tabs_title" />
</com.google.android.material.tabs.TabLayout>
<ImageButton
android:id="@+id/tab_tray_overflow"
android:layout_width="48dp"
@ -64,6 +82,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tab_layout"
app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
<mozilla.components.concept.tabstray.TabsTray
android:id="@+id/tabsTray"
android:layout_width="0dp"
@ -80,4 +99,5 @@
mozac:tabsTraySelectedItemTextColor="@color/tab_tray_item_selected_background_normal_theme"
mozac:tabsTrayItemUrlTextColor="@color/tab_tray_item_selected_background_normal_theme"
mozac:tabsTraySelectedItemUrlTextColor="@color/tab_tray_item_url_normal_theme" />
</androidx.constraintlayout.widget.ConstraintLayout>