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

Theme for edit page, and cleaned up dead code

Browse Source
pull/14/head
Tim Su 13 years ago
parent 1e254dcf96
commit 5165ed2e2e
10 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -57,7 +57,6 @@ public class EditPeopleExposer extends BroadcastReceiver {
} else if(ACTION.equals(intent.getAction())) {
Intent launchIntent = new Intent(context, TaskEditWrapperActivity.class);
launchIntent.putExtra(TaskEditActivity.TOKEN_ID, taskId);
launchIntent.putExtra(TaskEditActivity.TOKEN_TAB, TaskEditActivity.TAB_SHARE);
launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
ContextManager.getContext().startActivity(launchIntent);
}

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

@ -5,15 +5,15 @@
<item>
<shape android:shape="rectangle" >
<gradient
android:endColor="#eeeeee"
android:startColor="#d8d8d8" />
android:endColor="#111111"
android:startColor="#222222" />
<corners android:radius="4dp" />
</shape>
</item>
<item android:bottom="2dp" android:right="1dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<solid android:color="#000000" />
<corners android:radius="4dp" />
</shape>
</item>

21
astrid/res/drawable/task_edit_background_white.xml
Unescape Escape View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- Bottom 2dp Shadow -->
<item>
<shape android:shape="rectangle" >
<gradient
android:endColor="#eeeeee"
android:startColor="#d8d8d8" />
<corners android:radius="4dp" />
</shape>
</item>
<item android:bottom="2dp" android:right="1dp">
<shape android:shape="rectangle" >
<solid android:color="#ffffff" />
<corners android:radius="4dp" />
</shape>
</item>
</layer-list>

9
astrid/res/layout/task_edit_activity.xml
Unescape Escape View File

@ -9,11 +9,10 @@
<ScrollView
android:id="@+id/edit_scroll"
style="@style/Content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:background="#f7f3f7" >
style="@style/Content_EditScroll" >
<LinearLayout
android:layout_width="fill_parent"
@ -92,6 +91,7 @@
android:background="@drawable/task_edit_background"
android:orientation="vertical"
android:visibility="gone">
<com.viewpagerindicator.TabPageIndicator
android:id="@+id/indicator"
android:layout_width="fill_parent"
@ -109,6 +109,7 @@
android:id="@+id/pager"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>
@ -120,7 +121,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="#fff"
style="@style/Content"
android:minHeight="47dip"
android:orientation="horizontal"
android:padding="3dip" >
@ -190,4 +191,4 @@
android:src="@drawable/ic_footer_add" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@ -3,6 +3,8 @@
<!-- theme attributes -->
<attr name="asContentBackground" format="reference"/>
<attr name="asEditBackground" format="color"/>
<attr name="asEditRowBackground" format="reference"/>
<attr name="asHeaderBackground" format="reference"/>
<attr name="asHeaderButtonBackground" format="reference"/>
<attr name="asTextColor" format="color"/>

12
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -254,18 +254,6 @@
<!-- Title when creating a new task -->
<string name="TEA_view_titleNew">New Task</string>
<!-- First Tab - basic task details -->
<string name="TEA_tab_basic">Basic</string>
<!-- Second Tab - extra details -->
<string name="TEA_tab_share">Share</string>
<!-- Second Tab - extra details -->
<string name="TEA_tab_alarms">Alarms</string>
<!-- Third Tab - add-ons -->
<string name="TEA_tab_more">More</string>
<!-- Task title label -->
<string name="TEA_title_label">Title</string>

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

@ -19,10 +19,12 @@
<item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
<item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
<item name="asSeparatorBackground">#888888</item>
<item name="asAddButtonImg">@drawable/plus_button_gray</item>
<item name="asAddButtonImg">@drawable/plus_button_red</item>
<item name="asMicButtonImg">@drawable/mic_button_gray</item>
<item name="asCameraButtonImg">@drawable/camera_button_gray</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_gray</item>
<item name="asEditBackground">#272327</item>
<item name="asEditRowBackground">@drawable/task_edit_background</item>
<!-- actionbar-styling -->
<item name="abBackground">@drawable/header_background</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@ -34,6 +36,7 @@
<style name="Theme.Transparent" parent="@style/Theme">
<item name="asContentBackground">@drawable/background_transparent</item>
<item name="asEditBackground">#33272327</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
<item name="asMembersHeaderBackground">@android:color/transparent</item>
@ -57,6 +60,7 @@
<style name="Theme.White" parent="@style/Theme.Sherlock.Light">
<item name="asContentBackground">@drawable/background_white</item>
<item name="asEditBackground">#f7f3f7</item>
<item name="asHeaderBackground">@drawable/header_background_white</item>
<item name="asHeaderButtonBackground">@drawable/header_button_white</item>
<item name="asTextColor">#ff000000</item>
@ -69,6 +73,7 @@
<item name="asMicButtonImg">@drawable/mic_button_red</item>
<item name="asCameraButtonImg">@drawable/camera_button_red</item>
<item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
<item name="asEditRowBackground">@drawable/task_edit_background_white</item>
<!-- actionbar-styling -->
<item name="abBackground">@android:color/white</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@ -209,6 +214,14 @@
<!-- =============================================== TaskEditActivity == -->
<style name="Content_EditScroll">
<item name="android:background">?attr/asEditBackground</item>
</style>
<style name="EditRow">
<item name="android:background">?attr/asEditRowBackground</item>
</style>
<style name="EditRowImage">
<item name="android:layout_width">25dip</item>
<item name="android:layout_height">25dip</item>

