diff --git a/astrid/.classpath b/astrid/.classpath index 9d2ce9358..3eb50d47b 100644 --- a/astrid/.classpath +++ b/astrid/.classpath @@ -16,7 +16,6 @@ - @@ -28,7 +27,9 @@ - + + + diff --git a/astrid/build.xml b/astrid/build.xml index 3cdedd7e3..1dc05437b 100644 --- a/astrid/build.xml +++ b/astrid/build.xml @@ -54,6 +54,11 @@ + + + + @@ -142,10 +147,10 @@ replace="\1 true;" /> - - - - + + + diff --git a/astrid/common-src/com/mdimension/jchronic/AstridChronic.java b/astrid/common-src/com/mdimension/jchronic/AstridChronic.java index 7cf5b3251..935999efc 100644 --- a/astrid/common-src/com/mdimension/jchronic/AstridChronic.java +++ b/astrid/common-src/com/mdimension/jchronic/AstridChronic.java @@ -82,21 +82,12 @@ public class AstridChronic { throw new RuntimeException("Failed to scan tokens.", e); } - List scannerClasses = new LinkedList(); - scannerClasses.add(Grabber.class); - scannerClasses.add(Pointer.class); - scannerClasses.add(Scalar.class); - scannerClasses.add(Ordinal.class); - scannerClasses.add(Separator.class); - scannerClasses.add(TimeZone.class); - for (Class scannerClass : scannerClasses) { - try { - tokens = (List) scannerClass.getMethod("scan", List.class, Options.class).invoke(null, tokens, options); - } - catch (Throwable e) { - throw new RuntimeException("Failed to scan tokens.", e); - } - } + tokens = Grabber.scan(tokens, options); + tokens = Pointer.scan(tokens, options); + tokens = Scalar.scan(tokens, options); + tokens = Ordinal.scan(tokens, options); + tokens = Separator.scan(tokens, options); + tokens = TimeZone.scan(tokens, options); List taggedTokens = new LinkedList(); for (Token token : tokens) { diff --git a/astrid/libs/guava-11.0.1.jar b/astrid/libs/guava-11.0.1.jar new file mode 100644 index 000000000..af4a383ef Binary files /dev/null and b/astrid/libs/guava-11.0.1.jar differ diff --git a/astrid/libs/guava-r09.jar b/astrid/libs/guava-r09.jar deleted file mode 100644 index 30dbc5692..000000000 Binary files a/astrid/libs/guava-r09.jar and /dev/null differ diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index b1b75704d..6b7811bb2 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -472,4 +472,11 @@ public class TagViewActivity extends TaskListActivity { ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items); } + @Override + protected void refresh() { + setUpMembersGallery(); + loadTaskListContent(true); + ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items); + } + } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index 2e517038c..032ba707e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -1019,7 +1019,7 @@ public final class ActFmSyncService { } else if (id == ActFmPreferenceService.userId()) { model.setValue(idProperty, 0L); if (userProperty != null) - model.setValue(userProperty, ""); + model.setValue(userProperty, ActFmPreferenceService.thisUser().toString()); } else { model.setValue(idProperty, id); if(userProperty != null) diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java index 4314f6c0d..3cb6135c0 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -206,17 +206,11 @@ public class GCalControlSet extends PopupControlSet { @Override protected void refreshDisplayView() { - TextView t = (TextView) getDisplayView().findViewById(R.id.calendar_display_title); - if (hasEvent) { - t.setText(R.string.gcal_TEA_showCalendar_label); + TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which); + if (calendarSelector.getSelectedItemPosition() != 0) { + calendar.setText((String)calendarSelector.getSelectedItem()); } else { - t.setText(R.string.gcal_TEA_addToCalendar_label); - TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which); - if (calendarSelector.getSelectedItemPosition() != 0) { - calendar.setText((String)calendarSelector.getSelectedItem()); - } else { - calendar.setText(""); - } + calendar.setText(R.string.gcal_TEA_none_selected); } } diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg index f900d0750..38aac649f 100644 --- a/astrid/proguard.cfg +++ b/astrid/proguard.cfg @@ -1,16 +1,16 @@ --optimizationpasses 5 +-optimizationpasses 2 -dontusemixedcaseclassnames -dontskipnonpubliclibraryclasses -dontpreverify -verbose +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable # astrid-specific -dontobfuscate --dontoptimize -keepattributes SourceFile, SourceDir, LineNumberTable, LocalVariableTable, LocalVariableTypeTable --keep class com.todoroo.** +-keep, allowshrinking, allowoptimization class com.todoroo.** -keep class com.mdimension.** --keepnames class com.google.** +-keep class com.google.common.base.Preconditions # ignore reflection-based access from google libraries -dontwarn com.google.** @@ -31,10 +31,6 @@ -keep public class * extends android.app.backup.BackupAgentHelper -keep public class * extends android.preference.Preference --keepclasseswithmembernames class * { - native ; -} - -keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet); } diff --git a/astrid/res/drawable-hdpi/header_tags_normal.png b/astrid/res/drawable-hdpi/header_tags_normal.png deleted file mode 100644 index 6a6311c28..000000000 Binary files a/astrid/res/drawable-hdpi/header_tags_normal.png and /dev/null differ diff --git a/astrid/res/drawable-hdpi/header_tags_pressed.png b/astrid/res/drawable-hdpi/header_tags_pressed.png deleted file mode 100644 index 81b85888a..000000000 Binary files a/astrid/res/drawable-hdpi/header_tags_pressed.png and /dev/null differ diff --git a/astrid/res/drawable-hdpi/header_tasks_normal.png b/astrid/res/drawable-hdpi/header_tasks_normal.png deleted file mode 100644 index bac6f93df..000000000 Binary files a/astrid/res/drawable-hdpi/header_tasks_normal.png and /dev/null differ diff --git a/astrid/res/drawable-hdpi/header_tasks_pressed.png b/astrid/res/drawable-hdpi/header_tasks_pressed.png deleted file mode 100644 index 3e5dcedbb..000000000 Binary files a/astrid/res/drawable-hdpi/header_tasks_pressed.png and /dev/null differ diff --git a/astrid/res/drawable/astrid_com_logo.png b/astrid/res/drawable/astrid_com_logo.png index f7e1d3093..29fc4db51 100644 Binary files a/astrid/res/drawable/astrid_com_logo.png and b/astrid/res/drawable/astrid_com_logo.png differ diff --git a/astrid/res/drawable/header_settings_normal.png b/astrid/res/drawable/header_settings_normal.png deleted file mode 100644 index e9556e2cf..000000000 Binary files a/astrid/res/drawable/header_settings_normal.png and /dev/null differ diff --git a/astrid/res/drawable/header_settings_pressed.png b/astrid/res/drawable/header_settings_pressed.png deleted file mode 100644 index ce47af1e1..000000000 Binary files a/astrid/res/drawable/header_settings_pressed.png and /dev/null differ diff --git a/astrid/res/drawable/header_tags_normal.png b/astrid/res/drawable/header_tags_normal.png deleted file mode 100644 index 6723f4095..000000000 Binary files a/astrid/res/drawable/header_tags_normal.png and /dev/null differ diff --git a/astrid/res/drawable/header_tags_pressed.png b/astrid/res/drawable/header_tags_pressed.png deleted file mode 100644 index 02153920f..000000000 Binary files a/astrid/res/drawable/header_tags_pressed.png and /dev/null differ diff --git a/astrid/res/drawable/header_tasks.xml b/astrid/res/drawable/header_tasks.xml deleted file mode 100644 index 641c21aa1..000000000 --- a/astrid/res/drawable/header_tasks.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - diff --git a/astrid/res/drawable/header_tasks_normal.png b/astrid/res/drawable/header_tasks_normal.png deleted file mode 100644 index 616f70771..000000000 Binary files a/astrid/res/drawable/header_tasks_normal.png and /dev/null differ diff --git a/astrid/res/drawable/header_tasks_pressed.png b/astrid/res/drawable/header_tasks_pressed.png deleted file mode 100644 index 8bf9b36a1..000000000 Binary files a/astrid/res/drawable/header_tasks_pressed.png and /dev/null differ diff --git a/astrid/res/drawable/icn_edit_calendar.png b/astrid/res/drawable/icn_edit_calendar.png index 90bb03c10..7a92cc761 100644 Binary files a/astrid/res/drawable/icn_edit_calendar.png and b/astrid/res/drawable/icn_edit_calendar.png differ diff --git a/astrid/res/drawable/ios_fabric_480.png b/astrid/res/drawable/ios_fabric_480.png index baf66d279..c4e7e6a85 100644 Binary files a/astrid/res/drawable/ios_fabric_480.png and b/astrid/res/drawable/ios_fabric_480.png differ diff --git a/astrid/res/drawable/ios_fabric_480_dark.png b/astrid/res/drawable/ios_fabric_480_dark.png index 7383e3fe6..35800af54 100644 Binary files a/astrid/res/drawable/ios_fabric_480_dark.png and b/astrid/res/drawable/ios_fabric_480_dark.png differ diff --git a/astrid/res/drawable/pdv_logo.png b/astrid/res/drawable/pdv_logo.png index 9e72a2aa9..282b1cc0c 100644 Binary files a/astrid/res/drawable/pdv_logo.png and b/astrid/res/drawable/pdv_logo.png differ diff --git a/astrid/res/drawable/welcome_android_overlay.png b/astrid/res/drawable/welcome_android_overlay.png deleted file mode 100644 index 4cb2876d0..000000000 Binary files a/astrid/res/drawable/welcome_android_overlay.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_screen.png b/astrid/res/drawable/welcome_screen.png deleted file mode 100644 index 415438d28..000000000 Binary files a/astrid/res/drawable/welcome_screen.png and /dev/null differ diff --git a/astrid/res/drawable/welcome_walkthrough_1.png b/astrid/res/drawable/welcome_walkthrough_1.png index b7a4b0a58..6557477a9 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_1.png and b/astrid/res/drawable/welcome_walkthrough_1.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_2.png b/astrid/res/drawable/welcome_walkthrough_2.png index 04857d997..dc34c5851 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_2.png and b/astrid/res/drawable/welcome_walkthrough_2.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_3.png b/astrid/res/drawable/welcome_walkthrough_3.png index 8fd2b31f4..bf5ecf9e1 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_3.png and b/astrid/res/drawable/welcome_walkthrough_3.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_4.png b/astrid/res/drawable/welcome_walkthrough_4.png index 624f4157f..741ff3659 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_4.png and b/astrid/res/drawable/welcome_walkthrough_4.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_6.png b/astrid/res/drawable/welcome_walkthrough_6.png index f353d3d63..0c006847a 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_6.png and b/astrid/res/drawable/welcome_walkthrough_6.png differ diff --git a/astrid/res/drawable/welcome_walkthrough_fabric.png b/astrid/res/drawable/welcome_walkthrough_fabric.png index 67f9c3941..b5388bf12 100644 Binary files a/astrid/res/drawable/welcome_walkthrough_fabric.png and b/astrid/res/drawable/welcome_walkthrough_fabric.png differ diff --git a/astrid/res/layout/control_set_gcal_display.xml b/astrid/res/layout/control_set_gcal_display.xml index 2feb5ca90..c6054eef1 100644 --- a/astrid/res/layout/control_set_gcal_display.xml +++ b/astrid/res/layout/control_set_gcal_display.xml @@ -9,28 +9,21 @@ android:id="@+id/gcal_body" android:layout_width="fill_parent" android:layout_height="50dip" + android:paddingLeft="5dip" android:gravity="center_vertical"> - - - - + + diff --git a/astrid/res/layout/welcome_screen.xml b/astrid/res/layout/welcome_screen.xml deleted file mode 100644 index 25013b621..000000000 --- a/astrid/res/layout/welcome_screen.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml index 3b0ff4323..f5d7da4d5 100644 --- a/astrid/res/layout/welcome_walkthrough_login_page.xml +++ b/astrid/res/layout/welcome_walkthrough_login_page.xml @@ -15,7 +15,7 @@ android:gravity="center_horizontal" android:paddingBottom="10dip" android:layout_marginTop="30dip" - android:text="Connect now\nto get started!" + android:text="@string/welcome_title_7" android:textColor="#444444" android:textSize="40dip" android:textStyle="bold" @@ -47,7 +47,7 @@ android:paddingRight="20dip" android:paddingBottom="5dip" android:textSize="16sp" - android:textColor="#ffffff" /> + android:textColor="#444444" />