From c45360c4152080b5585143d2223d50633cca1a70 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 29 Nov 2011 12:54:34 -0800 Subject: [PATCH] New check button, comments in task edit header --- astrid/res/drawable/btn_check.xml | 8 +-- astrid/res/layout/control_set_title.xml | 1 + astrid/res/layout/task_edit_activity_new.xml | 61 +++++++++++++++++++ astrid/res/values/strings-core.xml | 2 +- .../astrid/activity/TaskEditActivity.java | 32 ++++++++-- 5 files changed, 93 insertions(+), 11 deletions(-) diff --git a/astrid/res/drawable/btn_check.xml b/astrid/res/drawable/btn_check.xml index e1f61d304..b1297c457 100644 --- a/astrid/res/drawable/btn_check.xml +++ b/astrid/res/drawable/btn_check.xml @@ -18,18 +18,18 @@ - + android:drawable="@drawable/btn_check_pressed" /> --> + android:drawable="@drawable/icn_check_off" /> + android:drawable="@drawable/icn_check_on" /> diff --git a/astrid/res/layout/control_set_title.xml b/astrid/res/layout/control_set_title.xml index 2999c911e..85fb79ed4 100644 --- a/astrid/res/layout/control_set_title.xml +++ b/astrid/res/layout/control_set_title.xml @@ -15,6 +15,7 @@ + + + + + + + + + + + + + + + + + + + + + + Astrid: Editing \'%s\' - Astrid: New Task + New Task Basic diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index a2479d133..21586ff1a 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -32,7 +32,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; -import android.content.res.Resources; import android.os.Bundle; import android.speech.RecognizerIntent; import android.text.TextUtils; @@ -43,6 +42,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup.LayoutParams; +import android.view.Window; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; @@ -61,11 +61,14 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.EditPeopleControlSet; +import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.Database; 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; @@ -164,6 +167,9 @@ public final class TaskEditActivity extends Activity { @Autowired private AddOnService addOnService; + @Autowired + private ActFmPreferenceService actFmPreferenceService; + // --- UI components private ImageButton voiceAddNoteButton; @@ -209,6 +215,7 @@ public final class TaskEditActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { ThemeService.applyTheme(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); super.onCreate(savedInstanceState); new StartupService().onStartupApplication(this); @@ -235,10 +242,8 @@ public final class TaskEditActivity extends Activity { /** Initialize UI components */ private void setUpUIComponents() { setContentView(R.layout.task_edit_activity_new); - scrollView = (ScrollView) findViewById(R.id.edit_scroll); - LinearLayout basicControls = (LinearLayout) findViewById(R.id.basic_controls); LinearLayout whenDialogView = (LinearLayout) LayoutInflater.from(this).inflate(R.layout.task_edit_when_controls, null); LinearLayout whenControls = (LinearLayout) whenDialogView.findViewById(R.id.when_controls); @@ -414,6 +419,15 @@ public final class TaskEditActivity extends Activity { findViewById(R.id.when_header).setOnClickListener(mExpandWhenListener); findViewById(R.id.more_header).setOnClickListener(mExpandMoreListener); + + findViewById(R.id.activity).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent launchIntent = new Intent(TaskEditActivity.this, EditNoteActivity.class); + launchIntent.putExtra(EditNoteActivity.EXTRA_TASK_ID, model.getId()); + startActivity(launchIntent); + } + }); } catch (Exception e) { // error loading the proper activity } @@ -557,19 +571,25 @@ public final class TaskEditActivity extends Activity { return; } + if (!isNewTask) { + if (actFmPreferenceService.isLoggedIn() || NotesPlugin.hasNotes(model)) { + findViewById(R.id.activityContainer).setVisibility(View.VISIBLE); + } + } + // clear notification Notifications.cancelNotifications(model.getId()); } /** Populate UI component values from the model */ private void populateFields() { - Resources r = getResources(); loadItem(getIntent()); + TextView titleText = (TextView) findViewById(R.id.taskLabel); if(isNewTask) - setTitle(R.string.TEA_view_titleNew); + titleText.setText(R.string.TEA_view_titleNew); else - setTitle(r.getString(R.string.TEA_view_title, model.getValue(Task.TITLE))); + titleText.setText(model.getValue(Task.TITLE)); synchronized(controls) { for(TaskEditControlSet controlSet : controls)