diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt index 31476d35625f..109a2a607624 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt @@ -24,7 +24,6 @@ import android.arch.lifecycle.ViewModelProviders import android.content.Context import android.content.Intent import android.net.Uri -import android.os.Build import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.text.Editable @@ -73,7 +72,7 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener { @Inject lateinit var viewModelFactory: ViewModelFactory - + @Inject lateinit var cookieManagerProvider: Provider @@ -99,8 +98,8 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener { super.onCreate(savedInstanceState) setContentView(R.layout.activity_browser) + createPopupMenu() - createWebView() configureObservers() configureToolbar() configureWebView() @@ -126,17 +125,6 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener { } } - private fun createWebView() { - webView = NestedWebView(this) - webView.gone() - webView.isFocusableInTouchMode = true - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - webView.focusable = View.FOCUSABLE - } - - webViewContainer.addView(webView) - } - private fun configureObservers() { viewModel.viewState.observe(this, Observer { it?.let { render(it) } @@ -345,6 +333,7 @@ class BrowserActivity : DuckDuckGoActivity(), BookmarkDialogCreationListener { @SuppressLint("SetJavaScriptEnabled") private fun configureWebView() { + webView = layoutInflater.inflate(R.layout.include_duckduckgo_browser_webview, webViewContainer, true).findViewById(R.id.browserWebView) as WebView webView.webViewClient = webViewClient webView.webChromeClient = webChromeClient diff --git a/app/src/main/java/com/duckduckgo/app/browser/NestedWebView.kt b/app/src/main/java/com/duckduckgo/app/browser/NestedWebView.kt index 5d3173270302..57ab51aa1179 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/NestedWebView.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/NestedWebView.kt @@ -31,7 +31,6 @@ import android.webkit.WebView * Based on https://github.com/takahirom/webview-in-coordinatorlayout */ class NestedWebView : WebView, NestedScrollingChild { - private var lastY: Int = 0 private val scrollOffset = IntArray(2) private val scrollConsumed = IntArray(2) @@ -39,9 +38,8 @@ class NestedWebView : WebView, NestedScrollingChild { private var nestedScrollHelper: NestedScrollingChildHelper = NestedScrollingChildHelper(this) constructor(context: Context) : this(context, null) - constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { - nestedScrollHelper = NestedScrollingChildHelper(this) + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + { isNestedScrollingEnabled = true } diff --git a/app/src/main/res/layout/include_duckduckgo_browser_webview.xml b/app/src/main/res/layout/include_duckduckgo_browser_webview.xml new file mode 100644 index 000000000000..f6041a4c73d6 --- /dev/null +++ b/app/src/main/res/layout/include_duckduckgo_browser_webview.xml @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 777c6e5c9ff5..dceab7c037c8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -33,4 +33,7 @@ #e4e4e4 + #FF333333 + #FFABABAB +