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

More theme issue fixes

Browse Source
pull/14/head
Tim Su 15 years ago
parent a889c9d175
commit 852491fa1f
10 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File

21
astrid/AndroidManifest.xml
Unescape Escape View File

@ -74,8 +74,7 @@
<!-- Activity that displays task list -->
<activity android:name="com.todoroo.astrid.activity.TaskListActivity"
android:windowSoftInputMode="stateHidden"
android:theme="@style/Theme">
android:windowSoftInputMode="stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@ -111,8 +110,7 @@
<!-- Activity that displays filter list -->
<activity android:name="com.todoroo.astrid.activity.FilterListActivity"
android:launchMode="singleTop"
android:finishOnTaskLaunch="true"
android:theme="@style/Theme">
android:finishOnTaskLaunch="true">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
@ -122,8 +120,7 @@
</activity>
<!-- Activity that creates or edits tasks -->
<activity android:name="com.todoroo.astrid.activity.TaskEditActivity"
android:windowSoftInputMode="stateHidden"
android:theme="@style/Theme">
android:windowSoftInputMode="stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@ -136,14 +133,12 @@
</activity>
<!-- Activity that selects and installs add-ons -->
<activity android:name="com.todoroo.astrid.activity.AddOnActivity"
android:windowSoftInputMode="stateHidden"
android:theme="@style/Theme" />
android:windowSoftInputMode="stateHidden" />
<!-- Activity for preferences -->
<activity android:name="com.todoroo.astrid.activity.EditPreferences"
android:theme="@android:style/Theme" />
<!-- Activity that configures widget -->
<activity android:name="com.todoroo.astrid.widget.TasksWidget$ConfigActivity"
android:theme="@style/Theme">
<activity android:name="com.todoroo.astrid.widget.TasksWidget$ConfigActivity">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
@ -416,7 +411,7 @@
<!-- backup -->
<service android:name="com.todoroo.astrid.backup.BackupService"/>
<activity android:name="com.todoroo.astrid.backup.BackupActivity"
android:theme="@android: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">
@ -455,7 +450,7 @@
</intent-filter>
</receiver>
<activity android:name="com.todoroo.astrid.notes.EditNoteActivity"
android:theme="@android: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" />
@ -533,7 +528,7 @@
</intent-filter>
</activity>
<activity android:name="com.todoroo.astrid.producteev.ProducteevLoginActivity"
android:theme="@style/Theme" android:configChanges="orientation|keyboardHidden" />
android:configChanges="orientation|keyboardHidden" />
<service android:name="com.todoroo.astrid.producteev.ProducteevBackgroundService">
<intent-filter>
<action android:name="com.todoroo.astrid.producteev.SYNC" />

4
astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.json.JSONObject;
import android.app.ListActivity;
import android.app.ProgressDialog;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
@ -73,6 +74,7 @@ public class EditNoteActivity extends ListActivity {
protected void onCreate(Bundle savedInstanceState) {
DependencyInjectionService.getInstance().inject(this);
super.onCreate(savedInstanceState);
setTheme(R.style.Theme_Dialog);
setContentView(R.layout.edit_note_activity);
long taskId = getIntent().getLongExtra(EXTRA_TASK_ID, -1);
@ -145,7 +147,7 @@ public class EditNoteActivity extends ListActivity {
if(!TextUtils.isEmpty(task.getValue(Task.NOTES))) {
TextView notes = new TextView(this);
notes.setTextAppearance(this, R.style.TextAppearance_TAd_ItemTitle);
notes.setLinkTextColor(Color.rgb(100, 160, 255));
notes.setTextSize(18);
getListView().addHeaderView(notes);
notes.setText(task.getValue(Task.NOTES));

2
astrid/res/anim/slide_bottom_in.xml
Unescape Escape View File

@ -15,5 +15,5 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="100"/>
<translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="250"/>
</set>

2
astrid/res/anim/slide_bottom_out.xml
Unescape Escape View File

@ -15,5 +15,5 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromYDelta="0" android:toYDelta="-100%p" android:duration="100"/>
<translate android:fromYDelta="0" android:toYDelta="100%p" android:duration="250"/>
</set>

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

@ -19,7 +19,7 @@
android:gravity="center"
android:visibility="gone"
android:text="@string/ENA_loading"
style="@style/TextAppearance.TLA_NoItems" />
android:textSize="20sp" />
<ListView
android:id="@android:id/list"

4
astrid/res/layout/task_adapter_row.xml
Unescape Escape View File

@ -6,7 +6,6 @@
android:layout_height="wrap_content"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:paddingBottom="4dip"
android:minHeight="40dip"
android:orientation="horizontal">
@ -17,7 +16,8 @@
<RelativeLayout android:id="@+id/rowBody"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingBottom="4dip">
<!-- completion area -->
<View android:id="@+id/completeArea"

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

@ -19,6 +19,8 @@
<style name="Theme.Transparent">
<item name="asContentBackground">@drawable/background_transparent</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
</style>
<style name="Theme.White">
@ -31,10 +33,23 @@
<item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
</style>
<style name="Theme.TransparentWhite" parent="Theme.White">
<style name="Theme.TransparentWhite" parent="@style/Theme.White">
<item name="asContentBackground">@drawable/background_transparent</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
</style>
<style name="Theme.Dialog">
<item name="android:windowIsFloating">true</item>
<item name="android:windowBackground">@drawable/panel_background</item>
<item name="android:windowTitleStyle">@android:style/DialogWindowTitle</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:colorBackgroundCacheHint">@null</item>
</style>
<!--================================================== General == -->
<style name="Content">

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

@ -113,7 +113,7 @@ public class FilterListActivity extends ExpandableListActivity {
finish();
AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", //$NON-NLS-1$
new Class<?>[] { Integer.TYPE, Integer.TYPE },
0, R.anim.slide_bottom_out);
R.anim.slide_none, R.anim.slide_bottom_out);
}
});

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

@ -1151,7 +1151,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
startActivity(intent);
AndroidUtilities.callApiMethod(5, this, "overridePendingTransition",
new Class<?>[] { Integer.TYPE, Integer.TYPE },
R.anim.slide_bottom_in, R.anim.slide_bottom_out);
R.anim.slide_bottom_in, R.anim.slide_none);
}
@Override

13
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

@ -144,10 +144,15 @@ public final class UpgradeService {
// current message
if(from >= V3_8_0 && from < V3_8_2) {
if(Preferences.getBoolean(R.string.p_transparent_deprecated, false))
Preferences.setString(R.string.p_theme, "transparent");
else
Preferences.setString(R.string.p_theme, "black");
newVersionString(changeLog, "3.8.2 beta (8/8/11)", new String[] {
"New theme options for Astrid - white, black, transparent with white or black text",
"New style for filter list page - same great functionality",
"Fix for failed Google Tasks migration sync",
"Fix for Astrid.com deleting tag information when syncing",
"Fix for repeating tasks and Astrid.com sync",
"Fix for duplicated Producteev notes",
"Astrid is now trimmed down by 25 percent in memory",
});
}
if(from >= V3_8_0 && from < V3_8_0_2) {
newVersionString(changeLog, "3.8.0.2 (7/16/11)", new String[] {

Write Preview
Loading…
Cancel
Save