diff options
| author | cyberta <cyberta@riseup.net> | 2018-06-24 15:17:53 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-06-24 15:17:53 -0700 |
| commit | ee64bde0da3ef44387e8af7ef980c4b1bb63565c (patch) | |
| tree | 021e30145e45726b276f1b7b4dbae3d95109bb28 /app/src/main | |
| parent | 55c3972e9ac0796a801c64788eb364cbd0c9cf02 (diff) | |
| parent | ea4c5ca2b27aeabd4a1b000ac2066be6023b2e45 (diff) | |
Merge branch 'customisation_feature' into 'master'
Customisation feature
See merge request leap/bitmask_android!75
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_main.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e1a9406..8b87d095 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,7 +86,7 @@ <activity android:name=".MainActivity" - android:label="@string/title_activity_main" + android:label="@string/app_name" android:launchMode="singleTop" /> <activity 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> |