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

Lots of polish to edit page, dialogs, making things work on small screen, etc.

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent b546dc86e8
commit 0df9ae4c39
26 changed files with 296 additions and 212 deletions
Show Stats Download Patch File Download Diff File

24
astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
Unescape Escape View File

@ -12,18 +12,20 @@ import org.json.JSONException;
import org.json.JSONObject;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Intent;
import android.graphics.Color;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.LinearLayout;
@ -116,10 +118,22 @@ public class EditPeopleControlSet extends PopupControlSet {
sharedWithRow = LayoutInflater.from(activity).inflate(R.layout.control_set_collaborators_display, null);
sharedWithView = LayoutInflater.from(activity).inflate(R.layout.control_set_collaborators, null);
sharedWithDialog = new AlertDialog.Builder(this.activity)
.setTitle(R.string.actfm_EPA_collaborators_header)
.setView(getSharedWithView())
.setPositiveButton(android.R.string.ok, null).create();
sharedWithDialog = new Dialog(activity, 0);
sharedWithDialog.setTitle(R.string.actfm_EPA_collaborators_header);
View v = getSharedWithView();
DisplayMetrics metrics = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
sharedWithDialog.setContentView(v, new LayoutParams(metrics.widthPixels - (int)(30 * metrics.density), LayoutParams.WRAP_CONTENT));
Button dismiss = (Button) v.findViewById(R.id.edit_dlg_ok);
if (dismiss != null) {
dismiss.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
DialogUtilities.dismissDialog(EditPeopleControlSet.this.activity, sharedWithDialog);
}
});
}
sharedWithDialog.setOwnerActivity(this.activity);
assignedCustom = (EditText) getView().findViewById(R.id.assigned_custom);

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

