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

Tag header is now in listview header, fixed width for updates

Browse Source
pull/14/head
Andrew Shaw 14 years ago
parent 992b6a51ac
commit 24d7af2d4c
4 changed files with 104 additions and 80 deletions
Show Stats Download Patch File Download Diff File

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

@ -5,13 +5,13 @@ import android.app.Activity;
import android.content.Intent;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.ActionBar;
import android.support.v4.app.ListFragment;
import android.support.v4.view.Menu;
import android.support.v4.view.MenuItem;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
@ -58,6 +58,7 @@ public class TagUpdatesFragment extends ListFragment {
private TagData tagData;
private UpdateAdapter updateAdapter;
private EditText addCommentField;
private ViewGroup listHeader;
private ImageButton pictureButton;
@ -131,23 +132,6 @@ public class TagUpdatesFragment extends ListFragment {
((TextView) ab.getCustomView().findViewById(R.id.title)).setText(title);
}
if (AndroidUtilities.isTabletSized(getActivity()) && tagData != null) {
getView().setBackgroundColor(Color.rgb(200, 200, 200));
TextView tagTitle = (TextView) getView().findViewById(R.id.tag_title);
String tagName = tagData.getValue(TagData.NAME);
tagTitle.setText(tagName);
TextView descriptionTitle = (TextView) getView().findViewById(R.id.tag_description);
descriptionTitle.setText(tagData.getValue(TagData.TAG_DESCRIPTION));
AsyncImageView imageView = (AsyncImageView) getView().findViewById(R.id.tag_picture);
imageView.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagName));
imageView.setUrl(tagData.getValue(TagData.PICTURE));
}
else {
getView().findViewById(R.id.tag_header).setVisibility(View.GONE);
getView().findViewById(R.id.activity_header).setVisibility(View.GONE);
}
final ImageButton commentButton = (ImageButton) getView().findViewById(R.id.commentButton);
addCommentField = (EditText) getView().findViewById(R.id.commentField);
addCommentField.setOnEditorActionListener(new OnEditorActionListener() {
@ -216,16 +200,47 @@ public class TagUpdatesFragment extends ListFragment {
updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row,
currentCursor, false, null, fromUpdateClass);
((ListView) getView().findViewById(android.R.id.list)).setAdapter(updateAdapter);
ListView listView = ((ListView) getView().findViewById(android.R.id.list));
addHeaderToListView(listView);
listView.setAdapter(updateAdapter);
} else {
Cursor cursor = updateAdapter.getCursor();
cursor.requery();
getActivity().startManagingCursor(cursor);
populateListHeader(listHeader);
}
if (getActivity() instanceof TagUpdatesActivity)
setLastViewed();
}
private void addHeaderToListView(ListView listView) {
if (AndroidUtilities.isTabletSized(getActivity()) && tagData != null) {
listHeader = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.tag_updates_header, listView, false);
populateListHeader(listHeader);
listView.addHeaderView(listHeader);
}
}
private void populateListHeader(ViewGroup header) {
if (header == null) return;
TextView tagTitle = (TextView) header.findViewById(R.id.tag_title);
String tagName = tagData.getValue(TagData.NAME);
tagTitle.setText(tagName);
TextView descriptionTitle = (TextView) header.findViewById(R.id.tag_description);
String description = tagData.getValue(TagData.TAG_DESCRIPTION);
if (!TextUtils.isEmpty(description)) {
descriptionTitle.setText(description);
descriptionTitle.setVisibility(View.VISIBLE);
}
else {
descriptionTitle.setVisibility(View.GONE);
}
AsyncImageView imageView = (AsyncImageView) header.findViewById(R.id.tag_picture);
imageView.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagName));
imageView.setUrl(tagData.getValue(TagData.PICTURE));
}
public void setLastViewed() {
if(tagData != null && tagData.getValue(TagData.REMOTE_ID) > 0) {
Preferences.setLong(UPDATES_LAST_VIEWED + tagData.getValue(TagData.REMOTE_ID), DateUtilities.now());

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

@ -6,66 +6,6 @@
android:layout_height="fill_parent"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/tag_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dip" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<greendroid.widget.AsyncImageView
android:id="@+id/tag_picture"
android:layout_width="80dip"
android:layout_height="80dip"
astrid:defaultSrc="@android:drawable/ic_menu_gallery"
android:paddingRight="10dip"
android:scaleType="fitCenter" />
<TextView
android:id="@+id/tag_title"
style="@style/TextAppearance.GEN_EditLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/actfm_TVA_tag_description_label"
android:textSize="25dip" />
</LinearLayout>
<TextView
android:id="@+id/tag_description"
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:textColor="#666" />
</LinearLayout>
<LinearLayout
android:id="@+id/activity_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dip"
android:text="@string/TEA_tab_activity"
android:textColor="#888" />
<View
android:id="@+id/TEA_Separator"
style="@style/TEA_Separator"
android:layout_width="fill_parent"
android:layout_height="1px" />
</LinearLayout>
<ProgressBar
android:id="@+id/comments_progressBar"
style="@android:style/Widget.ProgressBar.Horizontal"

69
astrid/res/layout/tag_updates_header.xml
Unescape Escape View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/tag_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dip"
android:paddingBottom="5dip" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<greendroid.widget.AsyncImageView
android:id="@+id/tag_picture"
android:layout_width="80dip"
android:layout_height="80dip"
astrid:defaultSrc="@android:drawable/ic_menu_gallery"
android:paddingRight="10dip"
android:scaleType="fitCenter" />
<TextView
android:id="@+id/tag_title"
style="@style/TextAppearance.GEN_EditLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/actfm_TVA_tag_description_label"
android:textSize="25dip" />
</LinearLayout>
<TextView
android:id="@+id/tag_description"
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:textColor="#666" />
</LinearLayout>
<LinearLayout
android:id="@+id/activity_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
style="@style/TextAppearance.TAd_ItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dip"
android:text="@string/TEA_tab_activity"
android:textColor="#888" />
<View
android:id="@+id/TEA_Separator"
style="@style/TEA_Separator"
android:layout_width="fill_parent"
android:layout_height="1px" />
</LinearLayout>
</LinearLayout>

2
astrid/res/layout/update_adapter_row.xml
Unescape Escape View File

@ -32,7 +32,7 @@
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:paddingLeft="50dip"
android:paddingRight="75dip"
android:paddingRight="5dip"
style="@style/TextAppearance.TAd_ItemTitle"
android:textSize="16sp"/>

Write Preview
Loading…
Cancel
Save