Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 23:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Add a stroke for private message bubbles on Android 4

Browse Source
This commit is contained in:
Torsten Grote
2018-08-14 18:25:16 -03:00
parent c8b516196c
commit 21f95ed9af
13 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/build.gradle
View File

@@ -155,7 +155,7 @@ task verifyTranslations {
def folders = ["default", "en-US"] def folders = ["default", "en-US"]
project.file("src/main/res").eachDir { dir -> project.file("src/main/res").eachDir { dir ->
if (dir.name.startsWith("values-") && !dir.name.endsWith("night")) { if (dir.name.startsWith("values-") && !dir.name.endsWith("night") && !dir.name.endsWith("v21")) {
folders.add(dir.name.substring(7).replace("-r", "-")) folders.add(dir.name.substring(7).replace("-r", "-"))
} }
} }

3
briar-android/src/main/res/drawable/msg_in.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_top"/> android:top="@dimen/message_bubble_padding_top"/>
<solid <solid
android:color="@color/msg_in"/> android:color="@color/msg_in"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/msg_in_top.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_top"/> android:top="@dimen/message_bubble_padding_top"/>
<solid <solid
android:color="@color/msg_in"/> android:color="@color/msg_in"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/msg_out.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_top"/> android:top="@dimen/message_bubble_padding_top"/>
<solid <solid
android:color="@color/msg_out"/> android:color="@color/msg_out"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke_dark"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/msg_out_top.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_top"/> android:top="@dimen/message_bubble_padding_top"/>
<solid <solid
android:color="@color/msg_out"/> android:color="@color/msg_out"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke_dark"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/notice_in.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_top"/> android:top="@dimen/message_bubble_padding_top"/>
<solid <solid
android:color="@color/notice_in"/> android:color="@color/notice_in"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/notice_in_bottom.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_bottom"/> android:top="@dimen/message_bubble_padding_bottom"/>
<solid <solid
android:color="@color/notice_in"/> android:color="@color/notice_in"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/notice_out.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_top"/> android:top="@dimen/message_bubble_padding_top"/>
<solid <solid
android:color="@color/notice_out"/> android:color="@color/notice_out"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke_dark"/>
</shape> </shape>

3
briar-android/src/main/res/drawable/notice_out_bottom.xml
View File

@@ -14,4 +14,7 @@
android:top="@dimen/message_bubble_padding_bottom"/> android:top="@dimen/message_bubble_padding_bottom"/>
<solid <solid
android:color="@color/notice_out"/> android:color="@color/notice_out"/>
<stroke
android:width="@dimen/message_bubble_stroke"
android:color="@color/msg_stroke_dark"/>
</shape> </shape>

1
briar-android/src/main/res/values-night/color.xml
View File

@@ -12,6 +12,7 @@
<color name="msg_out">@color/briar_blue_elio_light</color> <color name="msg_out">@color/briar_blue_elio_light</color>
<color name="notice_in">@color/briar_blue_dark</color> <color name="notice_in">@color/briar_blue_dark</color>
<color name="notice_out">@color/briar_blue_elio</color> <color name="notice_out">@color/briar_blue_elio</color>
<color name="msg_stroke">@color/msg_stroke_dark</color>
<color name="window_background">@color/briar_blue_very_dark</color> <color name="window_background">@color/briar_blue_very_dark</color>
<color name="card_background">@color/briar_blue_dark</color> <color name="card_background">@color/briar_blue_dark</color>

5
briar-android/src/main/res/values-v21/dimens.xml Normal file
View File

@@ -0,0 +1,5 @@
<resources>
<dimen name="message_bubble_stroke">0px</dimen>
</resources>

3
briar-android/src/main/res/values/color.xml
View File

@@ -37,6 +37,9 @@
<color name="msg_out">@color/briar_blue_elio_light</color> <color name="msg_out">@color/briar_blue_elio_light</color>
<color name="notice_in">@color/briar_blue_grey</color> <color name="notice_in">@color/briar_blue_grey</color>
<color name="notice_out">@color/briar_blue_elio</color> <color name="notice_out">@color/briar_blue_elio</color>
<color name="msg_stroke_light">#cbcbcb</color>
<color name="msg_stroke_dark">#333333</color>
<color name="msg_stroke">@color/msg_stroke_light</color>
<!-- text colors --> <!-- text colors -->
<color name="briar_text_link">@color/briar_blue_light</color> <color name="briar_text_link">@color/briar_blue_light</color>

1
briar-android/src/main/res/values/dimens.xml
View File

@@ -48,6 +48,7 @@
<dimen name="message_bubble_elevation">2dp</dimen> <dimen name="message_bubble_elevation">2dp</dimen>
<dimen name="message_bubble_margin_tail">8dp</dimen> <dimen name="message_bubble_margin_tail">8dp</dimen>
<dimen name="message_bubble_margin_non_tail">30dp</dimen> <dimen name="message_bubble_margin_non_tail">30dp</dimen>
<dimen name="message_bubble_stroke">1px</dimen>
<dimen name="forum_nested_line_width">2dp</dimen> <dimen name="forum_nested_line_width">2dp</dimen>
<dimen name="forum_nested_indicator">24dp</dimen> <dimen name="forum_nested_indicator">24dp</dimen>