Apply thumb size settings to preview size

app/src/main/java/com/hippo/ehviewer/Settings.java

@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.preference.PreferenceManager;
+import android.support.annotation.DimenRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -261,6 +262,19 @@ public class Settings {
         return getIntFromStr(KEY_THUMB_SIZE, DEFAULT_THUMB_SIZE);
     }
 
+    @DimenRes
+    public static int getThumbSizeResId() {
+        switch (getThumbSize()) {
+            case 0:
+                return R.dimen.gallery_grid_column_width_large;
+            default:
+            case 1:
+                return R.dimen.gallery_grid_column_width_middle;
+            case 2:
+                return R.dimen.gallery_grid_column_width_small;
+        }
+    }
+
     private static final String KEY_SHOW_JPN_TITLE = "show_jpn_title";
     private static final boolean DEFAULT_SHOW_JPN_TITLE = false;
 

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

@@ -101,20 +101,7 @@ abstract class GalleryAdapter extends RecyclerView.Adapter<GalleryHolder> {
                 break;
             }
             case GalleryAdapter.TYPE_GRID: {
-                int columnWidthId;
-                switch (Settings.getThumbSize()) {
-                    case 0:
-                        columnWidthId = R.dimen.gallery_grid_column_width_large;
-                        break;
-                    default:
-                    case 1:
-                        columnWidthId = R.dimen.gallery_grid_column_width_middle;
-                        break;
-                    case 2:
-                        columnWidthId = R.dimen.gallery_grid_column_width_small;
-                        break;
-                }
-                int columnWidth = mResources.getDimensionPixelOffset(columnWidthId);
+                int columnWidth = mResources.getDimensionPixelOffset(Settings.getThumbSizeResId());
                 mLayoutManager.setColumnSize(columnWidth);
                 mLayoutManager.setStrategy(AutoGridLayoutManager.STRATEGY_SUITABLE_SIZE);
                 if (null == mGirdDecoration) {

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

@@ -61,6 +61,7 @@ import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.EhDB;
 import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.UrlOpener;
 import com.hippo.ehviewer.client.EhCacheKeyFactory;
 import com.hippo.ehviewer.client.EhClient;
@@ -895,7 +896,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
             mPreviewText.setText(R.string.more_previews);
         }
 
-        int columnWidth = resources.getDimensionPixelOffset(R.dimen.preview_grid_column_width);
+        int columnWidth = resources.getDimensionPixelOffset(Settings.getThumbSizeResId());
         mGridLayout.setColumnSize(columnWidth);
         mGridLayout.setStrategy(SimpleGridAutoSpanLayout.STRATEGY_SUITABLE_SIZE);
         for (int i = 0, size = previewSet.size(); i < size; i++) {

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

@@ -38,6 +38,7 @@ import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.MarginItemDecoration;
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhClient;
 import com.hippo.ehviewer.client.EhRequest;
 import com.hippo.ehviewer.client.EhUrl;
@@ -141,7 +142,7 @@ public class GalleryPreviewsScene extends ToolbarScene implements EasyRecyclerVi
 
         mAdapter = new GalleryPreviewAdapter();
         mRecyclerView.setAdapter(mAdapter);
-        int columnWidth = resources.getDimensionPixelOffset(R.dimen.preview_grid_column_width);
+        int columnWidth = resources.getDimensionPixelOffset(Settings.getThumbSizeResId());
         AutoGridLayoutManager layoutManager = new AutoGridLayoutManager(context, columnWidth);
         layoutManager.setStrategy(AutoGridLayoutManager.STRATEGY_SUITABLE_SIZE);
         mRecyclerView.setLayoutManager(layoutManager);

app/src/main/res/values/dimens.xml

@@ -53,8 +53,6 @@
     <dimen name="gallery_grid_column_width_small">80dp</dimen>
     <dimen name="gallery_grid_margin">8dp</dimen>
 
-    <dimen name="preview_grid_column_width">120dp</dimen>
-
     <!-- DrawerArrowDrawable -->
     <dimen name="dad_drawable_size">24dp</dimen>
     <dimen name="dad_bar_size">18dp</dimen>