Skip to content

Commit e0ea2c1

Browse files
nalinchhajer1nalinchhajer1
committed
Merge branch 'development'
2 parents bca43f2 + 14e5a64 commit e0ea2c1

File tree

95 files changed

+1426
-578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1426
-578
lines changed

‎Themes/HSDarkTheme/README.md

Lines changed: 0 additions & 3 deletions

‎Themes/HSDarkTheme/drawables/hs_dark_left_chat_bubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSDarkTheme/drawables/hs_dark_right_chat_bubble.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Themes/HSDarkTheme/values/hs_custom_theme.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,11 @@
3636
<item name="android:textColor">@color/hs_dark_child_textColor</item>
3737
</style>
3838

39-
<!-- Chat screen - left chat bubble style -->
40-
<style name="hs_leftChatBubbleStyle" parent="hs_leftChatBubble_defaultStyle">
41-
<item name="android:background">@drawable/hs_dark_left_chat_bubble</item>
42-
</style>
43-
44-
<!-- Chat screen - right chat bubble style -->
45-
<style name="hs_rightChatBubbleStyle" parent="hs_rightChatBubble_defaultStyle">
46-
<item name="android:background">@drawable/hs_dark_right_chat_bubble</item>
47-
</style>
39+
<!-- Chat screen - left chat bubble color -->
40+
<color name="hs_leftchat_bubblecolor">@color/hs_dark_leftChatBubbleColor</color>
41+
42+
<!-- Chat screen - right chat bubble color -->
43+
<color name="hs_rightchat_bubblecolor">@color/hs_dark_rightChatBubbleColor</color>
4844

4945
<!-- Chat screen message text style for left chat bubble -->
5046
<style name="hs_right_messageTextStyle" parent="@style/hs_rightmessageText_defaultStyle">

‎Themes/HSFacebookTheme/README.md

Lines changed: 0 additions & 3 deletions

‎Themes/HSFacebookTheme/drawables/hs_fb_leftchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSFacebookTheme/drawables/hs_fb_rightchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSFacebookTheme/values/hs_custom_theme.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737
<item name="android:textColor">@color/hs_fb_childView_textColor</item>
3838
</style>
3939

40-
<!-- Chat screen - left chat bubble style -->
41-
<style name="hs_leftChatBubbleStyle" parent="hs_leftChatBubble_defaultStyle">
42-
<item name="android:background">@drawable/hs_fb_leftchatbubble</item>
43-
</style>
44-
45-
<!-- Chat screen - right chat bubble style -->
46-
<style name="hs_rightChatBubbleStyle" parent="hs_rightChatBubble_defaultStyle">
47-
<item name="android:background">@drawable/hs_fb_rightchatbubble</item>
48-
</style>
40+
<!-- Chat screen - left chat bubble color -->
41+
<color name="hs_leftchat_bubblecolor">@color/hs_fb_leftChatBubbleColor</color>
42+
43+
<!-- Chat screen - right chat bubble color -->
44+
<color name="hs_rightchat_bubblecolor">@color/hs_fb_rightChatBubbleColor</color>
4945

5046
<!-- Chat screen message text style for left chat bubble -->
5147
<style name="hs_right_messageTextStyle" parent="@style/hs_rightmessageText_defaultStyle">

‎Themes/HSHalloweenTheme/README.md

Lines changed: 0 additions & 3 deletions

‎Themes/HSHalloweenTheme/drawables/hs_halloween_left_chat_bubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSHalloweenTheme/drawables/hs_halloween_right_chat_bubble.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Themes/HSHalloweenTheme/values/hs_custom_theme.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,11 @@
3636
<item name="android:textColor">@color/hs_halloween_child_textColor</item>
3737
</style>
3838

39-
<!-- Chat screen - left chat bubble style -->
40-
<style name="hs_leftChatBubbleStyle" parent="hs_leftChatBubble_defaultStyle">
41-
<item name="android:background">@drawable/hs_halloween_left_chat_bubble</item>
42-
</style>
43-
44-
<!-- Chat screen - right chat bubble style -->
45-
<style name="hs_rightChatBubbleStyle" parent="hs_rightChatBubble_defaultStyle">
46-
<item name="android:background">@drawable/hs_halloween_right_chat_bubble</item>
47-
</style>
39+
<!-- Chat screen - left chat bubble color -->
40+
<color name="hs_leftchat_bubblecolor">@color/hs_halloween_leftChatBubbleColor</color>
41+
42+
<!-- Chat screen - right chat bubble color -->
43+
<color name="hs_rightchat_bubblecolor">@color/hs_halloween_rightChatBubbleColor</color>
4844

4945
<!-- Chat screen message text style for left chat bubble -->
5046
<style name="hs_right_messageTextStyle" parent="@style/hs_rightmessageText_defaultStyle">

‎Themes/HSLightTheme/README.md

Lines changed: 0 additions & 3 deletions

