Merged latest changes with master

Author: nalinchhajer1

README.md

@@ -27,8 +27,8 @@ Check out [helpstack.io](http://www.helpstack.io) for more information.
   <img src="Images/hs_preview.png" alt="HelpStackthemes" title="screenshots">
 </p>
 
-## HelpStack Android Users
-If you use HelpStack in your app, please let us know by adding yourself to this Wiki page: [HelpStack Android users](https://github.com/happyfoxinc/helpstack-android/wiki/HelpStack-Android-users)
+## App Showcase
+Have you made something awesome with HelpStack? Add yourself here: [App Showcase](https://github.com/happyfoxinc/helpstack-android/wiki/App-Showcase)
 
 ## Installation
 

build.gradle

@@ -4,6 +4,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.0.0+'
     }
 }

helpstack/src/com/tenmiles/helpstack/activities/DrawingView.java

@@ -16,9 +16,9 @@
 
 public class DrawingView extends View {
 
-    private Path drawPath;
-    private Paint drawPaint;
-    private Canvas drawCanvas;
+    private Path mPath;
+    private Paint mPaint;
+    private Canvas mCanvas;
 
     private Paint canvasPaint;
     private Bitmap canvasBitmap;
@@ -36,46 +36,46 @@ public class DrawingView extends View {
     public DrawingView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        drawPath = new Path();
-        drawPaint = new Paint();
+        mPath = new Path();
+        mPaint = new Paint();
 
-        drawPaint.setColor(paintColor);
+        mPaint.setColor(paintColor);
 
-        drawPaint.setAntiAlias(true);
-        drawPaint.setStrokeWidth(brushSize);
-        drawPaint.setStyle(Paint.Style.STROKE);
-        drawPaint.setStrokeJoin(Paint.Join.ROUND);
-        drawPaint.setStrokeCap(Paint.Cap.ROUND);
+        mPaint.setAntiAlias(true);
+        mPaint.setStrokeWidth(brushSize);
+        mPaint.setStyle(Paint.Style.STROKE);
+        mPaint.setStrokeJoin(Paint.Join.ROUND);
+        mPaint.setStrokeCap(Paint.Cap.ROUND);
 
         canvasPaint = new Paint(Paint.DITHER_FLAG);
     }
 
     public void setCanvasBitmap(Bitmap bitmap) {
         cachedBitmap = bitmap;
-        drawCanvas.drawColor(Color.BLACK);
+        mCanvas.drawColor(Color.BLACK);
         Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
 
-        calculateResizeRatio(bitmap, drawCanvas);
+        calculateResizeRatio(bitmap, mCanvas);
         Bitmap resizedBitmap = Bitmap.createScaledBitmap(mutableBitmap, resizedWidth, resizedHeight, false);
 
         int leftStart = getLeftStart(resizedWidth);
         int topStart = getTopStart(resizedHeight);
 
-        drawCanvas.drawBitmap(resizedBitmap, leftStart, topStart, drawPaint);
+        mCanvas.drawBitmap(resizedBitmap, leftStart, topStart, mPaint);
     }
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
 
         canvasBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
-        drawCanvas = new Canvas(canvasBitmap);
+        mCanvas = new Canvas(canvasBitmap);
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
         canvas.drawBitmap(canvasBitmap, 0, 0, canvasPaint);
-        canvas.drawPath(drawPath, drawPaint);
+        canvas.drawPath(mPath, mPaint);
     }
 
     @Override
@@ -85,15 +85,15 @@ public boolean onTouchEvent(MotionEvent event) {
 
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                drawPath.moveTo(touchX, touchY);
+                mPath.moveTo(touchX, touchY);
                 break;
             case MotionEvent.ACTION_MOVE:
-                drawPath.lineTo(touchX, touchY);
+                mPath.lineTo(touchX, touchY);
                 break;
             case MotionEvent.ACTION_UP:
-                drawCanvas.drawPath(drawPath, drawPaint);
+                mCanvas.drawPath(mPath, mPaint);
                 setIsEdited(true);
-                drawPath.reset();
+                mPath.reset();
                 activateClearOptionInActivity(true);
                 break;
             default:
@@ -108,11 +108,11 @@ public void setColor(String newColor) {
         invalidate();
 
         paintColor = Color.parseColor(newColor);
-        drawPaint.setColor(paintColor);
+        mPaint.setColor(paintColor);
     }
 
     public void clearChanges() {
-        drawPath.reset();
+        mPath.reset();
         setCanvasBitmap(cachedBitmap);
         setIsEdited(false);
         activateClearOptionInActivity(false);

helpstack/src/com/tenmiles/helpstack/activities/EditAttachmentActivity.java

@@ -32,6 +32,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -46,7 +47,7 @@
 import java.io.FileNotFoundException;
 import java.util.UUID;
 
-public class EditAttachmentActivity extends Activity {
+public class EditAttachmentActivity extends ActionBarActivity {
 
     private final int REQUEST_CODE_PHOTO_PICKER = 100;
 
@@ -62,8 +63,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.hs_activity_edit_attachment);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setTitle(R.string.hs_attachment_edit);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setTitle(R.string.hs_attachment_edit);
 
         drawView = (DrawingView)findViewById(R.id.drawing);
         drawView.setObserver(new DrawingView.ObserverInterface() {