Merge 90a9c6c into f2d6d0a

jpaulynice · Mar 8, 2016 · bbfa447 · bbfa447
2 parents f2d6d0a + 90a9c6c
commit bbfa447
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/app/src/main/java/com/jigdraw/draw/service/impl/JigsawServiceImpl.java b/app/src/main/java/com/jigdraw/draw/service/impl/JigsawServiceImpl.java
@@ -66,13 +66,13 @@ private Long createImageTiles(Bitmap original, int n) {
         int w = original.getWidth();
         int h = original.getHeight();
 
-        int tile_width = w / n;
-        int tile_height = h / n;
+        int tileWidth = w / n;
+        int tileHeight = h / n;
 
-        for (int y = 0; y + tile_height <= h; y += tile_height) {
-            for (int x = 0; x + tile_width <= w; x += tile_width) {
-                Bitmap tile = Bitmap.createBitmap(original, x, y, tile_width,
-                        tile_height);
+        for (int y = 0; y + tileHeight <= h; y += tileHeight) {
+            for (int x = 0; x + tileWidth <= w; x += tileWidth) {
+                Bitmap tile = Bitmap.createBitmap(original, x, y, tileWidth,
+                        tileHeight);
                 saveTile(tile, x, y, originalId);
             }
         }

diff --git a/app/src/main/java/com/jigdraw/draw/views/DrawingView.java b/app/src/main/java/com/jigdraw/draw/views/DrawingView.java
@@ -43,7 +43,7 @@ public class DrawingView extends View {
     private int paintColor = 0xFF660000;
     private Canvas drawCanvas;
     private Bitmap canvasBitmap;
-    private float brushSize, lastBrushSize;
+    private float brushSize;
 
     /**
      * Create new drawing view with context and attributes and setting up the
@@ -62,7 +62,6 @@ public DrawingView(Context context, AttributeSet attrs) {
      */
     private void init() {
         brushSize = getResources().getInteger(R.integer.medium_size);
-        lastBrushSize = brushSize;
         drawPath = new Path();
         drawPaint = new Paint();
         drawPaint.setColor(paintColor);
@@ -128,7 +127,6 @@ public void setColor(int newColor) {
      * @param newSize the new color
      */
     public void setBrushSize(float newSize) {
-        lastBrushSize = brushSize;
         brushSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
                 newSize, getResources().getDisplayMetrics());
         drawPaint.setStrokeWidth(brushSize);

diff --git a/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java b/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
@@ -181,15 +181,6 @@ public JigsawGridView(Context context) {
         init(context);
     }
 
-    public void init(Context context) {
-        super.setOnScrollListener(mScrollListener);
-        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        mSmoothScrollAmountAtEdge = (int) (SMOOTH_SCROLL_AMOUNT_AT_EDGE
-                * metrics.density + 0.5f);
-        mOverlapIfSwitchStraightLine = getResources().getDimensionPixelSize(
-                R.dimen.dgv_overlap_if_switch_straight_line);
-    }
-
     public JigsawGridView(Context context, AttributeSet attrs) {
         super(context, attrs);
         init(context);
@@ -200,6 +191,15 @@ public JigsawGridView(Context context, AttributeSet attrs, int defStyle) {
         init(context);
     }
 
+    public void init(Context context) {
+        super.setOnScrollListener(mScrollListener);
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        mSmoothScrollAmountAtEdge = (int) (SMOOTH_SCROLL_AMOUNT_AT_EDGE
+                * metrics.density + 0.5f);
+        mOverlapIfSwitchStraightLine = getResources().getDimensionPixelSize(
+                R.dimen.dgv_overlap_if_switch_straight_line);
+    }
+
     public static boolean isPreLollipop() {
         return Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP;
     }