Skip to content

Feature/tab switcher improvements #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2018
Merged

Feature/tab switcher improvements #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6a1875
Remove null check on selected tab which was causing a bug
CDRussell Aug 28, 2018
27676f4
Update to latest AGP version
CDRussell Aug 28, 2018
2d81965
Show toolbar when opening a new background tab so animation is visible
CDRussell Aug 28, 2018
c59a38c
Add option to close all tabs (without clearing all stored data)
CDRussell Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package com.duckduckgo.app.browser

import android.Manifest
import android.animation.Animator
import android.animation.AnimatorListenerAdapter
import android.animation.LayoutTransition.CHANGING
import android.animation.LayoutTransition.DISAPPEARING
import android.annotation.SuppressLint
Expand All @@ -44,7 +42,6 @@ import android.support.v4.content.pm.ShortcutManagerCompat
import android.support.v7.app.AlertDialog
import android.support.v7.widget.LinearLayoutManager
import android.text.Editable
import android.text.Layout
import android.view.*
import android.view.View.VISIBLE
import android.view.inputmethod.EditorInfo
Expand All @@ -54,7 +51,6 @@ import android.webkit.WebSettings
import android.webkit.WebView
import android.webkit.WebView.FindListener
import android.widget.EditText
import android.widget.FrameLayout
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.core.view.postDelayed
Expand Down Expand Up @@ -385,6 +381,7 @@ class BrowserTabFragment : Fragment(), FindListener {
}

private fun openInNewBackgroundTab() {
appBarLayout.setExpanded(true, true)
viewModel.tabs.removeObservers(this)
val view = tabsButton?.actionView as TabSwitcherButton
view.increment {
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import android.support.v7.widget.LinearLayoutManager
import android.view.Menu
import android.view.MenuItem
import com.duckduckgo.app.browser.R
import com.duckduckgo.app.browser.WebDataManager
import com.duckduckgo.app.global.DuckDuckGoActivity
import com.duckduckgo.app.global.ViewModelFactory
import com.duckduckgo.app.global.view.ClearPersonalDataAction
Expand Down Expand Up @@ -106,6 +105,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherAdapter.TabSwitched
when (item.itemId) {
R.id.fire -> onFire()
R.id.newTab -> onNewTabRequested()
R.id.closeAllTabs -> closeAllTabs()
}
return super.onOptionsItemSelected(item)
}
Expand All @@ -129,6 +129,12 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherAdapter.TabSwitched
viewModel.onTabDeleted(tab)
}

private fun closeAllTabs() {
viewModel.tabs.value?.forEach {
viewModel.onTabDeleted(it)
}
}

override fun finish() {
clearObserversEarlyToStopViewUpdates()
super.finish()
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class TabSwitcherAdapter(private val context: Context, private val itemClickList
fun updateData(data: List<TabEntity>?, selectedTab: TabEntity?) {

data ?: return
selectedTab ?: return

this.data = data
this.selectedTab = selectedTab
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/res/menu/menu_tab_switcher_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,25 @@
-->

<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">

<item
android:id="@+id/fire"
android:icon="@drawable/ic_fire_gray_24dp"
android:title="@string/fireMenu"
app:showAsAction="ifRoom" />
app:showAsAction="always" />

<item
android:id="@+id/newTab"
android:icon="@drawable/ic_add_gray_30dp"
android:title="@string/newTabMenuItem"
app:showAsAction="ifRoom" />
app:showAsAction="always" />

<item
android:id="@+id/closeAllTabs"
android:title="@string/closeAllTabsMenuItem"
app:showAsAction="never" />

</menu>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<string name="tapFireDirective">Tap </string>
<string name="tapFireIconDescription">fire</string>
<string name="tapFireExplanation"> to forget everything</string>
<string name="closeAllTabsMenuItem">Close All Tabs</string>

<!-- Privacy Dashboard Activities -->
<string name="privacyDashboardActivityTitle">Privacy Dashboard</string>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0-rc01'
classpath 'com.android.tools.build:gradle:3.2.0-rc02'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down