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

Many purely cosmetic changes.

Browse Source
pull/14/head
Tim Su 16 years ago
parent ff77679e5b
commit 5ddd9a4b63
9 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File

4
AndroidManifest.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid"
android:versionCode="7"
android:versionName="1.7.1">
android:versionCode="8"
android:versionName="1.7.2">
<uses-permission android:name="android.permission.VIBRATE"/>

12
res/layout/task_list_row.xml
Unescape Escape View File

@ -49,7 +49,7 @@
<TextView android:id="@+id/text1"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/TextAppearance.TaskList_Task"
android:gravity="center_vertical"
android:singleLine="true"/>
@ -60,20 +60,20 @@
android:layout_height="wrap_content">
<TextView android:id="@+id/text_dueDate"
android:gravity="top"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
style="@style/TextAppearance.TaskList_Detail"
android:textColor="@color/taskList_dueDate"
android:gravity="center_vertical"
android:paddingRight="15dip"
android:paddingRight="10dip"
android:singleLine="true"/>
<TextView android:id="@+id/text_tags"
android:gravity="top"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
style="@style/TextAppearance.TaskList_Detail"
android:textColor="@color/taskList_tags"
android:gravity="center_vertical"
android:paddingRight="15dip"
android:singleLine="true"/>
</LinearLayout>

8
res/values/arrays.xml
Unescape Escape View File

@ -26,18 +26,17 @@
<item>Excuse me?</item>
<item>When you have a minute...</item>
<item>Look what I dug up!</item>
<item>You look energetic today!</item>
<item>Here's what I got for you...</item>
<item>Are you free for a moment?</item>
<item>Your friendly neighborhood assistant here!</item>
<item>Hi! Can I bother you for a moment?</item>
<item>I would like a minute of your time.</item>
<item>It's a beautiful day today, isn't it?</item>
<item>It's a great day to get something done!</item>
</string-array>
<!-- Astrid says... (user should answer yes or no)-->
<string-array name="reminder_responses">
<item>I've got something for you!</item>
<item>Say hello to my little friend!</item>
<item>Ready to put this in the past?</item>
<item>Why don't you get this done?</item>
<item>How about it? Ready tiger?</item>
<item>Ready to do this?</item>
@ -47,6 +46,7 @@
<item>Won't you do this today?</item>
<item>Please finish this, I'm sick of it!</item>
<item>Can you finish this? Yes you can!</item>
<item>Are you ever going to do this?</item>
<item>Feel good about yourself! Let's go!</item>
<item>I'm so proud of you! Lets get it done!</item>
<item>A little snack after you finish this?</item>

3
res/values/colors.xml
Unescape Escape View File

@ -23,7 +23,8 @@
<color name="task_list_overdue">#ffff4444</color>
<color name="task_list_done">#ffaaaaaa</color>
<color name="taskList_dueDate">#ffffff44</color>
<color name="taskList_dueDateOverdue">#ffffff44</color>
<color name="taskList_dueDate">#ffffffaa</color>
<color name="taskList_tags">#ff888888</color>
<color name="view_header_done">#ff83ffa9</color>

3
res/values/strings.xml
Unescape Escape View File

@ -69,7 +69,8 @@
<string name="taskList_dueIn">Due in</string>
<string name="taskList_overdueBy">Overdue by</string>
<string name="addtask_label">New Task</string>
<string name="tags_suffix">Tags: </string>
<string name="tags_prefix">Tags: </string>
<string name="no_tags">No Tags</string>
<string name="taskList_menu_insert">Add</string>
<string name="taskList_menu_tags">Tags</string>

35
res/values/styles.xml
Unescape Escape View File

@ -25,49 +25,24 @@
<item name="android:windowBackground">@null</item>
</style>
<style name="MonthView_DayLabel">
<item name="android:layout_width">29dip</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:gravity">center</item>
<item name="android:paddingTop">2dip</item>
<item name="android:paddingBottom">2dip</item>
<item name="android:textAppearance">@style/TextAppearance.MonthView_DayLabel</item>
</style>
<style name="TextAppearance" parent="android:TextAppearance">
</style>
<style name="TextAppearance.MonthView_DayLabel">
<item name="android:textSize">14sp</item>
<style name="TextAppearance.TaskList_Task">
<item name="android:textSize">24sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="TextAppearance.AgendaView_ValueLabel">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/black</item>
</style>
<style name="TextAppearance.EditEvent_Label">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Alert_Title">
<item name="android:textSize">18sp</item>
<style name="TextAppearance.TaskList_Detail">
<item name="android:textSize">12sp</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="TextAppearance.Alert_Label">
<style name="TextAppearance.EditEvent_Label">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="TextAppearance.Alert_Value">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/white</item>
</style>
</resources>

17
src/com/timsu/astrid/activities/TaskListAdapter.java
Unescape Escape View File

@ -120,7 +120,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
progress.setChecked(task.isTaskCompleted());
// due date
boolean hasProperties = false;
Date dueDate = task.getDefiniteDueDate();
if(dueDate == null || (task.getPreferredDueDate() != null &&
task.getPreferredDueDate().getTime() < dueDate.getTime()))
@ -132,10 +131,11 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
Math.abs(secondsLeft), 1);
if(secondsLeft > 0)
dueString = r.getString(R.string.taskList_dueIn) + dueString;
else
else {
dueString = r.getString(R.string.taskList_overdueBy) + dueString;
dueDateView.setTextColor(r.getColor(R.color.taskList_dueDateOverdue));
}
dueDateView.setText(dueString);
hasProperties = true;
} else
dueDateView.setVisibility(View.GONE);
@ -150,14 +150,9 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
tagString.append(", ");
}
if(tagString.length() > 0) {
tagsView.setText(r.getString(R.string.tags_suffix) + tagString);
hasProperties = true;
}
if(!hasProperties) { // no properties, old school view
properties.setVisibility(View.GONE);
name.setTextSize(36);
name.setBackgroundColor(r.getColor(R.color.importance_2));
tagsView.setText(r.getString(R.string.tags_prefix) + tagString);
} else {
tagsView.setText(r.getString(R.string.no_tags));
}
setTaskAppearance(task, name, progress);

2
src/com/timsu/astrid/data/tag/TagModelForView.java
Unescape Escape View File

@ -32,6 +32,8 @@ public class TagModelForView extends AbstractTagModel {
NAME,
};
public static TagModelForView UNTAGGED_TASKS = new TagModelForView("[untagged]");
// --- constructors
/** Constructor for creating a new model */

4
src/com/timsu/astrid/utilities/Notifications.java
Unescape Escape View File

@ -279,8 +279,8 @@ public class Notifications extends BroadcastReceiver {
System.currentTimeMillis());
notification.setLatestEventInfo(context,
appName + ": " + taskName,
reminder,
appName + ": " + reminder,
taskName,
pendingIntent);
notification.defaults = Notification.DEFAULT_ALL;

Write Preview
Loading…
Cancel
Save