From baaa94362c025ea4fec535ab941bb33704f71692 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 26 Apr 2011 13:46:34 -0700
Subject: [PATCH] Added a setting for turning on/off transparency

---
 .../res/drawable/background_transparent.xml   |  6 +++++
 astrid/res/values/keys.xml                    |  1 +
 astrid/res/values/strings-core.xml            |  9 ++++++-
 astrid/res/xml/preferences.xml                |  5 ++++
 .../astrid/activity/EditPreferences.java      |  5 ++++
 .../astrid/activity/FilterListActivity.java   | 10 ++++----
 .../astrid/activity/TaskListActivity.java     |  6 +++++
 .../todoroo/astrid/service/ThemeService.java  | 24 +++++++++++++++++++
 8 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 astrid/res/drawable/background_transparent.xml
 create mode 100644 astrid/src/com/todoroo/astrid/service/ThemeService.java

diff --git a/astrid/res/drawable/background_transparent.xml b/astrid/res/drawable/background_transparent.xml
new file mode 100644
index 000000000..49e5dc855
--- /dev/null
+++ b/astrid/res/drawable/background_transparent.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid
+      android:color="#60000000" />
+</shape>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index ca51de520..757668e8d 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -130,6 +130,7 @@
   <string name="p_colorize">colorize</string>
   <string name="p_fontSize">font_size</string>
   <string name="p_showNotes">notesVisible</string>
+  <string name="p_transparent">transparent</string>
   <string name="p_voiceInputEnabled">voiceInputEnabled</string>
   <string name="p_voiceInputCreatesTask">voiceInputCreatesTask</string>
   <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index f3c4ae66d..87b57fe73 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -337,10 +337,17 @@
   <!-- Preference: Task List Show Notes -->
   <string name="EPr_showNotes_title">Show Notes In Task</string>
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be displayed when you tap a task</string>  
+  <string name="EPr_showNotes_desc_disabled">Notes will be displayed when you tap the notes icon</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Notes will always be displayed</string>
   
+  <!-- Preference: Transparent -->
+  <string name="EPr_transparent_title">Transparency</string>
+  <!-- Preference: Transparent Description (disabled) -->
+  <string name="EPr_transparent_desc_disabled">Desktop wallpaper will not be shown</string>  
+  <!-- Preference: Transparent Description (enabled) -->
+  <string name="EPr_transparent_desc_enabled">Desktop wallpaper will be shown</string>
+  
   <!-- Preference Category: Defaults Title -->
   <string name="EPr_defaults_header">New Task Defaults</string>
   
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 3ecdc13c8..e2a198300 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -17,6 +17,11 @@
             android:key="@string/p_showNotes"
             android:title="@string/EPr_showNotes_title"
             android:defaultValue="false" />
+            
+        <CheckBoxPreference
+            android:key="@string/p_transparent"
+            android:title="@string/EPr_transparent_title"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 09ca18c63..bd46a9cb9 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -226,6 +226,11 @@ public class EditPreferences extends TodorooPreferences {
                 taskService.clearDetails(Criterion.all);
                 Flags.set(Flags.REFRESH);
             }
+        } else if (r.getString(R.string.p_transparent).equals(preference.getKey())) {
+            if (value != null && !(Boolean)value)
+                preference.setSummary(R.string.EPr_transparent_desc_disabled);
+            else
+                preference.setSummary(R.string.EPr_transparent_desc_enabled);
         }
 
 
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index ad3b766d2..922dfe686 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -5,8 +5,8 @@ package com.todoroo.astrid.activity;
 
 import android.app.AlertDialog;
 import android.app.ExpandableListActivity;
-import android.app.SearchManager;
 import android.app.PendingIntent.CanceledException;
+import android.app.SearchManager;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -18,20 +18,20 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
+import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
 import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
@@ -50,6 +50,7 @@ import com.todoroo.astrid.core.SearchFilter;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.StatisticsService;
+import com.todoroo.astrid.service.ThemeService;
 
 /**
  * Activity that displays a user's task lists and allows users
@@ -92,6 +93,7 @@ public class FilterListActivity extends ExpandableListActivity {
         new StartupService().onStartupApplication(this);
 
         setContentView(R.layout.filter_list_activity);
+        ThemeService.applyTheme(this);
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         setTitle(R.string.FLA_title);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 4fb73018e..1e4d225b7 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -93,6 +93,7 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
+import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
@@ -207,6 +208,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
         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;
@@ -579,6 +581,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             return;
         }
 
+        if(requestCode == ACTIVITY_SETTINGS) {
+            ThemeService.applyTheme(this);
+        }
+
         super.onActivityResult(requestCode, resultCode, data);
 
         if(resultCode != RESULT_CANCELED) {
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
new file mode 100644
index 000000000..a0aceb269
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -0,0 +1,24 @@
+package com.todoroo.astrid.service;
+
+import android.app.Activity;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.timsu.astrid.R;
+import com.todoroo.andlib.utility.Preferences;
+
+public class ThemeService {
+
+    public 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);
+    }
+
+    public static void applyTheme(Activity activity) {
+        View view = ((ViewGroup)activity.findViewById(android.R.id.content)).getChildAt(0);
+        applyTheme(view);
+    }
+
+}