Improved task edit tab appearance

astrid/res/drawable/custom_tab_indicator.xml

@@ -16,12 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Non focused states -->
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected" />
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected" />
+    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_layer" />
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected" />
-
-    <!-- Focused states -->
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_focused" />
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_focused" />
 
 </selector>

astrid/res/drawable/custom_tab_indicator_alt.xml

@@ -16,12 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Non focused states -->
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_alt" />
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_alt" />
+    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_alt_layer" />
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_alt" />
+    
-
-    <!-- Focused states -->
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_focused_alt" />
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_focused_alt" />
-
 </selector>

astrid/res/drawable/custom_tab_indicator_dark.xml

@@ -15,12 +15,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Non focused states -->
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected" />
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected" />
 
-    <!-- Focused states -->
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected" />
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected_focused" />
+    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected_layer" />
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected_focused" />
 
 </selector>

astrid/res/drawable/custom_tab_indicator_dark_blue.xml

@@ -15,12 +15,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Non focused states -->
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_unselected" />
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_selected" />
 
-    <!-- Focused states -->
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_unselected" />
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_unselected_focused" />
+    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_selected_layer" />
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_selected_focused" />
 
 </selector>

astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/task_edit_background_white"/>
+    <item android:drawable="@drawable/custom_tab_indicator_dark_blue_selected"/>
+</layer-list>

astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/task_edit_background"/>
+    <item android:drawable="@drawable/custom_tab_indicator_dark_selected"/>    
+
+</layer-list>

astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/task_edit_background_white"/>
+    <item android:drawable="@drawable/custom_tab_indicator_selected_alt"/>
+</layer-list>

astrid/res/drawable/custom_tab_indicator_selected_layer.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/task_edit_background_white"/>
+    <item android:drawable="@drawable/custom_tab_indicator_selected"/>
+</layer-list>

astrid/res/drawable/task_edit_background_white.xml

@@ -14,7 +14,7 @@
             <corners android:radius="2dp" />
         </shape>
     </item>
-    <item android:bottom="2px" android:right="2px" android:top="1px" android:left="1px">
+    <item android:bottom="2px" android:right="1px" android:top="1px" android:left="1px">
         <shape android:shape="rectangle" >
             <solid android:color="#ffffff" />
             <corners android:radius="2dp" />

astrid/res/values/styles.xml

@@ -559,7 +559,7 @@
     <style name="CustomTabPageIndicator.Text" parent="Widget.TabPageIndicator.Text">
         <item name="android:textColor">?attr/asTextColor</item>                                                                                                                                                              
         <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:textStyle">normal</item>
         <item name="android:layout_marginLeft">0dip</item>
         <item name="android:layout_marginRight">0dip</item>
     </style>