color picker wheel and code clean up

MemeProject/MemeProject.iml

@@ -4,7 +4,6 @@
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
@@ -16,4 +15,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
+

MemeProject/app/app.iml

@@ -12,9 +12,8 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -90,4 +89,5 @@
     <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
   </component>
-</module>
+</module>
+

MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ApplyFilters.java

@@ -36,10 +36,8 @@ public static Bitmap doInvert(Bitmap src) {
         int width = src.getWidth();
 
         // scan through every pixel
-        for (int y = 0; y < height; y++)
-        {
-            for (int x = 0; x < width; x++)
-            {
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
                 // get one pixel
                 pixelColor = src.getPixel(x, y);
                 // saving alpha channel
@@ -74,8 +72,8 @@ public static Bitmap doGreyscale(Bitmap src) {
         int height = src.getHeight();
 
         // scan through every single pixel
-        for(int x = 0; x < width; ++x) {
-            for(int y = 0; y < height; ++y) {
+        for (int x = 0; x < width; ++x) {
+            for (int y = 0; y < height; ++y) {
                 // get one pixel color
                 pixel = src.getPixel(x, y);
                 // retrieve color of all channels
@@ -84,7 +82,7 @@ public static Bitmap doGreyscale(Bitmap src) {
                 G = Color.green(pixel);
                 B = Color.blue(pixel);
                 // take conversion up to one single value
-                R = G = B = (int)(GS_RED * R + GS_GREEN * G + GS_BLUE * B);
+                R = G = B = (int) (GS_RED * R + GS_GREEN * G + GS_BLUE * B);
                 // set new pixel color to output bitmap
                 bmOut.setPixel(x, y, Color.argb(A, R, G, B));
             }
@@ -104,8 +102,8 @@ public static Bitmap applyShadingFilter(Bitmap source, int shadingColor) {
 
         int index = 0;
         // iteration through pixels
-        for(int y = 0; y < height; ++y) {
-            for(int x = 0; x < width; ++x) {
+        for (int y = 0; y < height; ++y) {
+            for (int x = 0; x < width; ++x) {
                 // get current index in 2D-matrix
                 index = y * width + x;
                 // AND
@@ -132,10 +130,10 @@ public static Bitmap applyReflection(Bitmap originalImage) {
 
         // create a Bitmap with the flip matrix applied to it.
         // we only want the bottom half of the image
-        Bitmap reflectionImage = Bitmap.createBitmap(originalImage, 0, height/2, width, height/2, matrix, false);
+        Bitmap reflectionImage = Bitmap.createBitmap(originalImage, 0, height / 2, width, height / 2, matrix, false);
 
         // create a new bitmap with same width but taller to fit reflection
-        Bitmap bitmapWithReflection = Bitmap.createBitmap(width, (height + height/2), Bitmap.Config.ARGB_8888);
+        Bitmap bitmapWithReflection = Bitmap.createBitmap(width, (height + height / 2), Bitmap.Config.ARGB_8888);
 
         // create a new Canvas with the bitmap that's big enough for
         // the image plus gap plus reflection
@@ -146,7 +144,7 @@ public static Bitmap applyReflection(Bitmap originalImage) {
         Paint defaultPaint = new Paint();
         canvas.drawRect(0, height, width, height + reflectionGap, defaultPaint);
         // draw in the reflection
-        canvas.drawBitmap(reflectionImage,0, height + reflectionGap, null);
+        canvas.drawBitmap(reflectionImage, 0, height + reflectionGap, null);
 
         // create a shader that is a linear gradient that covers the reflection
         Paint paint = new Paint();