Skip to content

Commit 70f5f06

Browse files
0nko0nko
committed
Clean up the menu items
1 parent 643feee commit 70f5f06

File tree

5 files changed

+7
-125
lines changed

5 files changed

+7
-125
lines changed

‎app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherMenuExt.kt‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,22 @@ import android.view.Menu
2020
import androidx.appcompat.content.res.AppCompatResources
2121
import androidx.appcompat.widget.Toolbar
2222
import androidx.core.view.isVisible
23-
import androidx.recyclerview.widget.RecyclerView
2423
import com.duckduckgo.app.browser.R
2524
import com.duckduckgo.app.browser.databinding.PopupTabsMenuBinding
2625
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackButtonType.ARROW
2726
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackButtonType.CLOSE
2827
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.DynamicInterface
29-
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.FabType
3028
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.GRID
3129
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.HIDDEN
3230
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.LayoutMode.LIST
33-
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
34-
import com.google.android.material.floatingactionbutton.FloatingActionButton
3531
import com.duckduckgo.mobile.android.R as commonR
3632

3733
fun Menu.createDynamicInterface(
3834
numSelectedTabs: Int,
3935
popupMenu: PopupTabsMenuBinding,
40-
mainFab: ExtendedFloatingActionButton,
41-
aiFab: FloatingActionButton,
42-
tabsRecycler: RecyclerView,
4336
toolbar: Toolbar,
4437
dynamicMenu: DynamicInterface,
4538
) {
46-
popupMenu.newTabMenuItem.isVisible = dynamicMenu.isNewTabMenuVisible
4739
popupMenu.selectAllMenuItem.isVisible = dynamicMenu.isSelectAllVisible
4840
popupMenu.deselectAllMenuItem.isVisible = dynamicMenu.isDeselectAllVisible
4941
popupMenu.selectionActionsDivider.isVisible = dynamicMenu.isSelectionActionsDividerVisible
@@ -94,70 +86,12 @@ fun Menu.createDynamicInterface(
9486
}
9587
}
9688

97-
mainFab.apply {
98-
if (dynamicMenu.isMainFabVisible) {
99-
when (dynamicMenu.mainFabType) {
100-
FabType.NEW_TAB -> {
101-
text = resources.getString(R.string.newTabMenuItem)
102-
icon = AppCompatResources.getDrawable(context, commonR.drawable.ic_add_24_solid_color)
103-
}
104-
FabType.CLOSE_TABS -> {
105-
text = resources.getQuantityString(R.plurals.closeTabsMenuItem, numSelectedTabs, numSelectedTabs)
106-
icon = AppCompatResources.getDrawable(context, commonR.drawable.ic_close_24_solid_color)
107-
}
108-
}
109-
110-
show()
111-
extend()
112-
} else {
113-
hide()
114-
}
115-
}
116-
117-
if (dynamicMenu.isAIFabVisible) {
118-
aiFab.show()
119-
} else {
120-
aiFab.hide()
121-
}
122-
12389
toolbar.navigationIcon = when (dynamicMenu.backButtonType) {
12490
ARROW -> AppCompatResources.getDrawable(toolbar.context, commonR.drawable.ic_arrow_left_24)
12591
CLOSE -> AppCompatResources.getDrawable(toolbar.context, commonR.drawable.ic_close_24)
12692
}
12793

128-
findItem(R.id.layoutTypeToolbarButton).apply {
129-
when (dynamicMenu.layoutButtonMode) {
130-
GRID -> {
131-
setIcon(com.duckduckgo.mobile.android.R.drawable.ic_view_grid_24)
132-
title = toolbar.resources.getString(R.string.tabSwitcherGridViewMenu)
133-
isVisible = true
134-
}
135-
LIST -> {
136-
setIcon(com.duckduckgo.mobile.android.R.drawable.ic_view_list_24)
137-
title = toolbar.resources.getString(R.string.tabSwitcherListViewMenu)
138-
isVisible = true
139-
}
140-
HIDDEN -> isVisible = false
141-
}
142-
}
143-
144-
findItem(R.id.popupMenuToolbarButton).isEnabled = dynamicMenu.isMenuButtonEnabled
14594
findItem(R.id.fireToolbarButton).isVisible = dynamicMenu.isFireButtonVisible
14695
findItem(R.id.duckAIToolbarButton).isVisible = dynamicMenu.isDuckAIButtonVisible
14796
findItem(R.id.newTabToolbarButton).isVisible = dynamicMenu.isNewTabButtonVisible
148-
149-
val bottomPadding = if (dynamicMenu.isAIFabVisible) {
150-
tabsRecycler.context.resources.getDimension(R.dimen.recyclerViewTwoFabsBottomPadding)
151-
} else if (dynamicMenu.isMainFabVisible) {
152-
tabsRecycler.context.resources.getDimension(R.dimen.recyclerViewOneFabBottomPadding)
153-
} else {
154-
tabsRecycler.context.resources.getDimension(com.duckduckgo.mobile.android.R.dimen.keyline_2)
155-
}
156-
157-
tabsRecycler.setPadding(
158-
tabsRecycler.paddingLeft,
159-
tabsRecycler.paddingTop,
160-
tabsRecycler.paddingRight,
161-
bottomPadding.toInt(),
162-
)
16397
}

