From 3750959a0c0b3942e3e0362bd232633c0ec5b6d8 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 5 Aug 2011 18:37:46 -0700 Subject: [PATCH] Light view settings, works in task list and task edit activities --- astrid/AndroidManifest.xml | 4 +- astrid/res/drawable/background_white.xml | 6 ++ .../res/drawable/header_background_white.png | Bin 0 -> 2849 bytes astrid/res/layout/gcal_control.xml | 3 +- astrid/res/layout/repeat_control.xml | 4 +- astrid/res/layout/task_edit_activity.xml | 8 ++- astrid/res/layout/task_list_activity.xml | 6 +- astrid/res/values/attrs.xml | 10 ++++ astrid/res/values/keys.xml | 10 +++- astrid/res/values/strings-core.xml | 19 ++++--- astrid/res/values/styles.xml | 53 +++++++++++++----- astrid/res/xml/preferences.xml | 9 +-- .../astrid/activity/EditPreferences.java | 28 ++++++--- .../astrid/activity/TaskEditActivity.java | 6 +- .../astrid/activity/TaskListActivity.java | 7 ++- .../todoroo/astrid/service/ThemeService.java | 19 +++---- .../astrid/service/UpgradeService.java | 14 ++--- 17 files changed, 140 insertions(+), 66 deletions(-) create mode 100644 astrid/res/drawable/background_white.xml create mode 100644 astrid/res/drawable/header_background_white.png diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 76cfe8d26..ec6e94c9f 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionName="3.8.2" + android:versionCode="191"> diff --git a/astrid/res/drawable/background_white.xml b/astrid/res/drawable/background_white.xml new file mode 100644 index 000000000..87f40e4e0 --- /dev/null +++ b/astrid/res/drawable/background_white.xml @@ -0,0 +1,6 @@ + + + + diff --git a/astrid/res/drawable/header_background_white.png b/astrid/res/drawable/header_background_white.png new file mode 100644 index 0000000000000000000000000000000000000000..87b8ad7ba88c7dc1a2f27780df037d5a81d35940 GIT binary patch literal 2849 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 literal 0 HcmV?d00001 diff --git a/astrid/res/layout/gcal_control.xml b/astrid/res/layout/gcal_control.xml index 9a0594b0e..a13e8c05b 100644 --- a/astrid/res/layout/gcal_control.xml +++ b/astrid/res/layout/gcal_control.xml @@ -19,7 +19,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dip" - android:button="@drawable/btn_check_small" + android:button="@drawable/btn_check_small" + style="@style/TextAppearance.GEN_EditLabel" android:text="@string/gcal_TEA_addToCalendar_label" /> + android:text="@string/repeat_enabled" + style="@style/TextAppearance.GEN_EditLabel" /> diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml index 7daa21114..9c1a53d8b 100644 --- a/astrid/res/layout/task_edit_activity.xml +++ b/astrid/res/layout/task_edit_activity.xml @@ -2,9 +2,10 @@ + style="@style/Content"> + android:orientation="horizontal"> + + + + + + + + + + diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 977862494..6c433a7a1 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -161,11 +161,19 @@ colorize font_size notesVisible - transparent + transparent + theme voiceInputEnabled voiceInputCreatesTask voiceRemindersEnabled + + + white + black + transparent + + 10 diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 2d2609440..37a97591e 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -366,14 +366,12 @@ Notes will always be displayed - - Transparency - - Desktop wallpaper will not be shown - - Desktop wallpaper will be shown + + Color Theme + + Currently: %s - Setting requires Android 2.0+ + Setting requires Android 2.0+ New Task Defaults @@ -430,6 +428,13 @@ When overdue At deadline or overdue + + + + White + Black + Transparent + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 25417c2ce..8e47d742b 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -4,20 +4,47 @@ - - - - - + + + + + + + @@ -75,20 +102,20 @@ diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml index 7b84266c3..5ba1a72ca 100644 --- a/astrid/res/xml/preferences.xml +++ b/astrid/res/xml/preferences.xml @@ -18,10 +18,11 @@ android:title="@string/EPr_showNotes_title" android:defaultValue="false" /> - + [] { boolean.class }, false); if(getIntent().hasExtra(TOKEN_TAB)) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 5a5e0c9a0..bf964b716 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -206,13 +206,13 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, protected void onCreate(Bundle savedInstanceState) { DependencyInjectionService.getInstance().inject(this); requestWindowFeature(Window.FEATURE_NO_TITLE); + ThemeService.applyTheme(this); super.onCreate(savedInstanceState); new StartupService().onStartupApplication(this); ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_activity, null); parent.addView(getListBody(parent), 1); setContentView(parent); - ThemeService.applyTheme(this); if(database == null) return; @@ -605,8 +605,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener, return; } - if(requestCode == ACTIVITY_SETTINGS) { - ThemeService.applyTheme(this); + if(requestCode == ACTIVITY_SETTINGS && resultCode == EditPreferences.RESULT_CODE_THEME_CHANGED) { + finish(); + startActivity(getIntent()); } super.onActivityResult(requestCode, resultCode, data); diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index e757578f5..75ecf1786 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -2,8 +2,6 @@ package com.todoroo.astrid.service; import android.app.Activity; import android.graphics.PixelFormat; -import android.view.View; -import android.view.ViewGroup; import android.view.WindowManager; import com.timsu.astrid.R; @@ -11,16 +9,15 @@ import com.todoroo.andlib.utility.Preferences; public class ThemeService { - private static void applyTheme(View parent) { - if(Preferences.getBoolean(R.string.p_transparent, false)) - parent.setBackgroundResource(R.drawable.background_transparent); - else - parent.setBackgroundResource(R.drawable.background_gradient); - } - + @SuppressWarnings("nls") public static void applyTheme(Activity activity) { - View root = ((ViewGroup)activity.findViewById(android.R.id.content)).getChildAt(0); - applyTheme(root); + String preference = Preferences.getStringValue(R.string.p_theme); + if(preference != null && preference.equals("black")) + activity.setTheme(R.style.Theme); + else if(preference != null && preference.equals("transparent")) + activity.setTheme(R.style.Theme_Transparent); + else + activity.setTheme(R.style.Theme_White); activity.getWindow().setFormat(PixelFormat.RGBA_8888); activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER); diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 90c9acf62..369e11598 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -36,7 +36,7 @@ import com.todoroo.astrid.utility.AstridPreferences; public final class UpgradeService { - public static final int V3_8_0_3 = 189; + public static final int V3_8_2 = 191; public static final int V3_8_0_2 = 188; public static final int V3_8_0 = 186; public static final int V3_7_7 = 184; @@ -136,13 +136,11 @@ public final class UpgradeService { StringBuilder changeLog = new StringBuilder(); // current message - if(from >= V3_8_0 && from < V3_8_0_3) { - newVersionString(changeLog, "3.8.0.3 (7/19/11)", new String[] { - "Improved Google Tasks Sync migration process", - "Handle service errors in Google Tasks sync gracefully", - "Fixed Astrid.com sync would sometimes send unchanged tasks", - "Fix for crashes. Keep on reporting them!", - }); + 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"); } if(from >= V3_8_0 && from < V3_8_0_2) { newVersionString(changeLog, "3.8.0.2 (7/16/11)", new String[] {