Merge pull request #18289 from wordpress-mobile/issue/17401-sharing-c…

…onnection-tumblr [Sharing] Fix Tumblr form being pushed down
wordpress-mobile · Apr 20, 2023 · 2ed867f · 2ed867f
2 parents 375c64d + 1dd9d6c
commit 2ed867f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeWebViewFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeWebViewFragment.java
@@ -35,7 +35,6 @@ public class PublicizeWebViewFragment extends PublicizeBaseFragment {
     private int mConnectionId;
     private WebView mWebView;
     private ProgressBar mProgress;
-    private View mNestedScrollView;
 
     @Inject AccountStore mAccountStore;
 
@@ -98,7 +97,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         mProgress = rootView.findViewById(R.id.progress);
         mWebView = rootView.findViewById(R.id.webView);
-        mNestedScrollView = rootView.findViewById(R.id.publicize_webview_nested_scroll_view);
 
         mWebView.setWebViewClient(new PublicizeWebViewClient());
         mWebView.setWebChromeClient(new PublicizeWebChromeClient());
@@ -127,7 +125,7 @@ public void onResume() {
         super.onResume();
         setNavigationIcon(R.drawable.ic_close_white_24dp);
         if (getActivity() instanceof ScrollableViewInitializedListener) {
-            ((ScrollableViewInitializedListener) getActivity()).onScrollableViewInitialized(mNestedScrollView.getId());
+            ((ScrollableViewInitializedListener) getActivity()).onScrollableViewInitialized(mWebView.getId());
         }
     }
 

diff --git a/WordPress/src/main/res/layout/publicize_webview_fragment.xml b/WordPress/src/main/res/layout/publicize_webview_fragment.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/publicize_webview_nested_scroll_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <org.wordpress.android.ui.WPWebView
+        <org.wordpress.android.widgets.NestedWebView
             android:id="@+id/webView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
@@ -23,5 +19,4 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-    </RelativeLayout>
-</androidx.core.widget.NestedScrollView>
+</RelativeLayout>