archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor bug fixes - to content values from shortcut, improved the filter tags images to not be fuzzy, made the filters page look better on dpi=160 screens, etc

Browse Source
pull/14/head
Tim Su 14 years ago
parent 95154ca51c
commit 095d95d97f
10 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
Unescape Escape View File

@ -189,7 +189,7 @@ public class AndroidUtilities {
if(string == null)
return null;
String[] pairs = string.split(",");
String[] pairs = string.split(" ");
ContentValues result = new ContentValues();
for(String item : pairs) {
String[] keyValue = item.split("=");

2
astrid/default.properties
Unescape Escape View File

@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-8
target=android-4
apk-configurations=

13
astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
Unescape Escape View File

@ -21,7 +21,9 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import com.flurry.android.FlurryAgent;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet;
import com.todoroo.astrid.gcal.Calendars.CalendarResult;
import com.todoroo.astrid.model.Task;
@ -35,7 +37,7 @@ import com.todoroo.astrid.model.Task;
public class GCalControlSet implements TaskEditControlSet {
/** If task has no estimated time, how early to set a task in calendar (seconds)*/
private static final int DEFAULT_CAL_TIME = 3600;
private static final long DEFAULT_CAL_TIME = DateUtilities.ONE_HOUR;
// --- instance variables
@ -53,6 +55,8 @@ public class GCalControlSet implements TaskEditControlSet {
private final Button viewCalendarEvent;
public GCalControlSet(final Activity activity, ViewGroup parent) {
DependencyInjectionService.getInstance().inject(this);
this.activity = activity;
LayoutInflater.from(activity).inflate(R.layout.gcal_control, parent, true);
@ -65,6 +69,7 @@ public class GCalControlSet implements TaskEditControlSet {
android.R.layout.simple_spinner_item, calendars.calendars);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
calendarSelector.setAdapter(adapter);
calendarSelector.setSelection(calendars.defaultIndex);
addToCalendar.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
@ -163,7 +168,7 @@ public class GCalControlSet implements TaskEditControlSet {
long dueDate = task.getValue(Task.DUE_DATE);
if(task.hasDueDate()) {
if(task.hasDueTime()) {
int estimatedTime = task.getValue(Task.ESTIMATED_SECONDS);
long estimatedTime = task.getValue(Task.ESTIMATED_SECONDS);
if(estimatedTime <= 0)
estimatedTime = DEFAULT_CAL_TIME;
values.put("dtstart", dueDate - estimatedTime);
@ -173,6 +178,10 @@ public class GCalControlSet implements TaskEditControlSet {
values.put("dtend", dueDate);
values.put("allDay", "1");
}
} else {
values.put("dtstart", DateUtilities.now());
values.put("dtend", DateUtilities.now());
values.put("allDay", "1");
}
}
}

16
astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
Unescape Escape View File

@ -35,12 +35,16 @@ public class GCalTaskCompleteListener extends BroadcastReceiver {
String calendarUri = task.getValue(Task.CALENDAR_URI);
if(!TextUtils.isEmpty(calendarUri)) {
// change title of calendar event
ContentResolver cr = context.getContentResolver();
ContentValues values = new ContentValues();
values.put("title", context.getString(R.string.gcal_completed_title,
task.getValue(Task.TITLE)));
cr.update(Uri.parse(calendarUri), values, null, null);
try {
// change title of calendar event
ContentResolver cr = context.getContentResolver();
ContentValues values = new ContentValues();
values.put("title", context.getString(R.string.gcal_completed_title,
task.getValue(Task.TITLE)));
cr.update(Uri.parse(calendarUri), values, null, null);
} catch (Exception e) {
// do nothing.
}
}
}

BIN
astrid/res/drawable/filter_tags1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 726 B

BIN
astrid/res/drawable/filter_tags2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 738 B

BIN
astrid/res/drawable/filter_untagged.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 717 B

5
astrid/res/values/styles-3.0.xml
Unescape Escape View File

@ -66,9 +66,7 @@
<style name="TextAppearance.FLA_Filter" parent="TextAppearance.TAd_ItemTitle">
<item name="android:textSize">20sp</item>
<item name="android:paddingTop">5px</item>
<item name="android:paddingBottom">5px</item>
<item name="android:paddingLeft">10px</item>
<item name="android:paddingLeft">10dip</item>
</style>
<style name="TextAppearance.FLA_Header" parent="TextAppearance.TAd_ItemTitle">
@ -77,6 +75,7 @@
</style>
<style name="TextAppearance.FLA_Category" parent="TextAppearance.TAd_ItemTitle">
<item name="android:textSize">18sp</item>
<item name="android:textColor">#ff7ada24</item>
<item name="android:textStyle">bold|italic</item>
</style>

16
astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
Unescape Escape View File

@ -17,20 +17,21 @@ import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.os.Parcelable;
import android.util.DisplayMetrics;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ExpandableListView;
import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
import android.widget.FrameLayout;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
import android.widget.TextView.OnEditorActionListener;
import com.flurry.android.FlurryAgent;
import com.timsu.astrid.R;
@ -350,13 +351,17 @@ public class FilterListActivity extends ExpandableListActivity {
if(emblem == null)
emblem = ((BitmapDrawable) getResources().getDrawable(
R.drawable.filter_tags1)).getBitmap();
// create icon by superimposing astrid w/ icon
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
Bitmap bitmap = ((BitmapDrawable) getResources().getDrawable(
R.drawable.icon_blank)).getBitmap();
bitmap = bitmap.copy(bitmap.getConfig(), true);
Canvas canvas = new Canvas(bitmap);
int dimension = 22;
canvas.drawBitmap(emblem, new Rect(0, 0, emblem.getWidth(), emblem.getHeight()),
new Rect(bitmap.getWidth() - 22, bitmap.getHeight() - 22,
new Rect(bitmap.getWidth() - dimension, bitmap.getHeight() - dimension,
bitmap.getWidth(), bitmap.getHeight()), null);
Intent createShortcutIntent = new Intent();
@ -401,7 +406,8 @@ public class FilterListActivity extends ExpandableListActivity {
FrameLayout frameLayout = new FrameLayout(this);
frameLayout.setPadding(10, 0, 10, 0);
final EditText editText = new EditText(this);
editText.setText(filter.listingTitle);
editText.setText(filter.listingTitle.
replaceAll("\\(\\d+\\)$", "").trim()); //$NON-NLS-1$ //$NON-NLS-2$
frameLayout.addView(editText, new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.FILL_PARENT,
FrameLayout.LayoutParams.WRAP_CONTENT));

18
astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
Unescape Escape View File

@ -6,6 +6,7 @@ package com.todoroo.astrid.adapter;
import java.util.ArrayList;
import android.app.Activity;
import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@ -13,9 +14,9 @@ import android.widget.AbsListView;
import android.widget.BaseExpandableListAdapter;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.ImageView.ScaleType;
import com.timsu.astrid.R;
import com.todoroo.astrid.api.FilterCategory;
@ -26,11 +27,14 @@ public class FilterAdapter extends BaseExpandableListAdapter {
private final ArrayList<FilterListItem> items;
protected final Activity activity;
private final DisplayMetrics metrics = new DisplayMetrics();
public FilterAdapter(Activity activity) {
super();
this.activity = activity;
this.items = new ArrayList<FilterListItem>();
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
}
public boolean hasStableIds() {
@ -116,7 +120,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
public View getCategoryView(FilterCategory filter, boolean isExpanded) {
AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT, 64);
ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
FrameLayout layout = new FrameLayout(activity);
layout.setLayoutParams(lp);
@ -140,7 +144,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
textView.setTextAppearance(activity, R.style.TextAppearance_FLA_Category);
View view = augmentView(textView, filter);
view.setPadding(50, 2, 0, 2);
view.setPadding((int) (33 * metrics.density), 5, 0, 5);
FrameLayout.LayoutParams rowLayout = new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
rowLayout.gravity = Gravity.CENTER_VERTICAL;
@ -177,7 +181,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
public View getStandardView(FilterListItem filter, boolean isChild) {
AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT, 64);
ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
TextView textView = new TextView(activity);
textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
@ -187,14 +191,14 @@ public class FilterAdapter extends BaseExpandableListAdapter {
View view = augmentView(textView, filter);
view.setBackgroundDrawable(null);
view.setLayoutParams(lp);
view.setPadding(isChild ? 40 : 10, 0, 0, 0);
view.setPadding((int) ((isChild ? 27 : 7) * metrics.density), 8, 0, 8);
return view;
}
public View getHeaderView(FilterListHeader header, boolean isChild) {
AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT, 40);
ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
TextView textView = new TextView(activity);
textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
@ -204,7 +208,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
View view = augmentView(textView, header);
view.setBackgroundResource(R.drawable.edit_titlebar);
view.setLayoutParams(lp);
view.setPadding(isChild ? 50 : 10, 0, 0, 0);
view.setPadding((int) ((isChild ? 33 : 7) * metrics.density), 5, 0, 5);
return view;
}

Write Preview
Loading…
Cancel
Save