From a68360026f6611415d77686857263d8b84f5f18b Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 10 Oct 2012 16:10:48 -0700 Subject: [PATCH] Fixed some bugs with creating lists from cal events. Things are looking good --- .../todoroo/astrid/gcal/CalendarReminderActivity.java | 3 +++ .../com/todoroo/astrid/gcal/CreateEventListActivity.java | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java index 973348864..b6720545d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -24,6 +24,7 @@ import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TagDataService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagFilterExposer; @SuppressWarnings("nls") @@ -120,6 +121,8 @@ public class CalendarReminderActivity extends Activity { TextView dialogView = (TextView) findViewById(R.id.reminder_message); dialogView.setText(getString(R.string.CRA_speech_bubble)); + + createListButton.setBackgroundColor(getResources().getColor(ThemeService.getThemeColor())); } private void addListeners() { diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java index e3793384f..5b34ec4f6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java @@ -10,6 +10,7 @@ import org.json.JSONObject; import android.app.Activity; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.ArrayAdapter; @@ -32,6 +33,7 @@ import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.User; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.tags.TagFilterExposer; +import com.todoroo.astrid.utility.Constants; public class CreateEventListActivity extends Activity { @@ -124,6 +126,9 @@ public class CreateEventListActivity extends Activity { if (loggedIn) { // include members JSONArray membersArray = getMembersArray(); + if (Constants.DEBUG) + Log.w(CalendarAlarmScheduler.TAG, "Creating tag with members: " + membersArray.toString()); //$NON-NLS-1$ + newTag.setValue(TagData.MEMBERS, membersArray.toString()); newTag.setValue(TagData.MEMBER_COUNT, membersArray.length()); } @@ -144,11 +149,11 @@ public class CreateEventListActivity extends Activity { if (loggedIn) { ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_multiple_choice, android.R.id.text1); membersList.setAdapter(adapter); + membersList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); + emails.remove(ActFmPreferenceService.thisUser().optString("email", null)); //$NON-NLS-1$ for (int i = 0; i < emails.size(); i++) { String email = emails.get(i); - if (email.equals(ActFmPreferenceService.thisUser().optString("email", null))) //$NON-NLS-1$ - continue; adapter.add(email); membersList.setItemChecked(i, true); }