diff options
| author | lalottacontinua <loddatio@posteo.de> | 2018-06-27 22:44:33 +0200 |
|---|---|---|
| committer | lalottacontinua <loddatio@posteo.de> | 2018-06-27 22:44:33 +0200 |
| commit | d63dd4b36701f2f993e671f8cc3c5424b787e43a (patch) | |
| tree | 486a8c3a1a688e76c7da7f5d9f8dfddbcc0b58aa /app/src/main/res | |
| parent | 277f0f12ca505797daec42a5211885ac07b909f9 (diff) | |
| parent | 8c9879145e588e985e5305ee2f88dfc1b6bf1d10 (diff) | |
Merge branch 'master' into add_provider
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/a_main.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 |
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> |