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.

0 commit comments

Comments
 (0)