8000 Merge branch 'release/5.0.1' · WindowxDeveloper/Android@f48a51b · GitHub
[go: up one dir, main page]

Skip to content

Commit f48a51b

Browse files
committed
Merge branch 'release/5.0.1'
2 parents 3d3e864 + e398328 commit f48a51b

File tree

14 files changed

+37
-18
lines changed

14 files changed

+37
-18
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
66
apply from: '../versioning.gradle'
77

88
ext {
9-
VERSION_NAME = "5.0.0"
9+
VERSION_NAME = "5.0.1"
1010
USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
1111
}
1212

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,9 @@ class BrowserActivity : DuckDuckGoActivity() {
7878
}
7979

8080
private fun openNewTab(tabId: String, userQuery: String? = null) {
81-
val previousFragment = supportFragmentManager.findFragmentById(R.id.fragmentContainer) as? BrowserTabFragment
8281
val fragment = BrowserTabFragment.newInstance(tabId, userQuery)
8382
val transaction = supportFragmentManager.beginTransaction()
84-
if (previousFragment == null) {
83+
if (currentTab == null) {
8584
transaction.replace(R.id.fragmentContainer, fragment, tabId)
8685
} else {
8786
transaction.hide(currentTab)

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import android.arch.lifecycle.Observer
2222
import android.arch.lifecycle.ViewModelProviders
2323
import android.content.Context
2424
import android.content.Intent
25+
import android.content.res.Configuration
2526
import android.net.Uri
2627
import android.os.Bundle
2728
import android.support.annotation.StringRes
@@ -280,7 +281,11 @@ class BrowserTabFragment : Fragment(), FindListener {
280281
omnibarTextInput.setText(viewState.omnibarText)
281282

282283
// ensures caret sits at the end of the query
283-
omnibarTextInput.post { omnibarTextInput?.setSelection(omnibarTextInput.text.length) }
284+
omnibarTextInput.post {
285+
omnibarTextInput?.let {
286+
it.setSelection(it.text.length)
287+
}
288+
}
284289
appBarLayout.setExpanded(true, true)
285290
}
286291

@@ -406,7 +411,7 @@ class BrowserTabFragment : Fragment(), FindListener {
406411
return@setOnMenuItemClickListener true
407412
}
408413
R.id.browserPopup -> {
409-
hideKeyboard()
414+
hideKeyboardImmediately()
410415
launchPopupMenu()
411416
return@setOnMenuItemClickListener true
412417
}
@@ -564,6 +569,14 @@ class BrowserTabFragment : Fragment(), FindListener {
564569
addTextChangedListener(textWatcher)
565570
}
566571

572+
private fun hideKeyboardImmediately() {
573+
if (!isHidden) {
574+
Timber.v("Keyboard now hiding")
575+
omnibarTextInput.hideKeyboard()
576+
focusDummy.requestFocus()
577+
}
578+
}
579+
567580
private fun hideKeyboard() {
568581
if (!isHidden) {
569582
Timber.v("Keyboard now hiding")
@@ -591,11 +604,22 @@ class BrowserTabFragment : Fragment(), FindListener {
591604

592605
override fun onHiddenChanged(hidden: Boolean) {
593606
super.onHiddenChanged(hidden)
594-
if (!hidden) {
607+
if (hidden) {
608+
webView?.onPause()
609+
} else {
610+
webView?.onResume()
595611
viewModel.onViewVisible()
596612
}
597613
}
598614

615+
/**
616+
* We don't destroy the activity on config changes like orientation, so we need to ensure we update resources which might change based on config
617+
*/
618+
override fun onConfigurationChanged(newConfig: Configuration) {
619+
super.onConfigurationChanged(newConfig)
620+
ddgLogo.setImageResource(R.drawable.full_logo)
621+
}
622+
599623
private fun resetTabState() {
600624
omnibarTextInput.text.clear()
601625
viewModel.resetView()
Loading
Loading
Loading
Loading
Loading
-2.4 KB
Loading
-1.3 KB
Loading

0 commit comments

Comments
 (0)
0