Small UI changes from UX feedback
These include:
-Make date of birth have 70% opactity
-Change tab color to teal
Bug:27533454
Change-Id: I4ba21783770923d499c577dbc1e62f406fde1cd1
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 756ddf3..2fc205a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,4 +18,6 @@
<color name="emergency_primary">#E53935</color>
<color name="emergency_accent">#FFFF00</color>
<color name="tab_text_color">#FFFFFF</color>
+ <color name="material_teal_200">#FF80CBC4</color>
+ <color name="white_with_alpha">#B2FFFFFF</color>
</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 79f55a5..e81fb03 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,10 +36,10 @@
<string name="date_of_birth">Date of birth</string>
<!-- The default preference subtitle text to show when the date of birth is unknown. [CHAR_LIMIT=40] -->
<string name="unknown_date_of_birth">Unknown</string>
- <!-- The age and date of birth of the user. [CHAR_LIMIT=40] -->
- <string name="dob_and_age">
- Age: <xliff:g id="numerical_age" example="29">%1$d</xliff:g> (<xliff:g id="date_of_birth" example="3 feb 1987">%2$s</xliff:g>)
- </string>
+ <!-- Parenthesis around the date of birth of a user. [CHAR_LIMIT=40] -->
+ <string name="dob">
+ (<xliff:g id="date_of_birth" example="3 feb 1987">%1$s</xliff:g>)
+ </string>
<!-- The age of the user. [CHAR_LIMIT=20] -->
<string name="age">
Age: <xliff:g id="numerical_age" example="29">%1$d</xliff:g>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4081c99..4b985dc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,6 +18,7 @@
<item name="android:preferenceCategoryStyle">@style/AppTheme.PreferenceCategoryStyle</item>
<item name="colorPrimary">@color/material_blue_grey_900</item>
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
+ <item name="colorAccent">@color/material_teal_200</item>
<item name="android:datePickerStyle">@style/AppTheme.DatePickerStyle</item>
</style>
<!-- Base emergency theme. -->
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index 2f34c9d..de06be8 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -21,7 +21,10 @@
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.TabLayout;
+import android.text.Spannable;
+import android.text.SpannableString;
import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
import android.util.Pair;
import android.view.Menu;
import android.view.MenuInflater;
@@ -91,17 +94,21 @@
if (!dateOfBirthNotSet) {
mPersonalCardSmallItem.setVisibility(View.VISIBLE);
int age = computeAge(dateOfBirthTimeMillis);
- String localizedDob = mDateFormat.format(new Date(dateOfBirthTimeMillis));
+ String localizedDob = String.format(getString(R.string.dob),
+ mDateFormat.format(new Date(dateOfBirthTimeMillis)));
+ Spannable spannableDob = new SpannableString(localizedDob);
+ spannableDob.setSpan(new ForegroundColorSpan(
+ getResources().getColor(R.color.white_with_alpha)), 0,
+ localizedDob.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
if (nameEmpty) {
// Display date of birth info in two lines: age and then date of birth
- mPersonalCardLargeItem.setText(String.format(getString(R.string.age),
- age));
- mPersonalCardSmallItem.setText(localizedDob);
+ mPersonalCardLargeItem.setText(String.format(getString(R.string.age), age));
+ mPersonalCardSmallItem.setText(spannableDob);
} else {
mPersonalCardLargeItem.setText(name);
- mPersonalCardSmallItem.setText(String.format(getString(R.string.dob_and_age),
- age,
- localizedDob));
+ mPersonalCardSmallItem.setText(String.format(getString(R.string.age), age));
+ mPersonalCardSmallItem.append(" ");
+ mPersonalCardSmallItem.append(spannableDob);
}
} else {
mPersonalCardSmallItem.setVisibility(View.GONE);
