Merge branch 'development' of github.com:happyfoxinc/helpstack-android into development

Author: nalinchhajer1

helpstack/AndroidManifest.xml

@@ -43,7 +43,8 @@
             android:name="com.tenmiles.helpstack.activities.ImageAttachmentDisplayActivity">
         </activity>
         <activity
-            android:name="com.tenmiles.helpstack.activities.EditAttachmentActivity">
+            android:name="com.tenmiles.helpstack.activities.EditAttachmentActivity"
+            android:screenOrientation="portrait">
         </activity>
 
         <receiver

helpstack/res/drawable-hdpi/ic_action_accept.png

@@ -0,0 +1,3 @@
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="#2196f3" />
+</shape>

helpstack/res/drawable-mdpi/ic_action_accept.png

@@ -0,0 +1,3 @@
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="#4caf50" />
+</shape>

helpstack/res/drawable-xhdpi/ic_action_accept.png

@@ -0,0 +1,3 @@
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="#f44336"/>
+</shape>

helpstack/res/drawable-xxhdpi/ic_action_accept.png

@@ -1,10 +1,7 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        <shape android:shape="rectangle" >
-            <stroke
-                android:width="4dp"
-                android:color="#FF999999" />
-            <solid android:color="#00000000" />
-        </shape>
-    </item>
-</layer-list>
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#111111" />
+    <size
+        android:width="2dp"
+        android:height="2dp"/>
+</shape>
+

helpstack/res/drawable/brush_blue.xml

@@ -1,20 +1,3 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        <shape android:shape="rectangle" >
-            <stroke
-                android:width="4dp"
-                android:color="#FF333333" />
-
-            <solid android:color="#00000000" />
-        </shape>
-    </item>
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" >
-            <stroke
-                android:width="4dp"
-                android:color="#FF333333" />
-
-            <solid android:color="#00000000" />
-        </shape>
-    </item>
-</layer-list>
+<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#555555" />
+</shape>