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

Many polish improvements

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 8eab520fc8
commit d04c37e2de
12 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File

5
astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
Unescape Escape View File

@ -58,12 +58,13 @@ public final class AlarmControlSet extends TaskEditControlSet {
@Override
protected void afterInflate() {
this.alertsContainer = (LinearLayout) getView().findViewById(R.id.alert_container);
getView().findViewById(R.id.alarms_add).setOnClickListener(new View.OnClickListener() {
View.OnClickListener addAlarmListener = new View.OnClickListener() {
@Override
public void onClick(View arg0) {
addAlarm(new Date());
}
});
};
getView().findViewById(R.id.alarms_add).setOnClickListener(addAlarmListener);
pickerDialog = new DateAndTimeDialog(activity, 0);
}

17
astrid/res/layout/control_set_alarms.xml
Unescape Escape View File

@ -12,24 +12,31 @@
<TextView android:id="@+id/alarms_label"
android:layout_marginLeft="10dip"
android:layout_marginTop="10dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alarm_ACS_label"
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<LinearLayout android:id="@+id/alert_container"
android:paddingLeft="5dip"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
</LinearLayout>
<LinearLayout
android:id="@+id/alarms_add"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/alarms_add"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<TextView
android:text="+"
android:layout_width="50dip"
android:layout_height="50dip"
android:layout_marginTop="10dip"/>
android:gravity="center"
android:textSize="26sp"
android:textColor="?attr/asThemeTextColor"
android:layout_width="40dip"
android:layout_height="40dip"/>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"

3
astrid/res/layout/control_set_collaborators.xml
Unescape Escape View File

@ -18,7 +18,8 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_height="fill_parent"
android:layout_marginLeft="10dip">
<!-- Shared with -->
<TextView

10
astrid/res/layout/control_set_reminders.xml
Unescape Escape View File

@ -26,14 +26,16 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dip"
android:text="@string/TEA_reminder_label"
android:paddingTop="10dip"
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/reminder_due"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginLeft="10dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_due" />
<CheckBox
@ -41,7 +43,7 @@
android:id="@+id/reminder_overdue"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginLeft="10dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_overdue" />
<LinearLayout
@ -53,7 +55,7 @@
android:id="@+id/reminder_random"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginLeft="10dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_randomly" />
<com.todoroo.astrid.ui.ErrorCatchingSpinner
@ -70,6 +72,8 @@
android:id="@+id/reminder_alarm_container"
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView

4
astrid/res/layout/control_set_timers.xml
Unescape Escape View File

@ -16,6 +16,8 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
@ -41,6 +43,8 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView

2
astrid/res/values/strings-actfm.xml
Unescape Escape View File

@ -166,7 +166,7 @@
<string name="actfm_EPA_share_with">Share with:</string>
<!-- task sharing dialog: shared with label -->
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_collaborators_header">Share</string>
<!-- task sharing dialog: collaborator list name (%s => name of list) -->
<string name="actfm_EPA_list">List: %s</string>

4
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -131,7 +131,7 @@
<!-- Menu: Tutorial -->
<!-- Menu: Settings -->
<string name="TLA_menu_settings">Account &amp; Settings</string>
<string name="TLA_menu_settings">Settings</string>
<!-- slide 30b: Menu: Support -->
<string name="TLA_menu_support">Support</string>
@ -348,7 +348,7 @@
<string name="TEA_estimatedDuration_label">How long will it take?</string>
<!-- Elapsed time label -->
<string name="TEA_elapsedDuration_label">Time already spent on task</string>
<string name="TEA_elapsedDuration_label">Time already spent</string>
<!-- Menu: Save -->
<string name="TEA_menu_save">Save Changes</string>

10
astrid/res/values/strings-reminders.xml
Unescape Escape View File

@ -14,7 +14,7 @@
<string name="TEA_reminders_group_label">Reminders</string>
<!-- Task Edit: Reminder header label -->
<string name="TEA_reminder_label">Remind me:</string>
<string name="TEA_reminder_label">Remind me</string>
<!-- Task Edit: Reminder @ deadline -->
<string name="TEA_reminder_due">When task is due</string>
@ -26,16 +26,16 @@
<string name="TEA_reminder_randomly">Randomly once</string>
<!-- Task Edit: Reminder alarm clock label -->
<string name="TEA_reminder_alarm_label">Ring/vibrate type:</string>
<string name="TEA_reminder_alarm_label">Ring/vibrate type</string>
<!-- slide 45a: Task Edit: Reminder mode: ring once -->
<string name="TEA_reminder_mode_once">Ring once</string>
<string name="TEA_reminder_mode_once">Once</string>
<!-- slide 45b: Task Edit: Reminder mode: ring five times -->
<string name="TEA_reminder_mode_five">Ring five times</string>
<string name="TEA_reminder_mode_five">Five times</string>
<!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
<string name="TEA_reminder_mode_nonstop">Ring until I dismiss alarm</string>
<string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
<string-array name="TEA_reminder_random">
<!-- random reminder choices for task edit page. -->

2
astrid/res/values/strings-timers.xml
Unescape Escape View File

@ -21,7 +21,7 @@
<string name="TFE_workingOn">Tasks Being Timed</string>
<!-- Title for TEA -->
<string name="TEA_timer_controls">Timer Controls</string>
<string name="TEA_timer_controls">Timer</string>
<!-- Edit Notes: create comment for when timer is started -->

4
astrid/res/values/styles.xml
Unescape Escape View File

@ -264,8 +264,8 @@
<!-- generic style for labels above edit boxes -->
<style name="TextAppearance.GEN_EditLabel">
<item name="android:textSize">15sp</item>
<item name="android:textStyle">bold</item>
<!-- <item name="android:textSize">15sp</item>
<item name="android:textStyle">bold</item> -->
</style>
<style name="TextAppearance.ActionBar_ListsHeader">

4
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

@ -264,6 +264,10 @@ public final class UpgradeService {
Preferences.setString(R.string.p_taskRowStyle_v2, value ? "1" : "0"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
if (from < V4_5_1_1) {
Preferences.setBoolean(R.string.p_simple_input_boxes, true);
}
}
/**

2
astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
Unescape Escape View File

@ -121,7 +121,7 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
setPreference(prefs, editor, r, R.string.p_use_filters, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_simple_input_boxes, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_simple_input_boxes, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_list_members, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);

Write Preview
Loading…
Cancel
Save