@ -13,6 +13,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
@ -57,6 +58,8 @@ public class GCalControlSet extends PopupControlSet {
public GCalControlSet(final Activity activity, int viewLayout, int displayViewLayout, int title) {
super(activity, viewLayout, displayViewLayout, title);
DependencyInjectionService.getInstance().inject(this);
ViewGroup parent = (ViewGroup) getView().getParent();
parent.removeView(getView());
((LinearLayout) getDisplayView()).addView(getView()); //hack for spinner
this.activity = activity;

30
astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
Unescape Escape View File

@ -6,7 +6,7 @@ import java.util.Calendar;
import java.util.Date;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.text.TextUtils;
import android.view.View;
@ -28,6 +28,7 @@ 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.DialogUtilities;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService;
@ -96,7 +97,8 @@ public class RepeatControlSet extends PopupControlSet {
LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f/7);
for(int i = 0; i < 7; i++) {
CheckBox checkBox = new CheckBox(activity);
checkBox.setTextAppearance(activity, R.style.TextAppearance);
checkBox.setTextAppearance(activity, android.R.style.TextAppearance);
checkBox.setTextColor(activity.getResources().getColor(android.R.color.white));
int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
checkBox.setText(dfs.getShortWeekdays()[dayOfWeek].substring(0, 1));
checkBox.setLayoutParams(lp);
@ -307,24 +309,26 @@ public class RepeatControlSet extends PopupControlSet {
}
@Override
protected AlertDialog.Builder getDialogBuilder(int title, DialogInterface.OnClickListener okListener, DialogInterface.OnCancelListener cancelListener) {
DialogInterface.OnClickListener dontRepeatButton = new DialogInterface.OnClickListener() {
protected Dialog buildDialog(int title, final DialogInterface.OnClickListener okListener, final DialogInterface.OnCancelListener cancelListener) {
DialogInterface.OnClickListener doRepeatButton = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
doRepeat = false;
refreshDisplayView();
public void onClick(DialogInterface d, int which) {
doRepeat = true;
okListener.onClick(d, which);
}
};
final Dialog d = super.buildDialog(title, doRepeatButton, cancelListener);
DialogInterface.OnClickListener doRepeatButton = new DialogInterface.OnClickListener() {
View.OnClickListener dontRepeatButton = new View.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
doRepeat = true;
public void onClick(View view) {
doRepeat = false;
refreshDisplayView();
DialogUtilities.dismissDialog(activity, d);
}
};
return super.getDialogBuilder(title, okListener, cancelListener)
.setNegativeButton(R.string.repeat_dont, dontRepeatButton)
.setPositiveButton(android.R.string.ok, doRepeatButton);
getView().findViewById(R.id.edit_dont_repeat).setOnClickListener(dontRepeatButton);
return d;
}
}

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 619 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 940 B

After

Width:  |  Height:  |  Size: 870 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 850 B

After

Width:  |  Height:  |  Size: 596 B

1
astrid/res/layout/control_set_assigned.xml
Unescape Escape View File

@ -30,5 +30,6 @@
android:id="@+id/assigned_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

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

@ -1,108 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:orientation="vertical"
android:layout_height="fill_parent"
android:orientation="vertical">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="9dip"
android:paddingRight="9dip">
<!-- Shared with -->
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingBottom="5dip"
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:text="@string/actfm_EPA_share_with" />
<com.todoroo.astrid.ui.PeopleContainer
android:id="@+id/share_container"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/share_additional"
android:orientation="vertical"
android:padding="5dip"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:text="@string/actfm_EPA_message_text" />
<EditText
android:id="@+id/message"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"
android:text="@string/actfm_EPA_message_body"
android:autoText="true"
android:capitalize="sentences"
android:singleLine="false" />
<TextView
android:id="@+id/tag_label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dip"
android:visibility="gone"
android:text="@string/actfm_EPA_tag_label" />
<EditText
android:id="@+id/tag_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:hint="@string/actfm_EPA_tag_hint" />
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" />
</LinearLayout>
<LinearLayout
android:id="@+id/collaborators"
android:orientation="vertical"
android:padding="5dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/checkbox_facebook"
android:text="@string/actfm_EPA_facebook"
android:paddingLeft="45dip"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/checkbox_twitter"
android:text="@string/actfm_EPA_twitter"
android:paddingLeft="45dip"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:layout_margin="15dip"
android:visibility="gone"
android:background="@android:drawable/divider_horizontal_dark" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="15dip"
android:text="@string/actfm_EPA_intro"
android:gravity="center"
android:visibility="gone"
android:textColor="#ee9900" />
</LinearLayout>
</ScrollView>
android:layout_height="fill_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="9dip"
android:paddingRight="9dip">
<!-- Shared with -->
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingBottom="5dip"
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:text="@string/actfm_EPA_share_with" />
<com.todoroo.astrid.ui.PeopleContainer
android:id="@+id/share_container"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/share_additional"
android:orientation="vertical"
android:padding="5dip"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:text="@string/actfm_EPA_message_text" />
<EditText
android:id="@+id/message"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"
android:text="@string/actfm_EPA_message_body"
android:autoText="true"
android:capitalize="sentences"
android:singleLine="false" />
<TextView
android:id="@+id/tag_label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dip"
android:visibility="gone"
android:text="@string/actfm_EPA_tag_label" />
<EditText
android:id="@+id/tag_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:hint="@string/actfm_EPA_tag_hint" />
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" />
</LinearLayout>
<LinearLayout
android:id="@+id/collaborators"
android:orientation="vertical"
android:padding="5dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/checkbox_facebook"
android:text="@string/actfm_EPA_facebook"
android:paddingLeft="45dip"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/checkbox_twitter"
android:text="@string/actfm_EPA_twitter"
android:paddingLeft="45dip"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:layout_margin="15dip"
android:visibility="gone"
android:background="@android:drawable/divider_horizontal_dark" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="15dip"
android:text="@string/actfm_EPA_intro"
android:gravity="center"
android:visibility="gone"
android:textColor="#ee9900" />
</LinearLayout>
</ScrollView>
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

2
astrid/res/layout/control_set_gcal_display.xml
Unescape Escape View File

@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="15dip"
android:text="@string/gcal_TEA_addToCalendar_label"
style="@style/TextAppearance.GEN_EditLabel" />
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<TextView
android:id="@+id/calendar_display_which"
android:layout_width="fill_parent"

2
astrid/res/layout/control_set_hide_display.xml
Unescape Escape View File

@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="15dip"
android:text="@string/TEA_hideUntil_label"
style="@style/TextAppearance.GEN_EditLabel" />
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<TextView
android:id="@+id/hide_until_display"
android:layout_width="fill_parent"

2
astrid/res/layout/control_set_importance.xml
Unescape Escape View File

@ -12,7 +12,7 @@
android:paddingBottom="5dip"
android:gravity="center_vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_height="50dip">
<ImageView
style="@style/EditRowImage"
android:src="@drawable/icn_edit_priority"/>

1
astrid/res/layout/control_set_notes.xml
Unescape Escape View File

@ -34,4 +34,5 @@
android:singleLine="false"
android:freezesText="true" />
</LinearLayout>
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

1
astrid/res/layout/control_set_opencrx.xml
Unescape Escape View File

@ -57,6 +57,7 @@
android:layout_height="1dip"
android:padding="5dip"
android:background="@android:drawable/divider_horizontal_dark" />
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

1
astrid/res/layout/control_set_producteev.xml
Unescape Escape View File

@ -45,6 +45,7 @@
android:layout_height="1dip"
android:padding="5dip"
android:background="@android:drawable/divider_horizontal_dark" />
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

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

@ -1,65 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:minWidth="320dip"
android:paddingLeft="5dip"
android:paddingRight="5dip">
<LinearLayout
android:id="@+id/reminders_body"
android:orientation="vertical"
android:orientation="vertical">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- reminders -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/TEA_reminder_label"
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:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_due" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/reminder_overdue"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_overdue" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/reminder_random"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_random" />
<Spinner
android:id="@+id/reminder_random_interval"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/TEA_reminder_alarm_label"
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<Spinner
android:id="@+id/reminder_alarm"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
android:layout_height="fill_parent"
android:minWidth="320dip"
android:paddingLeft="5dip"
android:paddingRight="5dip">
<LinearLayout
android:id="@+id/reminders_body"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- reminders -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/TEA_reminder_label"
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:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_due" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/reminder_overdue"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_overdue" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<CheckBox
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
android:id="@+id/reminder_random"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_random" />
<Spinner
android:id="@+id/reminder_random_interval"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/TEA_reminder_alarm_label"
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<Spinner
android:id="@+id/reminder_alarm"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

16
astrid/res/layout/control_set_repeat.xml
Unescape Escape View File

@ -41,6 +41,22 @@
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dip"
android:layout_marginBottom="-15dip">
<include layout="@layout/control_dialog_ok"/>
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/edit_dont_repeat"
android:layout_width="150dip"
android:layout_height="50dip"
android:layout_marginTop="15dip"
android:layout_marginBottom="10dip"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:text="@string/repeat_dont"/>
</LinearLayout>
</LinearLayout>

2
astrid/res/layout/control_set_repeat_display.xml
Unescape Escape View File

@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="15dip"
android:text="@string/repeat_enabled"
style="@style/TextAppearance.GEN_EditLabel" />
style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
<TextView
android:id="@+id/repeat_display"
android:layout_width="fill_parent"

1
astrid/res/layout/control_set_tags.xml
Unescape Escape View File

@ -24,5 +24,6 @@
android:id="@+id/existingTags"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

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

@ -29,6 +29,7 @@
android:id="@+id/elapsedDuration"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<include layout="@layout/control_dialog_ok"/>
</LinearLayout>

1
astrid/res/layout/task_edit_when_controls.xml
Unescape Escape View File

@ -17,6 +17,7 @@
android:id="@+id/when_dismiss"
android:layout_width="150dip"
android:layout_height="50dip"
android:layout_marginTop="15dip"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:text="@string/DLG_ok"/>

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

@ -402,8 +402,8 @@
<string name="EPr_showNotes_title">Show Notes In Task</string>
<!-- Preference: Beast mode (auto-expand edit page) -->
<string name="EPr_beastMode_title">Beast Mode</string>
<string name="EPr_beastMode_desc_disabled">Adavnced task edit settings will start hidden</string>
<string name="EPr_beastMode_desc_enabled">Adavnced task edit settings will show automatically</string>
<string name="EPr_beastMode_desc_disabled">Advanced task edit settings will start hidden</string>
<string name="EPr_beastMode_desc_enabled">Advanced task edit settings will show automatically</string>
<!-- Preference: Task List Show Notes Description (disabled) -->
<string name="EPr_showNotes_desc_disabled">Notes will be displayed in quick action bar</string>

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

@ -146,8 +146,8 @@
</style>
<style name="TEA_WhenDialog_Anim">
<item name="android:windowEnterAnimation">@android:anim/fade_in</item>
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
<item name="android:windowEnterAnimation">@anim/slide_left_in</item>
<item name="android:windowExitAnimation">@anim/slide_right_out</item>
</style>
<!-- ==================================================== TaskAdapter == -->

21
astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
Unescape Escape View File

@ -35,6 +35,7 @@ import android.content.IntentFilter;
import android.os.Bundle;
import android.speech.RecognizerIntent;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@ -70,7 +71,6 @@ import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gcal.GCalControlSet;
import com.todoroo.astrid.helper.TaskEditControlSet;
import com.todoroo.astrid.notes.EditNoteActivity;
import com.todoroo.astrid.notes.NotesPlugin;
import com.todoroo.astrid.opencrx.OpencrxControlSet;
import com.todoroo.astrid.opencrx.OpencrxCoreUtils;
import com.todoroo.astrid.producteev.ProducteevControlSet;
@ -373,8 +373,8 @@ public final class TaskEditActivity extends Activity {
final Animation fadeOut = AnimationUtils.loadAnimation(TaskEditActivity.this, android.R.anim.fade_out);
@Override
public void onClick(View v) {
fadeIn.setDuration(350);
fadeOut.setDuration(350);
fadeIn.setDuration(300);
fadeOut.setDuration(300);
View moreView = findViewById(R.id.more_controls);
View moreHeader = findViewById(R.id.more_header);
if (moreView.getVisibility() == View.GONE) {
@ -441,11 +441,11 @@ public final class TaskEditActivity extends Activity {
private void constructWhenDialog(View whenDialogView) {
int theme = ThemeService.getTheme();
if (theme == R.style.Theme || theme == R.style.Theme_Transparent) {
whenDialog = new Dialog(this, R.style.Theme_WhenDialog);
whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.black));
whenDialog = new Dialog(this, 0);//R.style.Theme_WhenDialog
//whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.black));
} else {
whenDialog = new Dialog(this, R.style.Theme_White_WhenDialog);
whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.white));
whenDialog = new Dialog(this, 0); //R.style.Theme_White_WhenDialog
//whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.white));
}
Button dismissDialogButton = (Button) whenDialogView.findViewById(R.id.when_dismiss);
@ -455,8 +455,11 @@ public final class TaskEditActivity extends Activity {
DialogUtilities.dismissDialog(TaskEditActivity.this, whenDialog);
}
});
DisplayMetrics metrics = new DisplayMetrics();
this.getWindowManager().getDefaultDisplay().getMetrics(metrics);
whenDialog.setTitle(R.string.TEA_when_dialog_title);
whenDialog.addContentView(whenDialogView, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
whenDialog.addContentView(whenDialogView, new LayoutParams(metrics.widthPixels - (int)(30 * metrics.density), LayoutParams.WRAP_CONTENT));
}
/**
@ -577,7 +580,7 @@ public final class TaskEditActivity extends Activity {
}
if (!isNewTask) {
if (actFmPreferenceService.isLoggedIn() || NotesPlugin.hasNotes(model)) {
if (actFmPreferenceService.isLoggedIn()) {
findViewById(R.id.activityContainer).setVisibility(View.VISIBLE);
}
}

3
astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
Unescape Escape View File

@ -8,6 +8,7 @@ import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnDismissListener;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
@ -50,6 +51,8 @@ public class HideUntilControlSet extends PopupControlSet
this.spinner = (Spinner) getView().findViewById(R.id.hideUntil);
this.spinner.setOnItemSelectedListener(this);
this.spinner.setPromptId(title);
ViewGroup parent = (ViewGroup) getView().getParent();
parent.removeView(getView());
((LinearLayout) getDisplayView()).addView(getView()); // hack to make listeners work
}

8
astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
Unescape Escape View File

@ -4,6 +4,7 @@ import java.util.LinkedList;
import java.util.List;
import android.app.Activity;
import android.util.DisplayMetrics;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
@ -47,10 +48,13 @@ public class ImportanceControlSet extends TaskEditControlSet {
for(int i = min; i <= max; i++) {
final ToggleButton button = new ToggleButton(activity);
LinearLayout.LayoutParams params;
DisplayMetrics metrics = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
if (ProducteevUtilities.INSTANCE.isLoggedIn())
params = new LinearLayout.LayoutParams(55, 55);
params = new LinearLayout.LayoutParams((int) (metrics.density * 30), (int) (metrics.density * 30));
else
params = new LinearLayout.LayoutParams(60, 60);
params = new LinearLayout.LayoutParams((int) (metrics.density * 40), (int) (metrics.density * 40));
button.setLayoutParams(params);
StringBuilder label = new StringBuilder();

40
astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
Unescape Escape View File

@ -1,13 +1,17 @@
package com.todoroo.astrid.ui;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup.LayoutParams;
import android.widget.Button;
import com.timsu.astrid.R;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.helper.TaskEditControlSet;
public abstract class PopupControlSet extends TaskEditControlSet {
@ -25,14 +29,14 @@ public abstract class PopupControlSet extends TaskEditControlSet {
final DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
public void onClick(DialogInterface d, int which) {
refreshDisplayView();
}
};
final DialogInterface.OnCancelListener cancelListener = new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
public void onCancel(DialogInterface d) {
refreshDisplayView();
}
};
@ -40,8 +44,8 @@ public abstract class PopupControlSet extends TaskEditControlSet {
this.activity = activity;
dialog = getDialogBuilder(title, okListener, cancelListener).create();
dialog.setOwnerActivity(PopupControlSet.this.activity);
dialog = buildDialog(title, okListener, cancelListener);
if (displayView != null) {
displayView.setOnClickListener(getDisplayClickListener());
@ -52,12 +56,26 @@ public abstract class PopupControlSet extends TaskEditControlSet {
return displayView;
}
protected AlertDialog.Builder getDialogBuilder(int title, DialogInterface.OnClickListener okListener, DialogInterface.OnCancelListener cancelListener) {
return new AlertDialog.Builder(this.activity)
.setTitle(title)
.setView(getView())
.setPositiveButton(android.R.string.ok, okListener)
.setOnCancelListener(cancelListener);
protected Dialog buildDialog(int title, final DialogInterface.OnClickListener okListener, DialogInterface.OnCancelListener cancelListener) {
final Dialog d= new Dialog(activity, 0);
d.setTitle(title);
View v = getView();
DisplayMetrics metrics = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
d.setContentView(v, new LayoutParams(metrics.widthPixels - (int)(30 * metrics.density), LayoutParams.WRAP_CONTENT));
Button dismiss = (Button) v.findViewById(R.id.edit_dlg_ok);
if (dismiss != null) {
dismiss.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
okListener.onClick(d, 0);
DialogUtilities.dismissDialog(activity, d);
}
});
}
d.setOnCancelListener(cancelListener);
d.setOwnerActivity(PopupControlSet.this.activity);
return d;
}
protected OnClickListener getDisplayClickListener() {

Write Preview
Loading…
Cancel
Save