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

Merge remote-tracking branch 'origin/120222_as_bug_fixes' into 4.0

Browse Source
pull/14/head
Tim Su 13 years ago
parent df1e3cba8c 6eb8af2d1d
commit 4347773f2f
15 changed files with 91 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class TagSettingsActivity extends FragmentActivity {
private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
protected static final int REQUEST_ACTFM_LOGIN = 3;
public static final int REQUEST_ACTFM_LOGIN = 3;
private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$

39
astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
Unescape Escape View File

@ -19,6 +19,7 @@ import android.view.LayoutInflater;
import android.view.MenuInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnTouchListener;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
@ -29,7 +30,6 @@ import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.AndroidUtilities;
@ -193,22 +193,49 @@ public class TagUpdatesFragment extends ListFragment {
private void refreshUpdatesList() {
Cursor cursor = null;
ListView listView = ((ListView) getView().findViewById(android.R.id.list));
if(updateAdapter == null) {
TodorooCursor<Update> currentCursor = tagDataService.getUpdates(tagData);
getActivity().startManagingCursor(currentCursor);
cursor = tagDataService.getUpdates(tagData);
getActivity().startManagingCursor(cursor);
String fromUpdateClass = (tagData == null) ? UpdateAdapter.FROM_RECENT_ACTIVITY_VIEW : UpdateAdapter.FROM_TAG_VIEW;
updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row,
currentCursor, false, fromUpdateClass);
ListView listView = ((ListView) getView().findViewById(android.R.id.list));
cursor, false, fromUpdateClass);
addHeaderToListView(listView);
listView.setAdapter(updateAdapter);
} else {
Cursor cursor = updateAdapter.getCursor();
cursor = updateAdapter.getCursor();
cursor.requery();
getActivity().startManagingCursor(cursor);
populateListHeader(listHeader);
}
View activityContainer = getView().findViewById(R.id.no_activity_container);
if (cursor.getCount() == 0) {
activityContainer.setVisibility(View.VISIBLE);
TextView textView = (TextView)activityContainer.findViewById(R.id.no_activity_message);
if(actFmPreferenceService.isLoggedIn()) {
textView.setText(getActivity().getString(R.string.ENA_no_comments));
}
else {
textView.setText(getActivity().getString(R.string.UpS_no_activity_log_in));
activityContainer.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
startActivityForResult(new Intent(getActivity(), ActFmLoginActivity.class),
TagSettingsActivity.REQUEST_ACTFM_LOGIN);
}
});
}
listView.setVisibility(View.GONE);
}
else {
activityContainer.setVisibility(View.GONE);
listView.setVisibility(View.VISIBLE);
}
if (getActivity() instanceof TagUpdatesActivity)
setLastViewed();
}

33
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
Unescape Escape View File

