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

Cleaned up unused files and polished the tag view activity people header

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent 5c197923bc
commit b188bc6cdd
8 changed files with 69 additions and 304 deletions
Show Stats Download Patch File Download Diff File

6
astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
Unescape Escape View File

@ -112,12 +112,12 @@ public class TagViewActivity extends TaskListActivity {
View membersEdit = findViewById(R.id.members_edit);
membersEdit.setOnClickListener(settingsListener);
findViewById(R.id.listLabel).setPadding(0, 0, 0, 0);
if (actFmPreferenceService.isLoggedIn()) {
View activityContainer = findViewById(R.id.activityContainer);
activityContainer.setVisibility(View.VISIBLE);
findViewById(R.id.listLabel).setPadding(0, 0, 0, 0);
ImageView activity = (ImageView) findViewById(R.id.activity);
activity.setOnClickListener(new View.OnClickListener() {
@Override
@ -153,7 +153,7 @@ public class TagViewActivity extends TaskListActivity {
*/
@Override
protected View getListBody(ViewGroup root) {
ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_body_tag_v2, root, false);
ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_body_tag, root, false);
taskListView = super.getListBody(parent);
if(actFmPreferenceService.isLoggedIn())

0
astrid/res/drawable/icn_arrow_light.png → astrid/res/drawable/icn_arrow_light_blorg.png
Unescape Escape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 293 B

6
astrid/res/drawable/members_arrow.xml
Unescape Escape View File

@ -17,10 +17,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="false" android:drawable="@drawable/icn_arrow_light" />
android:state_focused="false" android:drawable="@drawable/icn_arrow_over" />
<item android:state_pressed="true" android:state_enabled="true"
android:drawable="@drawable/icn_arrow_over" />
android:drawable="@drawable/icn_arrow_right" />
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="true" android:drawable="@drawable/icn_arrow_over" />
android:state_focused="true" android:drawable="@drawable/icn_arrow_right" />
</selector>

26
astrid/res/drawable/members_arrow_white.xml
Unescape Escape View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="false" android:drawable="@drawable/icn_arrow_right" />
<item android:state_pressed="true" android:state_enabled="true"
android:drawable="@drawable/icn_arrow_over" />
<item android:state_pressed="false" android:state_enabled="true"
android:state_focused="true" android:drawable="@drawable/icn_arrow_over" />
</selector>

212
astrid/res/layout/task_list_body_tag.xml
Unescape Escape View File

@ -1,206 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- See the file "LICENSE" for the full license governing this code. -->
<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
android:id="@android:id/tabhost"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="100">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="-2dp"
android:layout_marginRight="-2dp"
android:layout_weight="1"
android:background="@null" />
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="100">
<!-- task list body automatically inserted -->
<!-- updates tab -->
<ListView
android:id="@+id/tab_updates"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
<!-- settings tab -->
<ScrollView
android:id="@+id/tab_settings"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="5dip"
android:orientation="vertical">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
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
android:id="@+id/tag_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/picture"
android:layout_alignParentTop="true"
android:layout_marginTop="10dip"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/actfm_TVA_tag_label" />
<EditText
android:id="@+id/tag_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/picture"
android:layout_below="@id/tag_label"
android:layout_marginTop="10dip" />
</RelativeLayout>
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:paddingBottom="5dip"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/actfm_TVA_members_label" />
<com.todoroo.astrid.ui.PeopleContainer
android:id="@+id/members_container"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
android:orientation="vertical">
<!-- Footer -->
<LinearLayout
android:id="@+id/listSettingsMore"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:orientation="vertical"
android:visibility="gone">
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="@android:drawable/divider_horizontal_dark" />
<TextView
android:layout_height="43dip"
android:layout_weight="1"
android:background="?attr/asMembersHeaderBackground">
<HorizontalScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/actfm_TVA_tag_owner_label" />
android:layout_height="43dip"
android:layout_weight="100"
android:scrollbars="none">
<LinearLayout
android:id="@+id/shared_with"
android:layout_width="wrap_content"
android:layout_height="fill_parent">
<TextView
android:id="@+id/tag_owner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:textSize="20sp"/>
<CheckBox
android:id="@+id/tag_silenced"
android:id="@+id/no_members"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:paddingLeft="45dip"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:layout_marginLeft="10dip"
style="@style/TextAppearance"
android:text="@string/actfm_TVA_silence_label" />
android:textStyle="bold"
android:textColor="#333333"
android:text="@string/actfm_TVA_no_members_alert"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>
<!-- Footer -->
<LinearLayout
android:id="@+id/updatesFooter"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:orientation="horizontal">
<!-- Add Button -->
<ImageButton android:id="@+id/commentButton"
</HorizontalScrollView>
<ImageView
android:id="@+id/members_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
android:visibility="gone"
android:src="@drawable/tango_chat"
android:padding="10dip"
android:src="@drawable/members_arrow"
android:scaleType="fitCenter"/>
<!-- Comment Field -->
<EditText android:id="@+id/commentField"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="100"
android:hint="@string/TVA_add_comment"
android:singleLine="true"
android:autoText="true"
android:capitalize="sentences"/>
</LinearLayout>
<LinearLayout
android:id="@+id/membersFooter"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:layout_marginTop="10dip"
android:padding="5dip"
android:background="@drawable/footer_background"
android:orientation="horizontal"
android:baselineAligned="false">
<ImageButton
android:id="@+id/saveMembers"
<TextView
android:id="@+id/filter_assigned"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/tango_save" />
</LinearLayout>
android:gravity="center"
android:paddingTop="3dip"
android:paddingBottom="3dip"
style="@style/TextAppearance"
android:background="@android:color/darker_gray"
android:visibility="gone"/>
</LinearLayout>
</TabHost>
<!-- List body goes here -->
</LinearLayout>

65
astrid/res/layout/task_list_body_tag_v2.xml
Unescape Escape View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="100">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="43dip"
android:layout_weight="1"
android:background="?attr/asMembersHeaderBackground">
<HorizontalScrollView
android:layout_width="fill_parent"
android:layout_height="43dip"
android:layout_weight="15"
android:scrollbars="none">
<LinearLayout
android:id="@+id/shared_with"
android:layout_width="wrap_content"
android:layout_height="fill_parent">
<TextView
android:id="@+id/no_members"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:layout_marginLeft="10dip"
style="@style/TextAppearance"
android:textStyle="bold"
android:text="@string/actfm_TVA_no_members_alert"/>
</LinearLayout>
</HorizontalScrollView>
<ImageView
android:id="@+id/members_edit"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="85"
android:padding="7dip"
android:src="?attr/asMembersHeaderArrow"
android:scaleType="fitCenter"/>
</LinearLayout>
<TextView
android:id="@+id/filter_assigned"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingTop="3dip"
android:paddingBottom="3dip"
style="@style/TextAppearance"
android:background="@android:color/darker_gray"
android:visibility="gone"/>
</LinearLayout>
<!-- List body goes here -->
</LinearLayout>

1
astrid/res/values/attrs.xml
Unescape Escape View File

@ -14,7 +14,6 @@
<attr name="asFilterHeaderBackground" format="reference"/>
<attr name="asFilterCountColor" format="color"/>
<attr name="asMembersHeaderBackground" format="reference"/>
<attr name="asMembersHeaderArrow" format="reference"/>
<attr name="asSeparatorBackground" format="color"/>
<declare-styleable name="ContactsAutoComplete">

3
astrid/res/values/styles.xml
Unescape Escape View File

@ -18,7 +18,6 @@
<item name="asFilterHeaderColor">#ffcccccc</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
<item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
<item name="asMembersHeaderArrow">@drawable/members_arrow</item>
<item name="asSeparatorBackground">#888888</item>
</style>
@ -48,7 +47,6 @@
<item name="asFilterHeaderColor">#ffffff</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
<item name="asMembersHeaderBackground">@drawable/ios_fabric_480</item>
<item name="asMembersHeaderArrow">@drawable/members_arrow_white</item>
</style>
<style name="Theme.TransparentWhite" parent="@style/Theme.White">
@ -56,7 +54,6 @@
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
<item name="asMembersHeaderBackground">@android:color/transparent</item>
<item name="asMembersHeaderArrow">@drawable/members_arrow_white</item>
</style>
<style name="Theme.Dialog">

Write Preview
Loading…
Cancel
Save