Merge pull request #80 from gulerbu/dialogs/webview_focus

Fix webview focus problem
Trendyol · Jul 27, 2021 · bef46f3 · bef46f3
2 parents c9ba131 + c72ff39
commit bef46f3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/buildSrc/src/main/kotlin/ComponentVersions.kt b/buildSrc/src/main/kotlin/ComponentVersions.kt
@@ -5,7 +5,7 @@ object ComponentVersions {
     const val ratingBarVersion = "1.0.2"
     const val imageSliderVersion = "1.0.8"
     const val phoneNumberVersion = "1.0.2"
-    const val dialogsVersion = "1.2.4"
+    const val dialogsVersion = "1.2.5"
     const val cardInputViewVersion = "1.1.2"
     const val quantityPickerViewVersion = "1.2.4"
     const val timelineViewVersion = "1.0.0"

diff --git a/libraries/dialogs/src/main/java/com/trendyol/uicomponents/dialogs/DialogFragment.kt b/libraries/dialogs/src/main/java/com/trendyol/uicomponents/dialogs/DialogFragment.kt
@@ -6,11 +6,14 @@ import android.text.SpannableString
 import android.text.method.LinkMovementMethod
 import android.text.util.Linkify
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.FOCUS_AFTER_DESCENDANTS
+import android.view.ViewGroup.FOCUS_DOWN
 import android.view.ViewOutlineProvider
 import android.webkit.WebChromeClient
+import android.webkit.WebViewClient
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.ViewModelProviders
@@ -92,8 +95,6 @@ class DialogFragment internal constructor() : BaseBottomSheetDialog() {
                     dialogListViewModel.clearSearch()
                 }
 
-                constraintLayout.descendantFocusability = FOCUS_AFTER_DESCENDANTS
-
                 setUpViewModel(items)
             }
         }
@@ -153,6 +154,7 @@ class DialogFragment internal constructor() : BaseBottomSheetDialog() {
                 visibility = viewState.getWebViewContentVisibility()
                 if (visibility == View.VISIBLE) {
                     webChromeClient = WebChromeClient()
+                    webViewClient = WebViewClient()
                     dialogArguments.webViewBuilder?.invoke(webViewContent)
 
                     loadWebViewContent(viewState.webViewContent)

diff --git a/libraries/dialogs/src/main/res/layout/fragment_dialog.xml b/libraries/dialogs/src/main/res/layout/fragment_dialog.xml
@@ -10,14 +10,12 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:focusableInTouchMode="true"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/viewTitleBackground"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:focusableInTouchMode="true"
             android:paddingStart="@dimen/dialogs_margin_outer"
             android:paddingEnd="@dimen/dialogs_margin_outer">
 
@@ -49,8 +47,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:descendantFocusability="blocksDescendants">
+                android:layout_height="match_parent">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/imageContent"
@@ -82,6 +79,8 @@
                     android:layout_height="wrap_content"
                     android:paddingTop="@dimen/dialogs_margin_inner"
                     android:paddingBottom="@dimen/dialogs_margin_inner"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/textContent"

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -21,7 +21,9 @@
             </intent-filter>
         </activity>
         <activity android:name=".RatingBarActivity" />
-        <activity android:name=".DialogsActivity" />
+        <activity android:name=".DialogsActivity"
+            android:windowSoftInputMode="adjustResize">
+        </activity>
         <activity android:name=".ImageSliderActivity" />
         <activity android:name=".PhoneNumberActivity" />
         <activity android:name=".ToolbarActivity" />

diff --git a/sample/src/main/java/com/trendyol/uicomponents/DialogsActivity.kt b/sample/src/main/java/com/trendyol/uicomponents/DialogsActivity.kt
@@ -3,6 +3,7 @@ package com.trendyol.uicomponents
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
+import android.webkit.WebViewClient
 import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -121,10 +122,11 @@ class DialogsActivity : AppCompatActivity() {
             title = "Info Dialog Sample"
             showCloseButton = true
             closeButtonListener = infoDialogClosed
-            webViewContent = WebViewContent.UrlContent("https://kargotakip.trendyol.com/")
+            webViewContent = WebViewContent.UrlContent("https://github.com/Trendyol/android-ui-components")
             webViewBuilder = {
                 settings.javaScriptEnabled = true
                 settings.domStorageEnabled = true
+                webViewClient = WebViewClient()
             }
         }.showDialog(supportFragmentManager)