Skip to content

Commit 0b167e1

Browse files
malmsteinmalmstein
committed
Merge branch 'hotfix/5.53.1'
2 parents 6ffc9b3 + 1d85b71 commit 0b167e1

File tree

4 files changed

+48
-25
lines changed

4 files changed

+48
-25
lines changed

‎app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ class VariantManagerTest {
4747

4848
@Test
4949
fun bottomBarNavigationControlVariantIsActiveAndHasNoFeatures() {
50-
val variant = variants.first { it.key == "mm" }
50+
val variant = variants.first { it.key == "mb" }
5151
assertEqualsDouble(1.0, variant.weight)
5252
assertEquals(0, variant.features.size)
5353
}
5454

5555
@Test
5656
fun bottomBarNavigationVariantIsActiveAndHasBottomBarNavigationFeature() {
57-
val variant = variants.first { it.key == "mn" }
57+
val variant = variants.first { it.key == "mk" }
5858
assertEqualsDouble(1.0, variant.weight)
5959
assertEquals(1, variant.features.size)
6060
assertTrue(variant.hasFeature(BottomBarNavigation))

‎app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt‎

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ import android.view.KeyEvent
4343
import android.view.LayoutInflater
4444
import android.view.MenuItem
4545
import android.view.View
46-
import android.view.View.GONE
47-
import android.view.View.OnFocusChangeListener
48-
import android.view.View.VISIBLE
49-
import android.view.View.inflate
46+
import android.view.View.*
5047
import android.view.ViewGroup
5148
import android.view.inputmethod.EditorInfo
5249
import android.webkit.ValueCallback
@@ -55,9 +52,7 @@ import android.webkit.WebSettings
5552
import android.webkit.WebView
5653
import android.webkit.WebView.FindListener
5754
import android.webkit.WebView.HitTestResult
58-
import android.webkit.WebView.HitTestResult.IMAGE_TYPE
59-
import android.webkit.WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
60-
import android.webkit.WebView.HitTestResult.UNKNOWN_TYPE
55+
import android.webkit.WebView.HitTestResult.*
6156
import android.webkit.WebViewDatabase
6257
import android.widget.EditText
6358
import android.widget.TextView
@@ -84,14 +79,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
8479
import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion
8580
import com.duckduckgo.app.bookmarks.ui.EditBookmarkDialogFragment
8681
import com.duckduckgo.app.brokensite.BrokenSiteActivity
87-
import com.duckduckgo.app.browser.BrowserTabViewModel.AutoCompleteViewState
88-
import com.duckduckgo.app.browser.BrowserTabViewModel.BrowserViewState
89-
import com.duckduckgo.app.browser.BrowserTabViewModel.Command
90-
import com.duckduckgo.app.browser.BrowserTabViewModel.CtaViewState
91-
import com.duckduckgo.app.browser.BrowserTabViewModel.FindInPageViewState
92-
import com.duckduckgo.app.browser.BrowserTabViewModel.GlobalLayoutViewState
93-
import com.duckduckgo.app.browser.BrowserTabViewModel.LoadingViewState
94-
import com.duckduckgo.app.browser.BrowserTabViewModel.OmnibarViewState
82+
import com.duckduckgo.app.browser.BrowserTabViewModel.*
9583
import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteSuggestionsAdapter
9684
import com.duckduckgo.app.browser.downloader.FileDownloadNotificationManager
9785
import com.duckduckgo.app.browser.downloader.FileDownloader
@@ -118,7 +106,20 @@ import com.duckduckgo.app.cta.ui.HomeTopPanelCta
118106
import com.duckduckgo.app.global.ViewModelFactory
119107
import com.duckduckgo.app.global.device.DeviceInfo
120108
import com.duckduckgo.app.global.model.orderedTrackingEntities
121-
import com.duckduckgo.app.global.view.*
109+
import com.duckduckgo.app.global.view.DaxDialog
110+
import com.duckduckgo.app.global.view.DaxDialogListener
111+
import com.duckduckgo.app.global.view.NonDismissibleBehavior
112+
import com.duckduckgo.app.global.view.TextChangedWatcher
113+
import com.duckduckgo.app.global.view.gone
114+
import com.duckduckgo.app.global.view.hide
115+
import com.duckduckgo.app.global.view.hideKeyboard
116+
import com.duckduckgo.app.global.view.isDifferent
117+
import com.duckduckgo.app.global.view.isImmersiveModeEnabled
118+
import com.duckduckgo.app.global.view.renderIfChanged
119+
import com.duckduckgo.app.global.view.show
120+
import com.duckduckgo.app.global.view.showKeyboard
121+
import com.duckduckgo.app.global.view.toPx
122+
import com.duckduckgo.app.global.view.toggleFullScreen
122123
import com.duckduckgo.app.privacy.model.PrivacyGrade
123124
import com.duckduckgo.app.privacy.renderer.icon
124125
import com.duckduckgo.app.privacy.store.PrivacySettingsStore
@@ -155,7 +156,16 @@ import kotlinx.android.synthetic.main.include_new_browser_tab.ctaContainer
155156
import kotlinx.android.synthetic.main.include_new_browser_tab.ctaTopContainer
156157
import kotlinx.android.synthetic.main.include_new_browser_tab.ddgLogo
157158
import kotlinx.android.synthetic.main.include_new_browser_tab.newTabLayout
158-
import kotlinx.android.synthetic.main.include_omnibar_toolbar.*
159+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.appBarLayout
160+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.browserMenu
161+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.clearTextButton
162+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.networksContainer
163+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.omnibarTextInput
164+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.pageLoadingIndicator
165+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.privacyGradeButton
166+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.searchIcon
167+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.toolbar
168+
import kotlinx.android.synthetic.main.include_omnibar_toolbar.toolbarContainer
159169
import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.browserMenu
160170
import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.fireIconMenu
161171
import kotlinx.android.synthetic.main.include_omnibar_toolbar.view.privacyGradeButton
@@ -166,7 +176,18 @@ import kotlinx.android.synthetic.main.layout_browser_bottom_navigation_bar.botto
166176
import kotlinx.android.synthetic.main.layout_browser_bottom_navigation_bar.bottomBarSearchItem
167177
import kotlinx.android.synthetic.main.layout_browser_bottom_navigation_bar.bottomBarTabsItem
168178
import kotlinx.android.synthetic.main.popup_window_browser_bottom_tab_menu.view.sharePopupMenuItem
169-
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.*
179+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.addBookmarksPopupMenuItem
180+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.addToHome
181+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.backPopupMenuItem
182+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.bookmarksPopupMenuItem
183+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.brokenSitePopupMenuItem
184+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.findInPageMenuItem
185+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.forwardPopupMenuItem
186+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.newTabPopupMenuItem
187+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.refreshPopupMenuItem
188+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.requestDesktopSiteCheckMenuItem
189+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.settingsPopupMenuItem
190+
import kotlinx.android.synthetic.main.popup_window_browser_menu.view.sharePageMenuItem
170191
import kotlinx.coroutines.CoroutineScope
171192
import kotlinx.coroutines.Dispatchers
172193
import kotlinx.coroutines.GlobalScope
@@ -1444,7 +1465,9 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
14441465
bottomNavigationBar.animateBarVisibility(isVisible = true)
14451466
} else {
14461467
bottomNavigationBar.postDelayed(KEYBOARD_DELAY) {
1447-
bottomNavigationBar.show()
1468+
if (bottomNavigationBar != null) {
1469+
bottomNavigationBar.show()
1470+
}
14481471
}
14491472
}
14501473
}
@@ -1496,7 +1519,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi
14961519
}
14971520

14981521
fun incrementTabs() {
1499-
if (isBottomNavigationFeatureEnabled()){
1522+
if (isBottomNavigationFeatureEnabled()) {
15001523
bottomBarTabsItem.increment {
15011524
addTabsObserver()
15021525
}

‎app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ interface VariantManager {
4747

4848
// Bottom Bar Navigation Experiment
4949
Variant(
50-
key = "mm",
50+
key = "mb",
5151
weight = 1.0,
5252
features = emptyList(),
5353
filterBy = { noFilter() }),
5454
Variant(
55-
key = "mn",
55+
key = "mk",
5656
weight = 1.0,
5757
features = listOf(BottomBarNavigation),
5858
filterBy = { noFilter() })

‎app/version/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION=5.53.0
1+
VERSION=5.53.1

0 commit comments

Comments
 (0)