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

Fixed some bugs with task description field from JSON and cleaned up description UI, removed some debug code

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent 7e3fe524f3
commit ba8fc52520
5 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -119,6 +119,7 @@ public class TagSettingsActivity extends Activity {
if(actFmPreferenceService.isLoggedIn()) { if(actFmPreferenceService.isLoggedIn()) {
picture.setVisibility(View.VISIBLE); picture.setVisibility(View.VISIBLE);
findViewById(R.id.picture_label).setVisibility(View.VISIBLE);
findViewById(R.id.listSettingsMore).setVisibility(View.VISIBLE); findViewById(R.id.listSettingsMore).setVisibility(View.VISIBLE);
} }

4
astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
Unescape Escape View File

@ -1000,8 +1000,8 @@ public final class ActFmSyncService {
if(json.has("emergent")) if(json.has("emergent"))
model.setFlag(TagData.FLAGS, TagData.FLAG_EMERGENT,json.getBoolean("emergent")); model.setFlag(TagData.FLAGS, TagData.FLAG_EMERGENT,json.getBoolean("emergent"));
if(json.has("description")) if(!json.isNull("description"))
model.setValue(TagData.TAG_DESCRIPTION,json.getString("description")); model.setValue(TagData.TAG_DESCRIPTION, json.getString("description"));
if(json.has("members")) { if(json.has("members")) {
JSONArray members = json.getJSONArray("members"); JSONArray members = json.getJSONArray("members");

90
astrid/res/layout/tag_settings_activity.xml
Unescape Escape View File

@ -42,23 +42,11 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="10dip"> android:paddingBottom="10dip">
<greendroid.widget.AsyncImageView
android:id="@+id/picture"
android:layout_width="80dip"
android:layout_height="80dip"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitCenter"
android:paddingRight="10dip"
android:visibility="gone"
astrid:defaultSrc="@android:drawable/ic_menu_gallery" />
<TextView <TextView
android:id="@+id/tag_label" android:id="@+id/tag_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/picture"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="10dip" android:layout_marginTop="10dip"
style="@style/TextAppearance.GEN_EditLabel" style="@style/TextAppearance.GEN_EditLabel"
@ -68,7 +56,6 @@
android:id="@+id/tag_name" android:id="@+id/tag_name"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/picture"
android:layout_below="@id/tag_label" android:layout_below="@id/tag_label"
android:layout_marginTop="10dip" /> android:layout_marginTop="10dip" />
@ -98,47 +85,52 @@
android:layout_height="1dip" android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" /> android:background="@android:drawable/divider_horizontal_dark" />
<LinearLayout <RelativeLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dip" android:gravity="center_vertical">
android:paddingBottom="5dip">
<TextView android:id="@+id/list_icon"
android:drawableBottom="@drawable/icon_blank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:paddingBottom="10dip"
android:paddingRight="10dip"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/actfm_TVA_list_icon_label" />
<RelativeLayout <TextView
android:layout_width="fill_parent" android:id="@+id/picture_label"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:paddingBottom="10dip" android:layout_height="wrap_content"
android:paddingLeft="10dip" android:layout_alignParentLeft="true"
android:layout_gravity="right"> android:layout_marginTop="10dip"
android:visibility="gone"
<TextView style="@style/TextAppearance.GEN_EditLabel"
android:id="@+id/description_label" android:text="@string/actfm_TVA_list_icon_label"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content" <greendroid.widget.AsyncImageView
android:layout_alignParentTop="true" android:id="@+id/picture"
android:layout_marginTop="10dip" android:layout_width="80dip"
style="@style/TextAppearance.GEN_EditLabel" android:layout_height="80dip"
android:text="@string/actfm_TVA_tag_description_label" /> android:layout_alignParentLeft="true"
<EditText android:scaleType="fitCenter"
android:id="@+id/tag_description" android:paddingRight="10dip"
android:layout_width="fill_parent" android:visibility="gone"
android:layout_height="wrap_content" android:layout_below="@id/picture_label"
android:layout_below="@id/description_label" astrid:defaultSrc="@android:drawable/ic_menu_gallery" />
android:layout_marginTop="10dip" />
</RelativeLayout> <TextView
android:id="@+id/description_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/picture"
android:layout_marginTop="10dip"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/actfm_TVA_tag_description_label" />
<EditText
android:id="@+id/tag_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/picture"
android:layout_below="@id/description_label"
android:layout_marginTop="10dip"
android:hint="@string/actfm_TVA_tag_description_hint" />
</LinearLayout> </RelativeLayout>
<!-- Footer --> <!-- Footer -->
<LinearLayout <LinearLayout

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

@ -97,6 +97,9 @@
<!-- Tag Settings: list description label --> <!-- Tag Settings: list description label -->
<string name="actfm_TVA_tag_description_label">Description:</string> <string name="actfm_TVA_tag_description_label">Description:</string>
<!-- Tag Settings: list description hint -->
<string name="actfm_TVA_tag_description_hint">List description</string>
<!-- ============================================ edit people dialog == --> <!-- ============================================ edit people dialog == -->
<!-- task sharing dialog: intro --> <!-- task sharing dialog: intro -->

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

@ -576,8 +576,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
AndroidUtilities.copyDatabases(this, "/sdcard/tmp");
StatisticsService.sessionStart(this); StatisticsService.sessionStart(this);
if (addOnService.hasPowerPack() && if (addOnService.hasPowerPack() &&
Preferences.getBoolean(R.string.p_voiceInputEnabled, true) && Preferences.getBoolean(R.string.p_voiceInputEnabled, true) &&

Write Preview
Loading…
Cancel
Save