Skip to content

Commit fa6c626

Browse files
committed
Fix brand icon color on older devices
1 parent bd8f350 commit fa6c626

File tree

7 files changed

+11
-12
lines changed

7 files changed

+11
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Adheres to [Semantic Versioning](http://semver.org/).
1616
* Show change event in nav drawer if user has more than one event.
1717
* Fix mgrs bug in which grid would not show on map on initial load.
1818
* Use map type from user preferences in observation location edit activity.
19+
* Fix brand icon color on older devices.
1920

2021
## [6.1.0](https://github.com/ngageoint/mage-android/releases/tag/6.1.0) (04-16-2018)
2122

mage/src/main/res/color-night/header.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

mage/src/main/res/color/header.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

mage/src/main/res/layout-land/mage_header.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
android:layout_width="30dp"
1212
android:layout_height="30dp"
1313
android:layout_marginEnd="8dp"
14-
android:tint="@color/header"
14+
android:tint="@color/header_color"
1515
android:src="@drawable/ic_wand_white_50dp"/>
1616

1717
<TextView
1818
android:id="@+id/mage"
1919
android:layout_width="wrap_content"
2020
android:layout_height="30dp"
21-
android:textColor="@color/header"
21+
android:textColor="@color/header_color"
2222
android:textSize="30sp"
2323
android:includeFontPadding="false"
2424
android:text="MAGE"/>

mage/src/main/res/layout/mage_header.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
35
android:layout_width="match_parent"
46
android:layout_height="100dp"
57
android:orientation="horizontal"
@@ -11,14 +13,14 @@
1113
android:layout_width="50dp"
1214
android:layout_height="50dp"
1315
android:layout_marginEnd="8dp"
14-
android:tint="@color/header"
16+
android:tint="@color/header_color"
1517
android:src="@drawable/ic_wand_white_50dp"/>
1618

1719
<TextView
1820
android:id="@+id/mage"
1921
android:layout_width="wrap_content"
2022
android:layout_height="50dp"
21-
android:textColor="@color/header"
23+
android:textColor="@color/header_color"
2224
android:textSize="50sp"
2325
android:includeFontPadding="false"
2426
android:text="MAGE"/>

mage/src/main/res/values-night/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<color name="background_dialog">@color/md_grey_800</color>
66
<color name="background_transparent">#E7111111</color>
77

8+
<color name="header_color">@color/md_white_1000</color>
9+
810
<color name="bottom_navigation_background">@color/md_blue_grey_700</color>
911

1012
<color name="setting_sub_toolbar">@color/md_blue_grey_800</color>

mage/src/main/res/values/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<color name="background_dialog">@android:color/white</color>
66
<color name="background_transparent">#E7EEEEEE</color>
77

8+
<color name="header_color">@color/md_blue_800</color>
9+
810
<color name="download_icon">@color/md_blue_600</color>
911

1012
<color name="bottom_navigation_background">@android:color/white</color>

0 commit comments

Comments
 (0)