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

Remove "No Activity" from task edit screen

Browse Source
pull/25/merge
Alex Baker 11 years ago
parent 658e12d6f5
commit 58d44d1aea
8 changed files with 24 additions and 184 deletions
Show Stats Download Patch File Download Diff File

5
astrid/project.properties
Unescape Escape View File

@ -13,5 +13,6 @@ split.density=false
target=android-17
apk-configurations=
android.library.reference.1=../android-aac-enc
android.library.reference.2=../greendroid
android.library.reference.3=../api
android.library.reference.2=../api
android.library.reference.3=../greendroid

14
astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -11,7 +11,6 @@ import android.app.Dialog;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources.Theme;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Handler;
@ -20,7 +19,6 @@ import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@ -37,7 +35,6 @@ import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
import com.actionbarsherlock.app.SherlockFragment;
@ -57,7 +54,6 @@ import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
import com.todoroo.astrid.actfm.CommentsActivity;
import com.todoroo.astrid.actfm.TaskCommentsFragment;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.TaskAttachmentDao;
import com.todoroo.astrid.dao.TaskOutstandingDao;
import com.todoroo.astrid.dao.UserDao;
@ -88,8 +84,6 @@ import com.todoroo.astrid.ui.EditNotesControlSet;
import com.todoroo.astrid.ui.EditTitleControlSet;
import com.todoroo.astrid.ui.HideUntilControlSet;
import com.todoroo.astrid.ui.ImportanceControlSet;
import com.todoroo.astrid.ui.NestableScrollView;
import com.todoroo.astrid.ui.NestableViewPager;
import com.todoroo.astrid.ui.PopupControlSet;
import com.todoroo.astrid.ui.ReminderControlSet;
import com.todoroo.astrid.utility.AstridPreferences;
@ -221,7 +215,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
private TimerActionControlSet timerAction;
private EditText title;
private EditNoteActivity editNotes;
private NestableViewPager mPager;
private ViewPager mPager;
private HashMap<String, TaskEditControlSet> controlSetMap = new HashMap<String, TaskEditControlSet>();
private final List<TaskEditControlSet> controls = Collections.synchronizedList(new ArrayList<TaskEditControlSet>());
@ -345,7 +339,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
}
private void loadMoreContainer() {
View moreTab = (View) getView().findViewById(R.id.more_container);
View commentsBar = (View) getView().findViewById(R.id.updatesFooter);
long idParam = getActivity().getIntent().getLongExtra(TOKEN_ID, -1L);
@ -378,13 +371,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
TaskEditViewPager adapter = new TaskEditViewPager(getActivity(), tabStyle);
adapter.parent = this;
mPager = (NestableViewPager) getView().findViewById(R.id.pager);
mPager = (ViewPager) getView().findViewById(R.id.pager);
mPager.setAdapter(adapter);
if (showEditComments) {
commentsBar.setVisibility(View.VISIBLE);
}
moreTab.setVisibility(View.VISIBLE);
setCurrentTab(TAB_VIEW_UPDATES);
setPagerHeightForPosition(TAB_VIEW_UPDATES);
Handler handler = new Handler();
@ -1296,8 +1288,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
@Override
public void onPageSelected(final int position) {
setPagerHeightForPosition(position);
NestableScrollView scrollView = (NestableScrollView)getView().findViewById(R.id.edit_scroll);
scrollView.setScrollabelViews(null);
}
@Override

35
astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
Unescape Escape View File

@ -5,16 +5,6 @@
*/
package com.todoroo.astrid.notes;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import org.json.JSONArray;
import org.json.JSONObject;
import android.app.Activity;
import android.content.Intent;
import android.content.res.Resources;
@ -31,7 +21,6 @@ import android.text.TextWatcher;
import android.text.format.DateUtils;
import android.text.util.Linkify;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
@ -43,7 +32,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import org.tasks.R;
import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
@ -78,11 +66,21 @@ import com.todoroo.astrid.data.UserActivity;
import com.todoroo.astrid.helper.AsyncImageView;
import com.todoroo.astrid.service.MetadataService;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.timers.TimerActionControlSet.TimerActionListener;
import com.todoroo.astrid.utility.ResourceDrawableCache;
import org.json.JSONArray;
import org.json.JSONObject;
import org.tasks.R;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import edu.mit.mobile.android.imagecache.ImageCache;
public class EditNoteActivity extends LinearLayout implements TimerActionListener {
@ -416,17 +414,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
});
this.addView(loadMore);
}
else if (items.size() == 0) {
TextView noUpdates = new TextView(getContext());
noUpdates.setText(R.string.TEA_no_activity);
noUpdates.setTextColor(activity.getResources().getColor(R.color.task_edit_deadline_gray));
noUpdates.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
LayoutParams.WRAP_CONTENT));
noUpdates.setPadding(10, 10, 10, 10);
noUpdates.setGravity(Gravity.CENTER);
noUpdates.setTextSize(16);
this.addView(noUpdates);
}
for (UpdatesChangedListener l : listeners) {
l.updatesChanged();

42
astrid/src/main/java/com/todoroo/astrid/ui/NestableScrollView.java
Unescape Escape View File

@ -1,42 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.ui;
import android.content.Context;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ScrollView;
public class NestableScrollView extends ScrollView {
private int[] scrollableViews = new int[0];
public NestableScrollView(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
if (scrollableViews != null) {
for (int i = 0; i < scrollableViews.length; i++) {
View view = findViewById(scrollableViews[i]);
if (view != null) {
Rect rect = new Rect();
view.getHitRect(rect);
if (rect.contains((int) event.getX(), (int) event.getY())) {
return false;
}
}
}
}
return super.onInterceptTouchEvent(event);
}
public void setScrollabelViews(int[] views) {
this.scrollableViews = views;
}
}

27
astrid/src/main/java/com/todoroo/astrid/ui/NestableViewPager.java
Unescape Escape View File

@ -1,27 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.ui;
import android.content.Context;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
public class NestableViewPager extends ViewPager {
public NestableViewPager(Context context, AttributeSet attrs) {
super(context, attrs);
}
/**
* Prevent horizontal scrolling
*/
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
return false;
}
}

