Merge remote-tracking branch 'origin/master'

AMOS-2015 · May 6, 2015 · b074401 · b074401
2 parents 807c14b + bc728de
commit b074401
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/client/src/main/res/layout/fragment_join_trip_results.xml b/client/src/main/res/layout/fragment_join_trip_results.xml
@@ -16,8 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:textAppearance="@android:style/TextAppearance.Large"
-            android:textColor="@color/text"/>
+            android:textAppearance="@android:style/TextAppearance.Large"/>
 
         <ListView
             android:id="@+id/lv_join_trip_results"
@@ -39,7 +38,6 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:text="@string/join_trip_results_error"
-        android:textColor="@color/error"
         android:layout_gravity = "center_vertical|center_horizontal"/>
 
 </FrameLayout>

diff --git a/client/src/main/res/layout/fragment_pick_up_passenger.xml b/client/src/main/res/layout/fragment_pick_up_passenger.xml
@@ -7,13 +7,11 @@
     <TextView
         android:id="@+id/tv_pick_up_passenger"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/text"/>
+        android:layout_height="wrap_content"/>
 
     <TextView
         android:id="@+id/tv_pick_up_passenger_price"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/text"/>
+        android:layout_height="wrap_content"/>
 
 </LinearLayout>
diff --git a/client/src/main/res/layout/fragment_profile.xml b/client/src/main/res/layout/fragment_profile.xml
@@ -58,7 +58,6 @@
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:textAppearance="@android:style/TextAppearance.Large"
                 android:text="@string/profile_unknown"
-                android:textColor="@color/text"
                 />
 
             <TextView
@@ -73,7 +72,6 @@
                 android:textAppearance="@android:style/TextAppearance.Medium"
                 android:layout_marginBottom="5dp"
                 android:text="@string/profile_unknown"
-                android:textColor="@color/text"
                 />
 
             <TextView
@@ -88,7 +86,6 @@
                 android:textAppearance="@android:style/TextAppearance.Medium"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:text="@string/profile_unknown"
-                android:textColor="@color/text"
                 />
 
             <TextView
@@ -98,7 +95,6 @@
                 android:layout_width="match_parent"
                 android:text="@string/profile_gender"
                 style="?android:attr/listSeparatorTextViewStyle"
-                android:textColor="@color/secondary_text"
                 />
 
             <TextView
@@ -108,7 +104,6 @@
                 android:gravity="center_vertical"
                 android:layout_below="@id/tv_profile_gender_title"
                 android:text="@string/profile_unknown"
-                android:textColor="@color/secondary_text"
                 />
 
             <TextView
@@ -118,8 +113,7 @@
                 android:layout_width="match_parent"
                 android:text="@string/profile_birthyear"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:textColor="@color/secondary_text"/>
+                style="?android:attr/listSeparatorTextViewStyle"/>
 
             <TextView
                 android:id="@+id/tv_profile_birthyear"
@@ -128,7 +122,6 @@
                 android:gravity="center_vertical"
                 android:layout_below="@id/tv_profile_birthyear_title"
                 android:text="@string/profile_unknown"
-                android:textColor="@color/secondary_text"
                 />
 
             <TextView
@@ -138,8 +131,7 @@
                 android:layout_width="match_parent"
                 android:text="@string/profile_address"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                style="?android:attr/listSeparatorTextViewStyle"
-                android:textColor="@color/secondary_text"/>
+                style="?android:attr/listSeparatorTextViewStyle"/>
 
             <TextView
                 android:id="@+id/tv_profile_address"
@@ -148,7 +140,6 @@
                 android:gravity="center_vertical"
                 android:layout_below="@id/tv_profile_address_title"
                 android:text="@string/profile_unknown"
-                android:textColor="@color/secondary_text"
                 />
 
 

diff --git a/client/src/main/res/layout/listview_row_join_trip_results.xml b/client/src/main/res/layout/listview_row_join_trip_results.xml
@@ -20,8 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/tv_join_trip_results_price"
         android:layout_toStartOf="@id/tv_join_trip_results_price"
-        android:textAppearance="@android:style/TextAppearance.Medium"
-        android:textColor="@color/text">
+        android:textAppearance="@android:style/TextAppearance.Medium">
     </TextView>
 
     <TextView
@@ -30,8 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/tv_join_trip_results_price"
         android:layout_toStartOf="@id/tv_join_trip_results_price"
-        android:layout_below="@id/tv_join_trip_results_driver_name"
-        android:textColor="@color/secondary_text">
+        android:layout_below="@id/tv_join_trip_results_driver_name">
     </TextView>
 
     <TextView
@@ -40,8 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/tv_join_trip_results_price"
         android:layout_toStartOf="@id/tv_join_trip_results_price"
-        android:layout_below="@id/tv_join_trip_results_distance"
-        android:textColor="@color/secondary_text">
+        android:layout_below="@id/tv_join_trip_results_distance">
     </TextView>