fix:修复评论时输入框被键盘遮挡的问题

Author: Mamba_out

app/src/main/AndroidManifest.xml

@@ -27,6 +27,9 @@
     <uses-feature
         android:name="android.hardware.type.pc"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <application
         android:name=".EhApplication"

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java

@@ -42,12 +42,15 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -140,6 +143,8 @@ public final class GalleryCommentsScene extends ToolbarScene
     private boolean mShowAllComments = false;
     private boolean mRefreshingComments = false;
 
+    private int mOriginalSoftInputMode;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -193,9 +198,9 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
      * @param inflater
      * @param container
      * @param savedInstanceState
-     * @return
+     * @return View
      */
-    @Nullable
+    @NonNull
     @Override
     public View onCreateView3(LayoutInflater inflater,
             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -214,6 +219,7 @@ public View onCreateView3(LayoutInflater inflater,
         int paddingBottomFab = resources.getDimensionPixelOffset(R.dimen.gallery_padding_bottom_fab);
 
         Drawable drawable = DrawableManager.getVectorDrawable(context, R.drawable.big_sad_pandroid);
+        assert drawable != null;
         drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
         tip.setCompoundDrawables(null, drawable, null, null);
 
@@ -246,6 +252,8 @@ public View onCreateView3(LayoutInflater inflater,
         addAboveSnackView(mEditPanel);
         addAboveSnackView(mFabLayout);
 
+        setupEditPanelImeInsets();
+
         mViewTransition = new ViewTransition(mRecyclerView, tip);
 
         updateView(false);
@@ -262,6 +270,7 @@ public void onDestroyView() {
             mRecyclerView = null;
         }
         if (null != mEditPanel) {
+            ViewCompat.setOnApplyWindowInsetsListener(mEditPanel, null);
             removeAboveSnackView(mEditPanel);
             mEditPanel = null;
         }
@@ -284,6 +293,43 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
     }
 
+    private void setupEditPanelImeInsets() {
+        if (mEditPanel == null) {
+            return;
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(mEditPanel, (v, insets) -> {
+            int imeBottom = insets.getInsets(WindowInsetsCompat.Type.ime()).bottom;
+            ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+            if (lp.bottomMargin != imeBottom) {
+                lp.bottomMargin = imeBottom;
+                v.setLayoutParams(lp);
+            }
+            return insets;
+        });
+        ViewCompat.requestApplyInsets(mEditPanel);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MainActivity activity = getActivity2();
+        if (activity != null) {
+            mOriginalSoftInputMode = activity.getWindow().getAttributes().softInputMode;
+            activity.getWindow().setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
+                            | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        MainActivity activity = getActivity2();
+        if (activity != null) {
+            activity.getWindow().setSoftInputMode(mOriginalSoftInputMode);
+        }
+        super.onPause();
+    }
+
     @Override
     public void onNavigationClick(View view) {
         onBackPressed();
@@ -307,7 +353,7 @@ private void voteComment(long id, int vote) {
 
 
 
-    private class InfoHolder extends RecyclerView.ViewHolder {
+    private static class InfoHolder extends RecyclerView.ViewHolder {
 
         private final TextView key;
         private final TextView value;
@@ -343,13 +389,14 @@ public void showVoteStatusDialog(Context context, String voteStatus) {
         final LayoutInflater inflater = LayoutInflater.from(context);
         EasyRecyclerView rv = (EasyRecyclerView) inflater.inflate(R.layout.dialog_recycler_view, null);
         rv.setAdapter(new RecyclerView.Adapter<InfoHolder>() {
+            @NonNull
             @Override
-            public InfoHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            public InfoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                 return new InfoHolder(inflater.inflate(R.layout.item_drawer_favorites, parent, false));
             }
 
             @Override
-            public void onBindViewHolder(InfoHolder holder, int position) {
+            public void onBindViewHolder(@NonNull InfoHolder holder, int position) {
                 holder.key.setText(userArray[position]);
                 holder.value.setText(voteArray[position]);
             }
@@ -403,7 +450,8 @@ private void showCommentDialog(int position) {
         }
 
         new AlertDialog.Builder(context)
-                .setItems(menu.toArray(new String[menu.size()]), new DialogInterface.OnClickListener() {
+                .setItems(menu.toArray(new String[0]), new DialogInterface.OnClickListener() {
+                    @SuppressLint({"NonConstantResourceId", "NotifyDataSetChanged"})
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which < 0 || which >= menuId.size()) {
@@ -434,6 +482,7 @@ public void onClick(DialogInterface dialog, int which) {
                             case R.id.join_blacklist:
                                 EhDB.insertBlackList(BlackListUtils.parseBlacklist(comment));
                                 mCommentList.DeleteComment(position);
+                                assert mAdapter != null;
                                 mAdapter.notifyDataSetChanged();
                                 updateView(true);
                                 break;
@@ -450,8 +499,7 @@ public boolean onItemClick(EasyRecyclerView parent, View view, int position, lon
         }
 
         RecyclerView.ViewHolder holder = parent.getChildViewHolder(view);
-        if (holder instanceof ActualCommentHolder) {
-            ActualCommentHolder commentHolder = (ActualCommentHolder) holder;
+        if (holder instanceof ActualCommentHolder commentHolder) {
             ClickableSpan span = commentHolder.comment.getCurrentSpan();
             commentHolder.comment.clearCurrentSpan();