Got proguard working, shrank images and killed useless images

cosimo · Jul 30, 2011 · 6c5f4d7 · 6c5f4d7
1 parent d3ca126
commit 6c5f4d7
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 206 deletions.
diff --git a/astrid/build.properties b/astrid/build.properties
@@ -20,3 +20,5 @@ apikey.keyfile=/etc/todoroo/apikeys
 
 # suppress ant warnings
 build.sysclasspath=last
+
+proguard.config=proguard.cfg
diff --git a/astrid/build.xml b/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">

diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg
@@ -3,16 +3,28 @@
 -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
 -keep public class * extends android.content.BroadcastReceiver
 -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 *;
 }
+
+
+
diff --git a/astrid/res/drawable-hdpi/footer_background.png b/astrid/res/drawable-hdpi/footer_background.png
diff --git a/astrid/res/drawable-hdpi/header_background.png b/astrid/res/drawable-hdpi/header_background.png
diff --git a/astrid/res/drawable-land-mdpi/widget_frame.png b/astrid/res/drawable-land-mdpi/widget_frame.png
diff --git a/astrid/res/drawable-mdpi/widget_frame.png b/astrid/res/drawable-mdpi/widget_frame.png
diff --git a/astrid/res/drawable/astrid_com_logo.png b/astrid/res/drawable/astrid_com_logo.png
diff --git a/astrid/res/drawable/edit_header.png b/astrid/res/drawable/edit_header.png
diff --git a/astrid/res/drawable/edit_titlebar.png b/astrid/res/drawable/edit_titlebar.png
diff --git a/astrid/res/drawable/footer_background.png b/astrid/res/drawable/footer_background.png
diff --git a/astrid/res/drawable/header_background.png b/astrid/res/drawable/header_background.png
diff --git a/astrid/res/layout/custom_filter_activity.xml b/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"

diff --git a/astrid/res/layout/edit_people_activity.xml b/astrid/res/layout/edit_people_activity.xml
diff --git a/astrid/res/layout/task_list_body_tag.xml b/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">
 

diff --git a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 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),