Back to light theme

src/main/AndroidManifest.xml

@@ -5,8 +5,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.tasks"
-    android:versionName="4.6.18"
-    android:versionCode="333">
+    android:versionName="4.7"
+    android:versionCode="334">
 
     <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
     <!--    android:installLocation="internalOnly"> -->

src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java

@@ -30,7 +30,7 @@ public class DescriptionControlSet extends PopupControlSet {
     protected ImageView image;
 
     public DescriptionControlSet(ActivityPreferences preferences, Activity activity) {
-        super(preferences, activity, R.layout.control_set_notes, R.layout.control_set_notes_display, R.string.TEA_note_label);
+        super(preferences, activity, R.layout.control_set_description, R.layout.control_set_notes_display, R.string.TEA_note_label);
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 

src/main/res/layout/control_set_description.xml

@@ -39,7 +39,6 @@
 	      android:autoText="true"
 	      android:capitalize="sentences"
 	      android:singleLine="false"
-          android:textColorHint="@color/text_color_hint"
 	      android:textColor="?attr/asTextColor"
 	      android:freezesText="true" />
 	  </LinearLayout>

src/main/res/layout/control_set_title.xml

@@ -39,7 +39,6 @@
         android:scrollbars="vertical"
         android:imeOptions="flagNoExtractUi"
         android:text=""
-        android:textColorHint="@color/text_color_hint"
         android:textColor="?attr/asTextColor" />
 
 </LinearLayout>

src/main/res/layout/task_edit_activity.xml

@@ -107,6 +107,8 @@
             android:capitalize="sentences"
             android:imeOptions="flagNoExtractUi"
             android:hint="@string/TVA_add_comment"
+            android:textColor="@color/white_text"
+            android:textColorHint="@color/white_text_hint"
             android:paddingLeft="10dip"
             android:textSize="16sp" />
 

src/main/res/layout/toolbar.xml

@@ -1,5 +1,9 @@
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tasks="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="?attr/asAbBackgroundColor" />
+    android:background="?attr/asAbBackgroundColor"
+    tasks:theme="@style/ActionBarThemeOverlay"
+    tasks:popupTheme="@style/ActionBarPopupThemeOverlay"
+    tasks:titleTextAppearance="@style/ActionBar.TitleText" />

src/main/res/values-v11/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 
     <style name="DialogTheme" parent="@android:style/Theme.Dialog">

src/main/res/values-v21/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 </resources>

src/main/res/values/colors.xml

@@ -7,7 +7,6 @@
 <resources>
     <color name="task_list_overdue">#FFFB6666</color>
     <color name="task_list_done">#ff777777</color>
-    <color name="text_color_hint">#dde0e0e0</color>
     <color name="task_edit_deadline_gray">#888888</color>
     
     <color name="blue_theme_color">#33b5e5</color>
@@ -27,6 +26,8 @@
 
     <color name="drawer_background_selected">#dddddd</color>
     <color name="drawer_background">#efefef</color>
+    <color name="white_text">#fff</color>
+    <color name="white_text_hint">#eee</color>
 
     <color name="importance_1">#ffff5555</color>
     <color name="importance_2">#fffea400</color>

src/main/res/values/styles.xml

@@ -2,7 +2,7 @@
 
     <!-- ========================================================== General  -->
 
-    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 
     <style name="DialogTheme" parent="@android:style/Theme.Dialog">
@@ -55,10 +55,24 @@
         <item name="drawer_text">#000</item>
 
         <!-- actionbar-styling -->
+        <item name="homeAsUpIndicator">@drawable/ic_up</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_up</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
+    <style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">#fff</item>
+    </style>
+
+    <style name="ActionBarThemeOverlay" parent="">
+        <item name="android:textColorPrimary">#fff</item>
+        <item name="colorControlNormal">#fff</item>
+        <item name="colorControlHighlight">#3fff</item>
+    </style>
+
+    <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
     </style>