52
astrid/src/main/java/com/todoroo/astrid/ui/NestedListView.java
Unescape Escape View File

@ -1,52 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.ui;
import android.content.Context;
import android.view.View;
import android.widget.ListAdapter;
import android.widget.ListView;
public class NestedListView extends ListView {
private static final int MAXIMUM_LIST_ITEMS_VIEWABLE = 2;
public NestedListView(Context context) {
super(context);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int newHeight = 0;
final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
int heightSize = MeasureSpec.getSize(heightMeasureSpec);
if (heightMode != MeasureSpec.EXACTLY) {
ListAdapter listAdapter = getAdapter();
if (listAdapter != null && !listAdapter.isEmpty()) {
int listPosition = 0;
for (listPosition = 0; listPosition < listAdapter.getCount()
&& listPosition < MAXIMUM_LIST_ITEMS_VIEWABLE; listPosition++) {
View listItem = listAdapter.getView(listPosition, null,
this);
listItem.measure(widthMeasureSpec, heightMeasureSpec);
newHeight += listItem.getMeasuredHeight();
}
newHeight += getDividerHeight() * listPosition;
}
if ((heightMode == MeasureSpec.AT_MOST) && (newHeight > heightSize)) {
if (newHeight > heightSize) {
newHeight = heightSize;
}
}
} else {
newHeight = getMeasuredHeight();
}
setMeasuredDimension(getMeasuredWidth(), newHeight);
}
}

29
astrid/src/main/res/layout/task_edit_activity.xml
Unescape Escape View File

@ -11,7 +11,7 @@
android:layout_height="fill_parent"
android:orientation="vertical" >
<com.todoroo.astrid.ui.NestableScrollView
<ScrollView
android:id="@+id/edit_scroll"
style="@style/Content_EditScroll"
android:layout_width="fill_parent"
@ -44,33 +44,16 @@
android:layout_height="fill_parent"
android:layout_margin="3dip"
android:layout_marginTop="10dip"
android:orientation="vertical" >
</LinearLayout>
android:orientation="vertical"/>
<LinearLayout
android:id="@+id/more_container"
<android.support.v4.view.ViewPager
android:id="@+id/pager"
style="@style/EditRow"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="3dip"
android:layout_marginBottom="0dip"
android:orientation="vertical"
android:visibility="gone" >
<ProgressBar
android:id="@+id/progressBar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="fill_parent"
android:layout_height="5dip"
android:layout_weight="1"
android:visibility="gone" />
<com.todoroo.astrid.ui.NestableViewPager
android:id="@+id/pager"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
android:orientation="vertical"/>
<ImageView
android:id="@+id/delete_task"
@ -82,7 +65,7 @@
android:scaleType="fitCenter"/>
</LinearLayout>
</com.todoroo.astrid.ui.NestableScrollView>
</ScrollView>
<!-- Footer -->

4
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -1,6 +1,6 @@
#Wed Sep 25 08:24:47 CDT 2013
#Sat Sep 28 02:39:06 CDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip

Write Preview
Loading…
Cancel
Save