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

Merge branch '874-tree-indicator' into 'master'

Browse Source 
Darken thread indicator

Closes #874

See merge request !525
This commit is contained in:
Ernir Erlingsson
2017-04-26 08:38:52 +00:00
parent 9fd6d46583 45e7af31fe
commit 34704ec04d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/drawable/level_indicator_circle.xml
View File

@@ -5,5 +5,5 @@
<stroke <stroke
android:width="2dp" android:width="2dp"
android:color="@color/forum_discussion_nested_line"/> android:color="@color/thread_indicator"/>
</shape> </shape>

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

@@ -33,11 +33,12 @@
<!-- this is needed as preference_category_material layout uses this color as the text color --> <!-- this is needed as preference_category_material layout uses this color as the text color -->
<color name="preference_fallback_accent_color">@color/briar_accent</color> <color name="preference_fallback_accent_color">@color/briar_accent</color>
<color name="thread_indicator">#9e9e9e</color>
<color name="divider">#c1c1c1</color> <color name="divider">#c1c1c1</color>
<color name="default_separator_inverted">#ffffff</color> <color name="default_separator_inverted">#ffffff</color>
<color name="menu_background">#FFFFFF</color> <color name="menu_background">#FFFFFF</color>
<color name="spinner_border">#61000000</color> <!-- 38% Black --> <color name="spinner_border">#61000000</color> <!-- 38% Black -->
<color name="forum_discussion_nested_line">#cfd2d4</color>
<color name="forum_cell_highlight">#ffffff</color> <color name="forum_cell_highlight">#ffffff</color>
</resources> </resources>

2
briar-android/src/main/res/values/styles.xml
View File

@@ -102,7 +102,7 @@
<style name="DiscussionLevelIndicator"> <style name="DiscussionLevelIndicator">
<item name="android:layout_marginLeft">4dp</item> <item name="android:layout_marginLeft">4dp</item>
<item name="android:background">@color/divider</item> <item name="android:background">@color/thread_indicator</item>
</style> </style>
<style name="BriarTabLayout" parent="Widget.Design.TabLayout"> <style name="BriarTabLayout" parent="Widget.Design.TabLayout">