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

Remove comments button from navbar

Browse Source
Alex Baker 13 years ago
parent 9c0631bc6a
commit a6eb3f11b0
4 changed files with 2 additions and 60 deletions
Show Stats Download Patch File Download Diff File

1
astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
Unescape Escape View File

@ -299,7 +299,6 @@ public class TagViewFragment extends TaskListFragment {
if (extras.getBoolean(TOKEN_START_ACTIVITY, false)) {
extras.remove(TOKEN_START_ACTIVITY);
activity.showComments();
}
}

8
astrid/res/layout/header_nav_views.xml
Unescape Escape View File

@ -69,12 +69,4 @@
android:textSize="16sp"
android:visibility="gone"/>
<Button
android:id="@+id/comments"
android:layout_width="51dip"
android:layout_height="fill_parent"
android:background="?attr/asCommentButtonImg"
android:textColor="?attr/asTextColorInverse"
android:paddingBottom="6dip"/>
</LinearLayout>

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

@ -359,10 +359,6 @@ public final class TaskEditFragment extends SherlockFragment implements
OVERRIDE_FINISH_ANIM, true);
}
}
if (activity instanceof TaskListActivity) {
((TaskListActivity) activity).setCommentsButtonVisibility(false);
}
}
private void instantiateEditNotes() {
@ -1067,11 +1063,9 @@ public final class TaskEditFragment extends SherlockFragment implements
}
if (activity instanceof TaskListActivity) {
if (title.getText().length() == 0 && isNewTask
&& model != null && model.isSaved()) {
if (title.getText().length() == 0 && isNewTask && model != null && model.isSaved()) {
taskService.delete(model);
}
((TaskListActivity) activity).setCommentsButtonVisibility(true);
}
}

45
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -22,7 +22,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.PopupWindow.OnDismissListener;
@ -107,7 +106,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
private TextView lists;
private ImageView mainMenu;
private TextView personStatus;
private Button commentsButton;
private int filterMode;
private FilterModeSpec filterModeSpec;
@ -138,26 +136,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
}
};
private final OnClickListener commentsButtonClickListener = new OnClickListener() {
@Override
public void onClick(View v) {
if (fragmentLayout == LAYOUT_DOUBLE) {
View container = findViewById(R.id.taskedit_fragment_container);
if (getTaskEditFragment() != null) {
return;
}
container.setVisibility(container.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE);
commentsVisible = container.getVisibility() == View.VISIBLE;
} else {
// In this case we should be in LAYOUT_SINGLE--delegate to the task list fragment
TaskListFragment tlf = getTaskListFragment();
if (tlf != null) {
tlf.handleCommentsButtonClicked();
}
}
}
};
private final OnClickListener friendStatusClickListener = new OnClickListener() {
@Override
public void onClick(View v) {
@ -194,15 +172,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
personStatus = (TextView) actionBar.getCustomView().findViewById(R.id.person_image);
commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
if (ThemeService.getTheme() == R.style.Theme_White_Alt) {
commentsButton.setTextColor(getResources().getColor(R.color.blue_theme_color));
}
initializeFragments(actionBar);
createMainMenuPopover();
mainMenu.setOnClickListener(mainMenuClickListener);
commentsButton.setOnClickListener(commentsButtonClickListener);
personStatus.setOnClickListener(friendStatusClickListener);
Bundle extras = getIntent().getExtras();
@ -324,7 +297,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
if (editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
fragmentLayout = LAYOUT_TRIPLE;
actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE);
} else {
fragmentLayout = LAYOUT_DOUBLE;
if (AndroidUtilities.getSdkVersion() >= 11) {
@ -439,9 +411,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
int visibility = filterModeSpec.showComments() ? View.VISIBLE : View.GONE;
if (fragmentLayout != LAYOUT_TRIPLE) {
commentsButton.setVisibility(visibility);
} else {
if (fragmentLayout == LAYOUT_TRIPLE) {
View container = findViewById(R.id.taskedit_fragment_container);
if (container != null) {
container.setVisibility(visibility);
@ -449,10 +419,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
}
}
public void setCommentsButtonVisibility(boolean visible) {
commentsButton.setVisibility(visible && filterModeSpec.showComments() && fragmentLayout != LAYOUT_TRIPLE ? View.VISIBLE : View.GONE);
}
private void setListsDropdownSelected(boolean selected) {
int oldTextColor = lists.getTextColors().getDefaultColor();
int textStyle = selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
@ -580,17 +546,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
TypedValue tv = new TypedValue();
if (count > 0) {
commentsButton.setText(Integer.toString(count));
getTheme().resolveAttribute(R.attr.asFilledCommentButtonImg, tv, false);
} else {
commentsButton.setText(""); //$NON-NLS-1$
getTheme().resolveAttribute(R.attr.asCommentButtonImg, tv, false);
}
commentsButton.setBackgroundResource(tv.data);
}
public void showComments() {
commentsButton.performClick();
}
@Override
@ -907,10 +866,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
filterModeSpec.getFilterListClass(), true, true));
if (mode == FILTER_MODE_PEOPLE) {
personStatus.setVisibility(View.VISIBLE);
commentsButton.setVisibility(View.GONE);
} else {
personStatus.setVisibility(View.GONE);
commentsButton.setVisibility(View.VISIBLE);
}
if (swipeIsEnabled()) {

Write Preview
Loading…
Cancel
Save