‎app/src/main/res/layout/activity_tab_switcher.xml‎

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,26 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<androidx.coordinatorlayout.widget.CoordinatorLayout
17+
<LinearLayout
1818
xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
21+
android:orientation="vertical"
2122
android:layout_width="match_parent"
2223
android:layout_height="match_parent">
2324

24-
<include
25-
android:id="@+id/tabSwitcherExperimentToolbarTop"
26-
layout="@layout/include_tab_switcher_toolbar_top"
27-
android:layout_width="match_parent"
28-
android:layout_height="wrap_content" />
29-
3025
<include
3126
android:id="@+id/tabSwitcherToolbarTop"
32-
layout="@layout/include_default_toolbar"
27+
layout="@layout/include_tab_switcher_toolbar_top"
3328
android:layout_width="match_parent"
3429
android:layout_height="wrap_content" />
3530

3631
<FrameLayout
3732
android:id="@+id/tabsContainer"
3833
android:layout_width="match_parent"
39-
android:layout_height="match_parent"
40-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
34+
android:layout_height="0dp"
35+
android:layout_weight="1"
36+
android:fillViewport="true">
4137

4238
<View
4339
android:layout_width="match_parent"
@@ -66,41 +62,11 @@
6662

6763
</FrameLayout>
6864

69-
<com.google.android.material.floatingactionbutton.FloatingActionButton
70-
android:id="@+id/aiChatFab"
71-
android:layout_width="wrap_content"
72-
android:layout_height="wrap_content"
73-
android:layout_margin="@dimen/keyline_3"
74-
android:contentDescription="@string/newTabMenuItem"
75-
app:layout_anchor="@id/spacer"
76-
android:layout_gravity="top|end"
77-
android:visibility="gone"
78-
android:src="@drawable/ic_ai_chat_24_solid_color" />
79-
80-
<View
81-
android:id="@+id/spacer"
82-
android:layout_width="@dimen/keyline_4"
83-
android:layout_height="@dimen/keyline_3"
84-
android:layout_gravity="top|end"
85-
app:layout_anchorGravity="end"
86-
app:layout_anchor="@id/mainFab"
87-
/>
88-
89-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
90-
android:id="@+id/mainFab"
91-
android:layout_width="wrap_content"
92-
android:layout_height="wrap_content"
93-
android:layout_gravity="bottom|end"
94-
android:layout_margin="@dimen/keyline_4"
95-
tools:text="Test"
96-
android:visibility="gone"
97-
app:icon="@drawable/ic_add_24_solid_color" />
98-
9965
<include
10066
android:id="@+id/tabSwitcherToolbarBottom"
10167
layout="@layout/include_tab_switcher_toolbar_bottom"
10268
android:layout_gravity="bottom"
10369
android:layout_width="match_parent"
10470
android:layout_height="wrap_content" />
10571

106-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
72+
</LinearLayout>

‎app/src/main/res/layout/popup_tabs_menu.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
android:orientation="vertical"
2222
android:background="@drawable/popup_menu_bg">
2323

24-
<com.duckduckgo.common.ui.view.PopupMenuItemView
25-
android:id="@+id/newTabMenuItem"
26-
android:layout_width="match_parent"
27-
android:layout_height="wrap_content"
28-
app:primaryText="@string/newTabMenuItem" />
29-
3024
<com.duckduckgo.common.ui.view.PopupMenuItemView
3125
android:id="@+id/gridLayoutMenuItem"
3226
android:layout_width="match_parent"

‎app/src/main/res/layout/popup_tabs_menu_bottom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,4 @@
101101
app:primaryText="@string/tabSwitcherGridViewMenu"
102102
app:trailingIcon="@drawable/ic_check_24" />
103103

104-
<com.duckduckgo.common.ui.view.PopupMenuItemView
105-
android:id="@+id/newTabMenuItem"
106-
android:layout_width="match_parent"
107-
android:layout_height="wrap_content"
108-
app:primaryText="@string/newTabMenuItem" />
109-
110104
</LinearLayout>

‎app/src/main/res/menu/menu_tab_switcher_activity_with_selection.xml‎ renamed to ‎app/src/main/res/menu/menu_tab_switcher_activity.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
android:title="@string/newTabMenuItem"
3838
app:showAsAction="always" />
3939

40-
<item
41-
android:id="@+id/layoutTypeToolbarButton"
42-
android:icon="@drawable/ic_view_list_24"
43-
android:title="@string/tabSwitcherListViewMenu"
44-
app:showAsAction="always" />
45-
4640
<item
4741
android:id="@+id/popupMenuToolbarButton"
4842
android:icon="@drawable/ic_menu_vertical_24"

0 commit comments

Comments
 (0)