summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2018-06-24 15:17:53 -0700
committercyberta <cyberta@riseup.net>2018-06-24 15:17:53 -0700
commitee64bde0da3ef44387e8af7ef980c4b1bb63565c (patch)
tree021e30145e45726b276f1b7b4dbae3d95109bb28 /app/src/main/res
parent55c3972e9ac0796a801c64788eb364cbd0c9cf02 (diff)
parentea4c5ca2b27aeabd4a1b000ac2066be6023b2e45 (diff)
Merge branch 'customisation_feature' into 'master'
Customisation feature See merge request leap/bitmask_android!75
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/a_main.xml3
-rw-r--r--app/src/main/res/values/colors.xml3
2 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml
index bed05d18..21fdaa66 100644
--- a/app/src/main/res/layout/a_main.xml
+++ b/app/src/main/res/layout/a_main.xml
@@ -20,7 +20,8 @@
android:minHeight="?attr/actionBarSize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:titleTextColor="@android:color/white"
+ app:titleTextColor="@color/colorActionBarTitleFont"
+ app:subtitleTextColor="@color/colorActionBarSubtitleFont"
android:background="?attr/colorPrimary">
</android.support.v7.widget.Toolbar>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 53ead009..40ab06c5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,4 +27,7 @@
<color name="white">#ffffff</color>
+ <color name="colorActionBarTitleFont">@color/white</color>
+ <color name="colorActionBarSubtitleFont">@color/black800</color>
+
</resources>