35
astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
Unescape Escape View File

@ -43,7 +43,6 @@ import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MenuInflater;
@ -61,7 +60,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.timsu.astrid.R;
@ -117,7 +115,7 @@ import com.viewpagerindicator.TabPageIndicator;
public final class TaskEditActivity extends Fragment implements
ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
public static final String TAG_TASKEDIT_FRAGMENT = "taskedit_fragment";
public static final String TAG_TASKEDIT_FRAGMENT = "taskedit_fragment"; //$NON-NLS-1$
// --- bundle tokens
@ -169,14 +167,6 @@ public final class TaskEditActivity extends Fragment implements
public static final int RESULT_CODE_DISCARDED = Activity.RESULT_FIRST_USER + 1;
public static final int RESULT_CODE_DELETED = Activity.RESULT_FIRST_USER + 2;
public static final String TAB_BASIC = "basic"; //$NON-NLS-1$
public static final String TAB_SHARE = "share"; //$NON-NLS-1$
public static final String TAB_ALARMS = "alarms"; //$NON-NLS-1$
public static final String TAB_MORE = "more"; //$NON-NLS-1$
public static final String OVERRIDE_FINISH_ANIM = "finishAnim"; //$NON-NLS-1$
public static final String TOKEN_TASK_WAS_ASSIGNED = "task_assigned"; //$NON-NLS-1$
@ -581,7 +571,7 @@ public final class TaskEditActivity extends Fragment implements
String shareViewDescriptor = getString(R.string.TEA_ctrl_share_pref);
String titleViewDescriptor = getString(R.string.TEA_ctrl_title_pref);
LinearLayout section = basicControls;
int controlWidth = basicControls.getLayoutParams().width;
for (int i = 0; i < itemOrder.length; i++) {
String item = itemOrder[i];
if (item.equals(moreSectionTrigger)) {
@ -858,7 +848,7 @@ public final class TaskEditActivity extends Fragment implements
}
}
public boolean onKeyDown(int keyCode, KeyEvent event) {
public boolean onKeyDown(int keyCode) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (title.getText().length() == 0)
discardButtonClick();
@ -1047,7 +1037,7 @@ public final class TaskEditActivity extends Fragment implements
item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_menu_delete);
item.setIcon(android.R.drawable.ic_menu_delete);
if (((AstridWrapperActivity) getActivity()).isMultipleFragments())
if (((AstridWrapperActivity) getActivity()).getFragmentLayout() != AstridWrapperActivity.LAYOUT_SINGLE)
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@ -1085,7 +1075,6 @@ public final class TaskEditActivity extends Fragment implements
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
Log.d("Activity !!!", "Called on camera for request code: " + requestCode + "EditNOtes: " + editNotes.toString());
if (editNotes.activityResult(requestCode, resultCode, data)) {
return;
}
@ -1153,27 +1142,13 @@ public final class TaskEditActivity extends Fragment implements
moreControls.setLayoutParams(mPager.getLayoutParams());
setViewHeightBasedOnChildren(moreControls);
// setPagerHeightForView(editNotes, moreControls);
return moreControls;
} else if (position == 0) {
// setPagerHeightForView(editNotes, moreControls);
return editNotes;
} else {
TextView text = new TextView(getActivity());
text.setGravity(Gravity.CENTER);
text.setText("Activity");
text.setTextSize(20 * getResources().getDisplayMetrics().density);
text.setPadding(20, 20, 20, 20);
LinearLayout layout = new LinearLayout(getActivity());
layout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
LayoutParams.WRAP_CONTENT));
layout.setGravity(Gravity.CENTER);
layout.addView(text);
return layout;
return null;
}
}

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

@ -50,7 +50,7 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
TaskEditActivity frag = (TaskEditActivity) getSupportFragmentManager()
.findFragmentByTag(TaskEditActivity.TAG_TASKEDIT_FRAGMENT);
if (frag != null && frag.isInLayout())
return frag.onKeyDown(keyCode, event);
return frag.onKeyDown(keyCode);
return super.onKeyDown(keyCode, event);
}

6
astrid/src/com/todoroo/astrid/ui/MultilineListPreference.java
Unescape Escape View File

@ -12,7 +12,11 @@ public class MultilineListPreference extends ListPreference {
@Override
protected void onBindView(View view) {
super.onBindView(view);
try {
super.onBindView(view);
} catch (Exception e) {
// happens on 4.0 emulators
}
MultilineHelper.makeMultiline(view);
}
}

Write Preview
Loading…
Cancel
Save