More theme issue fixes

pull/14/head
Tim Su 15 years ago
parent a889c9d175
commit 852491fa1f

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

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

@ -15,5 +15,5 @@
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android"> <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> </set>

@ -15,5 +15,5 @@
--> -->
<set xmlns:android="http://schemas.android.com/apk/res/android"> <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> </set>

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

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

@ -19,6 +19,8 @@
<style name="Theme.Transparent"> <style name="Theme.Transparent">
<item name="asContentBackground">@drawable/background_transparent</item> <item name="asContentBackground">@drawable/background_transparent</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
</style> </style>
<style name="Theme.White"> <style name="Theme.White">
@ -31,8 +33,21 @@
<item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item> <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
</style> </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="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> </style>
<!--================================================== General == --> <!--================================================== General == -->

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

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

@ -144,10 +144,15 @@ public final class UpgradeService {
// current message // current message
if(from >= V3_8_0 && from < V3_8_2) { if(from >= V3_8_0 && from < V3_8_2) {
if(Preferences.getBoolean(R.string.p_transparent_deprecated, false)) newVersionString(changeLog, "3.8.2 beta (8/8/11)", new String[] {
Preferences.setString(R.string.p_theme, "transparent"); "New theme options for Astrid - white, black, transparent with white or black text",
else "New style for filter list page - same great functionality",
Preferences.setString(R.string.p_theme, "black"); "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) { if(from >= V3_8_0 && from < V3_8_0_2) {
newVersionString(changeLog, "3.8.0.2 (7/16/11)", new String[] { newVersionString(changeLog, "3.8.0.2 (7/16/11)", new String[] {

Loading…
Cancel
Save