hiping to fix a rare crash with the image picker, adjusting icon size

y20k · Dec 17, 2015 · ed3a2f6 · ed3a2f6
1 parent 909ca8e
commit ed3a2f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/app/src/main/java/org/y20k/transistor/helpers/ImageHelper.java b/app/src/main/java/org/y20k/transistor/helpers/ImageHelper.java
@@ -100,7 +100,7 @@ public Bitmap createCircularFramedImage(int size) {
         float inputImageWidth = (float)mInputImage.getWidth();
 
         // calculate padding
-        float padding = (float)size/6;
+        float padding = (float)size/4;
 
         // define variables needed for transformation matrix
         Matrix transformationMatrix = new Matrix();
@@ -134,19 +134,6 @@ else if (inputImageHeight > inputImageWidth) {
     }
 
 
-    /* Get the dominant color within input image - for testing purposes */
-    private int getDominantColor () {
-        Bitmap onePixelBitmap = Bitmap.createScaledBitmap(mInputImage, 1, 1, false);
-        int pixel = onePixelBitmap.getPixel(0, 0);
-
-        int red = Color.red(pixel);
-        int green = Color.green(pixel);
-        int blue = Color.blue(pixel);
-
-        return Color.argb(127, red, green, blue);
-    }
-
-
     /* Return sampled down image for given Uri */
     private Bitmap decodeSampledBitmapFromUri(Uri imageUri, int reqWidth, int reqHeight) {
 
@@ -200,4 +187,17 @@ private static int calculateSampleParameter(BitmapFactory.Options options, int r
         return inSampleSize;
     }
 
+
+    /* Get the dominant color within input image - for testing purposes */
+    private int getDominantColor () {
+        Bitmap onePixelBitmap = Bitmap.createScaledBitmap(mInputImage, 1, 1, false);
+        int pixel = onePixelBitmap.getPixel(0, 0);
+
+        int red = Color.red(pixel);
+        int green = Color.green(pixel);
+        int blue = Color.blue(pixel);
+
+        return Color.argb(127, red, green, blue);
+    }
+
 }
diff --git a/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java b/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java
@@ -92,7 +92,7 @@ public boolean onMenuItemClick(MenuItem item) {
                         Intent i = new Intent();
                         i.setAction(ACTION_IMAGE_CHANGE_REQUESTED);
                         i.putExtra(STATION_ID, mStationID);
-                        LocalBroadcastManager.getInstance(mContext).sendBroadcast(i);
+                        LocalBroadcastManager.getInstance(mContext.getApplicationContext()).sendBroadcast(i);
 
                         return true;