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

Adjusted parent style of Theme.Dialog to be android:Theme.Dialog to fix a crash in EditNoteActivity

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent 0b1639af85
commit 2e72bb936a
5 changed files with 40 additions and 85 deletions
Show Stats Download Patch File Download Diff File

4
astrid/AndroidManifest.xml
Unescape Escape View File

@ -450,7 +450,7 @@
<!-- backup -->
<service android:name="com.todoroo.astrid.backup.BackupService"/>
<activity android:name="com.todoroo.astrid.backup.BackupActivity"
android:theme="@style/Theme.Dialog" />
android:theme="@style/Theme_Dialog" />
<activity android:name="com.todoroo.astrid.backup.BackupPreferences"
android:theme="@android:style/Theme"
android:label="@string/backup_BPr_header">
@ -489,7 +489,7 @@
</intent-filter>
</receiver>
<activity android:name="com.todoroo.astrid.notes.EditNoteActivity"
android:theme="@style/Theme.Dialog"/>
android:theme="@style/Theme_Dialog"/>
<!-- <receiver android:name="com.todoroo.astrid.notes.EditNoteExposer">
<intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_ACTIONS" />

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

@ -7,66 +7,6 @@
android:layout_height="fill_parent"
style="@style/Content">
<!-- Header -->
<LinearLayout
android:id="@+id/edit_header"
android:layout_width="fill_parent"
android:layout_height="43dip"
android:layout_weight="1"
android:orientation="horizontal"
android:layout_alignParentTop="true">
<LinearLayout
style="@style/Header"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="horizontal">
<!-- Header Logo -->
<ImageView android:id="@+id/headerLogo"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:gravity="center"
android:paddingRight="43dip"
android:src="@drawable/header_logo_new"
android:scaleType="center"
android:visibility="gone"/>
<!-- List Label -->
<TextView android:id="@+id/taskLabel"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center"
style="@style/TextAppearance.TLA_Header"/>
</LinearLayout>
<LinearLayout android:id="@+id/activityContainer"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:visibility="gone">
<View
android:layout_width="0.5dip"
android:layout_height="fill_parent"
android:background="#ff222222"/>
<ImageView android:id="@+id/activity"
android:layout_height="fill_parent"
android:layout_width="43dip"
android:background="?attr/asHeaderButtonBackground"
android:padding="7dip"
android:src="@drawable/icn_cmmt_off"
android:scaleType="fitCenter" />
</LinearLayout>
</LinearLayout>
<!-- buttons -->
<LinearLayout android:id="@+id/edit_footer"
android:orientation="horizontal"
@ -102,7 +42,7 @@
<ScrollView
android:id="@+id/edit_scroll"
android:layout_below="@id/edit_header"
android:layout_alignParentTop="true"
android:layout_above="@id/edit_footer"
android:layout_width="fill_parent"
android:layout_height="fill_parent"

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

@ -322,6 +322,9 @@
<!-- Menu: Delete Task -->
<string name="TEA_menu_delete">Delete Task</string>
<!-- Menu: Task comments -->
<string name="TEA_menu_comments">Comments</string>
<!-- Toast: task saved with deadline (%s => preposition + time units) -->
<string name="TEA_onTaskSave_due">Task Saved: due %s</string>

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

@ -75,7 +75,26 @@
<item name="abLogo">@drawable/icon_48</item>
</style>
<style name="Theme.Dialog">
<style name="Theme_Dialog" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@null</item>
<item name="asContentBackground">@drawable/background_gradient</item>
<item name="asHeaderBackground">@drawable/header_background</item>
<item name="asHeaderButtonBackground">@drawable/header_button</item>
<item name="asSeparatorBackground">@android:drawable/divider_horizontal_dark</item>
<item name="asTextColor">#ffffffff</item>
<item name="asDetailsColor">#ff777777</item>
<item name="asDueDateColor">#ff7777aa</item>
<item name="asDueDateOverdueColor">#ffee5555</item>
<item name="asDueDateCompletedColor">#ff777777</item>
<item name="asFilterHeaderColor">#ffcccccc</item>
<item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
<item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
<item name="asSeparatorBackground">#888888</item>
<!-- actionbar-styling -->
<item name="abBackground">@drawable/header_background</item>
<item name="abDisplayOptions">useLogo|showHome|showTitle</item>
<item name="abLogo">@drawable/icon_48</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowBackground">@drawable/panel_background</item>
<item name="android:windowContentOverlay">@null</item>

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

@ -54,7 +54,6 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.timsu.astrid.R;
@ -141,6 +140,7 @@ public final class TaskEditActivity extends Fragment {
private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
private static final int MENU_DELETE_ID = R.string.TEA_menu_delete;
private static final int MENU_COMMENTS_ID = R.string.TEA_menu_comments;
// --- result codes
@ -500,14 +500,6 @@ public final class TaskEditActivity extends Fragment {
getView().findViewById(R.id.more_header).setOnClickListener(mExpandMoreListener);
getView().findViewById(R.id.activity).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent launchIntent = new Intent(getActivity(), EditNoteActivity.class);
launchIntent.putExtra(EditNoteActivity.EXTRA_TASK_ID, model.getId());
startActivity(launchIntent);
}
});
} catch (Exception e) {
// error loading the proper activity
}
@ -644,12 +636,6 @@ public final class TaskEditActivity extends Fragment {
return;
}
if (!isNewTask) {
if (actFmPreferenceService.isLoggedIn()) {
getView().findViewById(R.id.activityContainer).setVisibility(View.VISIBLE);
}
}
// clear notification
Notifications.cancelNotifications(model.getId());
}
@ -664,12 +650,6 @@ public final class TaskEditActivity extends Fragment {
public void populateFields(Intent intent) {
loadItem(intent);
TextView titleText = (TextView) getView().findViewById(R.id.taskLabel);
if(isNewTask)
titleText.setText(R.string.TEA_view_titleNew);
else
titleText.setText(model.getValue(Task.TITLE));
synchronized(controls) {
for(TaskEditControlSet controlSet : controls)
controlSet.readFromTask(model);
@ -849,6 +829,12 @@ public final class TaskEditActivity extends Fragment {
Toast.LENGTH_SHORT).show();
}
protected void commentsButtonClick() {
Intent launchIntent = new Intent(getActivity(), EditNoteActivity.class);
launchIntent.putExtra(EditNoteActivity.EXTRA_TASK_ID, model.getId());
startActivity(launchIntent);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
@ -861,6 +847,9 @@ public final class TaskEditActivity extends Fragment {
case MENU_DELETE_ID:
deleteButtonClick();
return true;
case MENU_COMMENTS_ID:
commentsButtonClick();
return true;
case android.R.id.home:
saveButtonClick();
return true;
@ -885,6 +874,10 @@ public final class TaskEditActivity extends Fragment {
item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_menu_delete);
item.setIcon(android.R.drawable.ic_menu_delete);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
item = menu.add(Menu.NONE, MENU_COMMENTS_ID, 0, R.string.TEA_menu_comments);
item.setIcon(R.drawable.icn_cmmt_off);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
@Override

Write Preview
Loading…
Cancel
Save