‎Themes/HSLightTheme/drawables/hs_light_leftchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSLightTheme/drawables/hs_light_rightchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSLightTheme/values/hs_custom_theme.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737
<item name="android:textColor">@color/hs_light_childView_textColor</item>
3838
</style>
3939

40-
<!-- Chat screen - left chat bubble style -->
41-
<style name="hs_leftChatBubbleStyle" parent="hs_leftChatBubble_defaultStyle">
42-
<item name="android:background">@drawable/hs_light_leftchatbubble</item>
43-
</style>
44-
45-
<!-- Chat screen - right chat bubble style -->
46-
<style name="hs_rightChatBubbleStyle" parent="hs_rightChatBubble_defaultStyle">
47-
<item name="android:background">@drawable/hs_light_rightchatbubble</item>
48-
</style>
40+
<!-- Chat screen - left chat bubble color -->
41+
<color name="hs_leftchat_bubblecolor">@color/hs_light_leftChatBubbleColor</color>
42+
43+
<!-- Chat screen - right chat bubble color -->
44+
<color name="hs_rightchat_bubblecolor">@color/hs_light_rightChatBubbleColor</color>
4945

5046
<!-- Chat screen message text style for left chat bubble -->
5147
<style name="hs_right_messageTextStyle" parent="@style/hs_rightmessageText_defaultStyle">

‎Themes/HSPathTheme/README.md

Lines changed: 0 additions & 3 deletions

‎Themes/HSPathTheme/drawables/hs_path_leftchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSPathTheme/drawables/hs_path_rightchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSPathTheme/values/hs_custom_theme.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737
<item name="android:textColor">@color/hs_path_child_textColor</item>
3838
</style>
3939

40-
<!-- Chat screen - left chat bubble style -->
41-
<style name="hs_leftChatBubbleStyle" parent="hs_leftChatBubble_defaultStyle">
42-
<item name="android:background">@drawable/hs_path_leftchatbubble</item>
43-
</style>
44-
45-
<!-- Chat screen - right chat bubble style -->
46-
<style name="hs_rightChatBubbleStyle" parent="hs_rightChatBubble_defaultStyle">
47-
<item name="android:background">@drawable/hs_path_rightchatbubble</item>
48-
</style>
40+
<!-- Chat screen - left chat bubble color -->
41+
<color name="hs_leftchat_bubblecolor">@color/hs_path_leftChatBubbleColor</color>
42+
43+
<!-- Chat screen - right chat bubble color -->
44+
<color name="hs_rightchat_bubblecolor">@color/hs_path_rightChatBubbleColor</color>
4945

5046
<!-- Chat screen message text style for right chat bubble -->
5147
<style name="hs_right_messageTextStyle" parent="@style/hs_rightmessageText_defaultStyle">

‎Themes/HSPinterestTheme/README.md

Lines changed: 0 additions & 3 deletions

‎Themes/HSPinterestTheme/drawables/hs_pinterest_leftchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSPinterestTheme/drawables/hs_pinterest_rightchatbubble.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Themes/HSPinterestTheme/values/hs_custom_theme.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737
<item name="android:textColor">@color/hs_pinterest_childView_textColor</item>
3838
</style>
3939

40-
<!-- Chat screen - left chat bubble style -->
41-
<style name="hs_leftChatBubbleStyle" parent="hs_leftChatBubble_defaultStyle">
42-
<item name="android:background">@drawable/hs_pinterest_leftchatbubble</item>
43-
</style>
44-
45-
<!-- Chat screen - right chat bubble style -->
46-
<style name="hs_rightChatBubbleStyle" parent="hs_rightChatBubble_defaultStyle">
47-
<item name="android:background">@drawable/hs_pinterest_rightchatbubble</item>
48-
</style>
40+
<!-- Chat screen - left chat bubble color -->
41+
<color name="hs_leftchat_bubblecolor">@color/hs_pinterest_leftChatBubbleColor</color>
42+
43+
<!-- Chat screen - right chat bubble color -->
44+
<color name="hs_rightchat_bubblecolor">@color/hs_pinterest_rightChatBubbleColor</color>
4945

5046
<!-- Chat screen message text style for left chat bubble -->
5147
<style name="hs_right_messageTextStyle" parent="@style/hs_rightmessageText_defaultStyle">

‎helpstack/AndroidManifest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1212
<uses-permission android:name="android.permission.INTERNET" />
13+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1314

1415
<application >
1516
<activity
@@ -41,7 +42,11 @@
4142
<activity
4243
android:name="com.tenmiles.helpstack.activities.ImageAttachmentDisplayActivity">
4344
</activity>
44-
45+
<activity
46+
android:name="com.tenmiles.helpstack.activities.EditAttachmentActivity"
47+
android:screenOrientation="portrait">
48+
</activity>
49+
4550
<receiver
4651
android:name="com.tenmiles.helpstack.service.AttachmentDownloadReceiver"
4752
android:enabled="true" >