@ -150,12 +150,9 @@ public class TaskRabbitActivity extends FragmentActivity {
public static final String LOCATION_CONTAINER = "other_locations_attributes"; //$NON-NLS-1$
// Non-production values
public static final String TASK_RABBIT_URL = "http://www.taskrabbit.com"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_ID = "RZUDrMuGn9Q3dXeq4nL24bM6LZmMCi1CEGgfP4ND"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "Va7FUIUTprsmyuwAq9eHSZvAgiRj8FVH1zeaM8Zt"; //$NON-NLS-1$
// public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$
// public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$
// public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$
public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$
public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$
public static final String TASK_RABBIT_ID = "id"; //$NON-NLS-1$
private TaskRabbitTaskContainer taskRabbitTask;
@ -551,6 +548,7 @@ public class TaskRabbitActivity extends FragmentActivity {
private HttpEntity getTaskBody() {
try {
Log.d("SENT JSON", localParamsToJSON().toString());
return new StringEntity(localParamsToJSON().toString());
}
catch (Exception e) {
@ -593,7 +591,6 @@ public class TaskRabbitActivity extends FragmentActivity {
Header contentType = new BasicHeader("Content-Type", "application/json");
HttpEntity taskBody = getTaskBody();
String response = null;
try {
response = restClient.post(taskRabbitURL(urlCall), taskBody, contentType, authorization);
Log.e("The response", "The post response: " + response);
@ -780,8 +777,12 @@ public class TaskRabbitActivity extends FragmentActivity {
result = result.substring(result.indexOf(key)+key.length());
Preferences.setString(TASK_RABBIT_TOKEN, result);
String response = restClient.get(taskRabbitURL("account")); //$NON-NLS-1$
saveUserInfo(response);
String url = String.format("%s?oauth_token=%s&client_application=",taskRabbitURL("account"), Preferences.getStringValue(TASK_RABBIT_TOKEN), TASK_RABBIT_CLIENT_APPLICATION_ID);
Log.d("TASKRABBIT AUTHURL", url);
String response = restClient.get(url);
saveUserInfo(response);//;
}
catch (Exception e){
e.printStackTrace();
@ -819,15 +820,15 @@ public class TaskRabbitActivity extends FragmentActivity {
/* location calls */
private boolean supportsSelectedLocation() {
for (TaskRabbitSetListener controlSet : controls) {
if (TaskRabbitLocationControlSet.class.isAssignableFrom(controlSet.getClass())) {
TaskRabbitLocationControlSet locationControlSet = (TaskRabbitLocationControlSet) controlSet;
if(!TaskRabbitLocationManager.supportsCurrentLocation(locationControlSet.location) && locationControlSet.getDisplayView().getParent() != null) {
return false;
}
for (TaskRabbitSetListener controlSet : controls) {
if (TaskRabbitLocationControlSet.class.isAssignableFrom(controlSet.getClass())) {
TaskRabbitLocationControlSet locationControlSet = (TaskRabbitLocationControlSet) controlSet;
if(!TaskRabbitLocationManager.supportsCurrentLocation(locationControlSet.location) && locationControlSet.getDisplayView().getParent() != null) {
return false;
}
}
return true;
}
return true;
}
public void updateControlSetLocation (Location location) {

4
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
Unescape Escape View File

@ -19,6 +19,7 @@ import android.widget.Toast;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.RestClient;
import com.todoroo.andlib.utility.Preferences;
@ -143,7 +144,8 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
* Show toast for task edit canceling
*/
private void showSuccessToast() {
Toast.makeText(fragment.getActivity(), fragment.getString(R.string.tr_success_toast),
Toast.makeText(ContextManager.getContext(),
ContextManager.getString(R.string.tr_success_toast),
Toast.LENGTH_SHORT).show();
}

4
astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDeadlineControlSet.java
Unescape Escape View File

@ -102,13 +102,13 @@ public class TaskRabbitDeadlineControlSet extends PopupControlSet implements Tas
@Override
public void saveToDatabase(JSONObject json, String key) throws JSONException {
json.put(key, dateAndTimePicker.constructDueDate());
json.put(key, dateAndTimePicker.constructDueDate()/1000);
}
@Override
public void postToTaskRabbit(JSONObject json, String key) throws JSONException {
long dueDate = dateAndTimePicker.constructDueDate();
long dueDate = dateAndTimePicker.constructDueDate()/1000;
json.put(key, dueDate);
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 69 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 65 KiB

BIN
astrid/res/drawable/widget_frame.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

3
astrid/res/layout-land/widget_initialized.xml
Unescape Escape View File

@ -11,8 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="2dp"
android:paddingLeft="40dp">
android:paddingLeft="5dp">
<TextView
android:id="@+id/widget_title"

2
astrid/res/layout-xlarge-land/widget_initialized.xml
Unescape Escape View File

@ -11,7 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="40dp">
android:paddingLeft="5dp">
<TextView
android:id="@+id/widget_title"

26
astrid/res/layout/tag_updates_fragment.xml
Unescape Escape View File

@ -14,6 +14,32 @@
android:layout_weight="1"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/no_activity_container"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:orientation="vertical"
android:layout_gravity="center"
android:visibility="gone">
<ImageView
android:id="@+id/no_activity_image"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/welcome_activity" />
<TextView
android:id="@+id/no_activity_message"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_below="@id/no_activity_image"
android:textSize="20dip"
android:gravity="center"
style="@style/TextAppearance" />
</RelativeLayout>
<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"

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

@ -11,7 +11,8 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="40dp">
android:paddingLeft="5dp"
android:paddingRight="5dp">
<TextView
android:id="@+id/widget_title"

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

@ -463,6 +463,9 @@
<!-- Updates Window Title -->
<string name="UpS_updates_title">Latest Astrid News</string>
<!-- Updats No Activity to show for offline users -->
<string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well as\nactivity on shared lists.</string>
<!-- ================================================== EditPreferences == -->
<!-- Preference Window Title -->

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

@ -15,8 +15,8 @@
<string name="welcome_title_7_return">That\'s it!</string>
<string name="welcome_body_1">The perfect to-do list that \nworks great with friends</string>
<string name="welcome_body_2">Perfect for any list:\nread, watch, buy, visit!</string>
<string name="welcome_body_1">The perfect personal to-do list that \nworks great with friends</string>
<string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
<string name="welcome_body_3">Tap the list title to see all your lists</string>
<string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!</string>
<string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>

Write Preview
Loading…
Cancel
Save