Got proguard working, shrank images and killed useless images

astrid/build.properties

@@ -20,3 +20,5 @@ apikey.keyfile=/etc/todoroo/apikeys
 
 # suppress ant warnings
 build.sysclasspath=last
+
+proguard.config=proguard.cfg

astrid/build.xml

@@ -170,6 +170,11 @@
                      replace="\1 true;" />
     </target>
 
+    <target name="obfuscate">
+      <property name="proguard.enabled" value="true" />
+      <antcall target="-obfuscate" />      
+    </target>
+
     <!-- build custom release package with updated version name -->
     <target name="release-custom">
       <fail message="need to set custom.version.name">

astrid/proguard.cfg

@@ -3,8 +3,21 @@
 -dontskipnonpubliclibraryclasses
 -dontpreverify
 -verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+# -optimizations !class/*,!code/simplification/arithmetic,!field/*
+-optimizations method/*,code/simplification,code/removal,code/allocation,class/marking,field/marking
 
+# astrid-specific
+-dontobfuscate
+-keepattributes SourceFile, SourceDir, LineNumberTable, LocalVariableTable, LocalVariableTypeTable
+-keepnames class com.todoroo.**
+-keepnames class com.google.**
+-libraryjar libs
+
+# ignore reflection-based access from google libraries
+-dontwarn com.google.**
+-dontnote com.google.common.base.**
+
+# android default preserves
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application
 -keep public class * extends android.app.Service
@@ -12,7 +25,6 @@
 -keep public class * extends android.content.ContentProvider
 -keep public class * extends android.app.backup.BackupAgentHelper
 -keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
 
 -keepclasseswithmembernames class * {
     native <methods>;
@@ -34,3 +46,6 @@
 -keep class * implements android.os.Parcelable {
   public static final android.os.Parcelable$Creator *;
 }
+
+
+

astrid/res/layout/custom_filter_activity.xml

@@ -37,7 +37,7 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="10dip"
       android:padding="5dip"
-      android:background="@drawable/edit_header"
+      android:background="@drawable/header_background"
       android:baselineAligned="false">
       
       <Button android:id="@+id/add"

astrid/res/layout/edit_people_activity.xml

@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="@drawable/background_gradient">
-    
-    <ScrollView 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100">
-
-        <LinearLayout 
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="5dip"
-            android:orientation="vertical">
-
-          <TextView 
-              android:id="@+id/title"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:gravity="center"
-              style="@style/TextAppearance.TAd_ItemTitle"
-              android:paddingTop="10dip"
-              android:textSize="22sp" />
-              
-          <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:layout_margin="15dip"
-            android:background="@android:drawable/divider_horizontal_dark" />
-            
-          <TextView 
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:paddingBottom="5dip"
-              android:text="@string/actfm_EPA_assign_label" />        
-          
-          <LinearLayout
-              android:orientation="horizontal"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
-            
-             <Spinner
-                  android:id="@+id/assigned_spinner"
-                  android:layout_width="fill_parent"
-                  android:layout_height="45dip"
-                  android:layout_weight="1"
-                  android:layout_gravity="center_vertical"
-                  android:hint="@string/actfm_person_hint" />
-            
-             <com.todoroo.astrid.ui.ContactsAutoComplete
-                  android:id="@+id/assigned_custom"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:layout_gravity="center_vertical"
-                  android:visibility="gone"
-                  android:hint="@string/actfm_person_hint" />
-                  
-              <ImageButton android:id="@+id/assigned_clear"
-                  style="?android:attr/buttonStyleInset"
-                  android:src="@android:drawable/ic_delete"
-                  android:layout_width="wrap_content"
-                  android:layout_height="fill_parent"
-                  android:layout_marginTop="2dip"
-                  android:layout_marginRight="2dip"
-                  android:layout_marginBottom="2dip"
-                  android:visibility="gone"
-                  android:gravity="center_vertical" />
-          </LinearLayout>
-                    
-          <TextView 
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:paddingBottom="5dip"
-              android:text="@string/actfm_EPA_share_with" />
-          
-          <com.todoroo.astrid.ui.PeopleContainer
-              android:id="@+id/share_container"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              astrid:completeTags="true" />
-          
-          <LinearLayout
-              android:id="@+id/share_additional"
-              android:orientation="vertical"
-              android:padding="5dip"
-              android:visibility="gone"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
-              
-              <View
-                  android:layout_width="fill_parent"
-                  android:layout_height="1dip"
-                  android:background="@android:drawable/divider_horizontal_dark" />
-                        
-              <TextView 
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingTop="5dip"
-                  android:paddingBottom="5dip"
-                  android:text="@string/actfm_EPA_message_text" />
-              
-              <EditText
-                  android:id="@+id/message"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:scrollbars="vertical"
-                  android:text="@string/actfm_EPA_message_body"
-                  android:autoText="true"
-                  android:capitalize="sentences"
-                  android:singleLine="false" />
-                        
-              <TextView 
-                  android:id="@+id/tag_label"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingBottom="5dip"
-                  android:visibility="gone"
-                  android:text="@string/actfm_EPA_tag_label" />
-          
-              <EditText
-                  android:id="@+id/tag_name"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:visibility="gone"
-                  android:hint="@string/actfm_EPA_tag_hint" />
-                  
-              <View
-                  android:layout_width="fill_parent"
-                  android:layout_height="1dip"
-                  android:background="@android:drawable/divider_horizontal_dark" />
-                  
-          </LinearLayout>
-          
-          <CheckBox 
-              android:id="@+id/checkbox_facebook"
-              android:text="@string/actfm_EPA_facebook" 
-              android:paddingLeft="45dip"
-              android:visibility="gone"
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content"/>
-          
-          <CheckBox 
-              android:id="@+id/checkbox_twitter"
-              android:text="@string/actfm_EPA_twitter" 
-              android:paddingLeft="45dip"
-              android:visibility="gone"
-              android:layout_width="fill_parent" 
-              android:layout_height="wrap_content"/>
-              
-          <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:layout_margin="15dip"
-            android:background="@android:drawable/divider_horizontal_dark" />
-            
-          <TextView 
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="15dip"
-              android:text="@string/actfm_EPA_intro"
-              android:gravity="center"
-              android:textColor="#ffaa00"/>
-                    
-      </LinearLayout>
-      
-  </ScrollView>
-         
-  <LinearLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_marginTop="10dip"
-      android:padding="5dip"
-      android:orientation="horizontal"
-      android:background="@drawable/edit_header"
-      android:baselineAligned="false">
-      
-      <Button
-          android:id="@+id/save"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:text="@string/actfm_EPA_save"
-          android:drawableLeft="@drawable/tango_save" />
-      <ImageButton
-          android:id="@+id/discard"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:src="@drawable/tango_stop" />
-        
-    </LinearLayout>
-            
-</LinearLayout>

astrid/res/layout/task_list_body_tag.xml

@@ -182,7 +182,7 @@
             android:visibility="gone"
             android:layout_marginTop="10dip"
             android:padding="5dip"
-            android:background="@drawable/edit_header"
+            android:background="@drawable/footer_background"
             android:orientation="horizontal"
             android:baselineAligned="false">
             

astrid/src/com/todoroo/astrid/activity/AddOnActivity.java

@@ -51,7 +51,7 @@ public class AddOnActivity extends TabActivity {
                 tabHost.getTabContentView(), true);
         tabHost.addTab(tabHost.newTabSpec(r.getString(R.string.AOA_tab_installed)).
                 setIndicator(r.getString(R.string.AOA_tab_installed),
-                        r.getDrawable(R.drawable.ic_menu_archive)).setContent(
+                        r.getDrawable(R.drawable.gl_pencil)).setContent(
                                 R.id.tab_installed));
         tabHost.addTab(tabHost.newTabSpec(r.getString(R.string.AOA_tab_available)).
                 setIndicator(r.getString(R.string.AOA_tab_available),