‎helpstack/res/drawable-hdpi/hs_action_accept_img.png

420 Bytes

‎helpstack/res/drawable-hdpi/hs_action_accept_light_img.png

401 Bytes

‎helpstack/res/drawable-hdpi/hs_action_attachment_light_img.png

472 Bytes

‎helpstack/res/drawable-hdpi/hs_action_forward_img.png

367 Bytes

‎helpstack/res/drawable-hdpi/hs_action_forward_light_img.png

304 Bytes

‎helpstack/res/drawable-hdpi/hs_action_new_attachment_light_img.png

587 Bytes

‎helpstack/res/drawable-hdpi/hs_action_send_now_light_img.png

411 Bytes

‎helpstack/res/drawable-hdpi/hs_notification_download_img.png renamed to ‎helpstack/res/drawable-hdpi/hs_notification_download_light_img.png

File renamed without changes.

‎helpstack/res/drawable-hdpi/hs_send_img.png renamed to ‎helpstack/res/drawable-hdpi/hs_send_now_img.png

File renamed without changes.

‎helpstack/res/drawable-mdpi/hs_action_accept_img.png

325 Bytes

‎helpstack/res/drawable-mdpi/hs_action_accept_light_img.png

246 Bytes

‎helpstack/res/drawable-mdpi/hs_action_attachment_light_img.png

379 Bytes

‎helpstack/res/drawable-mdpi/hs_action_forward_img.png

321 Bytes

‎helpstack/res/drawable-mdpi/hs_action_forward_light_img.png

277 Bytes

‎helpstack/res/drawable-mdpi/hs_action_new_attachment_light_img.png

415 Bytes

‎helpstack/res/drawable-mdpi/hs_action_send_now_light_img.png

303 Bytes

‎helpstack/res/drawable-mdpi/hs_notification_download_img.png renamed to ‎helpstack/res/drawable-mdpi/hs_notification_download_light_img.png

File renamed without changes.

‎helpstack/res/drawable-mdpi/hs_send_img.png renamed to ‎helpstack/res/drawable-mdpi/hs_send_now_img.png

File renamed without changes.

‎helpstack/res/drawable-xhdpi/hs_action_accept_img.png

478 Bytes

‎helpstack/res/drawable-xhdpi/hs_action_accept_light_img.png

475 Bytes

‎helpstack/res/drawable-xhdpi/hs_action_attachment_light_img.png

590 Bytes

‎helpstack/res/drawable-xhdpi/hs_action_forward_img.png

440 Bytes

‎helpstack/res/drawable-xhdpi/hs_action_forward_light_img.png

407 Bytes

‎helpstack/res/drawable-xhdpi/hs_action_new_attachment_light_img.png

753 Bytes

‎helpstack/res/drawable-xhdpi/hs_action_send_now_light_img.png

528 Bytes

‎helpstack/res/drawable-xhdpi/hs_notification_download_img.png renamed to ‎helpstack/res/drawable-xhdpi/hs_notification_download_light_img.png

File renamed without changes.

‎helpstack/res/drawable-xhdpi/hs_send_img.png renamed to ‎helpstack/res/drawable-xhdpi/hs_send_now_img.png

File renamed without changes.

‎helpstack/res/drawable-xxhdpi/attach_icon.png

-1.18 KB
Binary file not shown.

‎helpstack/res/drawable-xxhdpi/hs_action_accept_img.png

649 Bytes

‎helpstack/res/drawable-xxhdpi/hs_action_accept_light_img.png

619 Bytes

‎helpstack/res/drawable-xxhdpi/hs_action_attachment_light_img.png

822 Bytes

‎helpstack/res/drawable-xxhdpi/hs_action_forward_img.png

566 Bytes

‎helpstack/res/drawable-xxhdpi/hs_action_forward_light_img.png

491 Bytes

‎helpstack/res/drawable-xxhdpi/hs_action_new_attachment_light_img.png

1.02 KB

‎helpstack/res/drawable-xxhdpi/hs_action_send_now_light_img.png

671 Bytes

‎helpstack/res/drawable-xxhdpi/hs_send_img.png renamed to ‎helpstack/res/drawable-xxhdpi/hs_send_now_img.png

File renamed without changes.

‎helpstack/res/drawable/brush_blue.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<solid android:color="#2196f3" />
3+
</shape>

‎helpstack/res/drawable/brush_green.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<solid android:color="#4caf50" />
3+
</shape>

‎helpstack/res/drawable/brush_red.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<solid android:color="#f44336"/>
3+
</shape>

‎helpstack/res/drawable/paint.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
2+
<solid android:color="#111111" />
3+
<size
4+
android:width="2dp"
5+
android:height="2dp"/>
6+
</shape>
7+

‎helpstack/res/drawable/paint_pressed.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<shape android:shape="oval" xmlns:android="http://schemas.android.com/apk/res/android">
2+
<solid android:color="#555555" />
3+
</shape>

0 commit comments

Comments
 (0)