From 4512284ef471bb5bc3e2aaed68d9b641b79e8c40 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 26 Feb 2016 22:55:35 +0800
Subject: [PATCH] Fix GalleryInfoScene item height error

---
 .../ehviewer/ui/scene/GalleryInfoScene.java   | 20 +++++++++++++------
 .../res/layout/item_gallery_info_data.xml     |  2 +-
 .../res/layout/item_gallery_info_header.xml   |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
index 598a02be8..82dbe014c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
@@ -50,7 +50,9 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
     public static final String KEY_KEYS = "keys";
     public static final String KEY_VALUES = "values";
 
+    @Nullable
     private ArrayList<String> mKeys;
+    @Nullable
     private ArrayList<String> mValues;
 
     @Override
@@ -72,6 +74,9 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
         if (gd == null) {
             return;
         }
+        if (mKeys == null || mValues == null) {
+            return;
+        }
 
         Resources resources = getResources();
         mKeys.add(resources.getString(R.string.header_key));
@@ -138,6 +143,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
         outState.putStringArrayList(KEY_VALUES, mValues);
     }
 
+    @SuppressWarnings("deprecation")
     @Nullable
     @Override
     public View onCreateView2(LayoutInflater inflater,
@@ -175,7 +181,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
 
     @Override
     public boolean onItemClick(EasyRecyclerView parent, View view, int position, long id) {
-        if (position != 0) {
+        if (position != 0 && mValues != null) {
             ClipboardManager cmb = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
             cmb.setPrimaryClip(ClipData.newPlainText(null, mValues.get(position)));
             Toast.makeText(getContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
@@ -192,8 +198,8 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
 
     private static class InfoHolder extends RecyclerView.ViewHolder {
 
-        private TextView key;
-        private TextView value;
+        private final TextView key;
+        private final TextView value;
 
         public InfoHolder(View itemView) {
             super(itemView);
@@ -225,9 +231,11 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
 
         @Override
         public void onBindViewHolder(InfoHolder holder, int position) {
-            holder.key.setText(mKeys.get(position));
-            holder.value.setText(mValues.get(position));
-            holder.itemView.setEnabled(position != 0);
+            if (mKeys != null && mValues != null) {
+                holder.key.setText(mKeys.get(position));
+                holder.value.setText(mValues.get(position));
+                holder.itemView.setEnabled(position != 0);
+            }
         }
 
         @Override
diff --git a/app/src/main/res/layout/item_gallery_info_data.xml b/app/src/main/res/layout/item_gallery_info_data.xml
index e9a54a12d..26c6a58ef 100644
--- a/app/src/main/res/layout/item_gallery_info_data.xml
+++ b/app/src/main/res/layout/item_gallery_info_data.xml
@@ -18,7 +18,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:paddingLeft="@dimen/keyline_margin"
     android:paddingRight="@dimen/keyline_margin">
diff --git a/app/src/main/res/layout/item_gallery_info_header.xml b/app/src/main/res/layout/item_gallery_info_header.xml
index ac68531c6..5056366cc 100644
--- a/app/src/main/res/layout/item_gallery_info_header.xml
+++ b/app/src/main/res/layout/item_gallery_info_header.xml
@@ -18,7 +18,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:paddingLeft="@dimen/keyline_margin"
     android:paddingRight="@dimen/keyline_margin">