From abb456e0c7e161ea30fe5a359c56d401445a3dbb Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 18 Jan 2011 17:56:04 -0800
Subject: [PATCH] Added a dialog custom title style for note dialog

---
 astrid/AndroidManifest.xml                        |  2 +-
 .../todoroo/astrid/notes/NoteViewingActivity.java | 15 +++++++++++++--
 astrid/res/layout/dialog_title_bar.xml            | 11 +++++++++++
 astrid/res/values/styles.xml                      |  8 ++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 astrid/res/layout/dialog_title_bar.xml

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 74c027845..0ef79cc5f 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -364,7 +364,7 @@
       </intent-filter>
     </receiver>
     <activity android:name="com.todoroo.astrid.notes.NoteViewingActivity"
-              android:theme="@android:style/Theme.Dialog" />
+              android:theme="@style/Theme.Dialog" />
         
     <!-- locale -->
     <activity android:name="com.todoroo.astrid.locale.LocaleEditAlerts"
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
index 44bc36c2f..8e2ef7b13 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
@@ -5,8 +5,10 @@ import android.os.Bundle;
 import android.text.util.Linkify;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.timsu.astrid.R;
@@ -19,16 +21,25 @@ public class NoteViewingActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
         setContentView(R.layout.empty_linear_layout);
+        getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.dialog_title_bar);
+
         LinearLayout body = (LinearLayout) findViewById(R.id.body);
 
         task = getIntent().getParcelableExtra(NotesActionExposer.EXTRA_TASK);
-        setTitle(task.getValue(Task.TITLE));
+        TextView title = (TextView) findViewById(R.id.title);
+        title.setText(task.getValue(Task.TITLE));
+
+        ScrollView scrollView = new ScrollView(this);
 
         TextView linkifiedTextView = new TextView(this);
         linkifiedTextView.setText(task.getValue(Task.NOTES) + "\n\n"); //$NON-NLS-1$
         Linkify.addLinks(linkifiedTextView, Linkify.ALL);
-        body.addView(linkifiedTextView);
+
+        scrollView.addView(linkifiedTextView);
+        body.addView(scrollView);
 
         Button ok = new Button(this);
         ok.setText(android.R.string.ok);
diff --git a/astrid/res/layout/dialog_title_bar.xml b/astrid/res/layout/dialog_title_bar.xml
new file mode 100644
index 000000000..cbc72ac8f
--- /dev/null
+++ b/astrid/res/layout/dialog_title_bar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/title"
+  android:text="This is my new title"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:textColor="#ffffff"
+  android:padding="6px"
+  android:ellipsize="marquee"
+  android:textSize="24px" />
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 6e0df491d..963ec06d2 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -20,6 +20,14 @@
         <item name="android:windowBackground">@null</item>
     </style>
     
+    <style name="DialogTitleBackground">
+        <item name="android:background">#323331</item>
+    </style>
+ 
+    <style name="Theme.Dialog" parent="android:Theme.Dialog">
+        <item name="android:windowTitleBackgroundStyle">@style/DialogTitleBackground</item>
+    </style>
+    
     <!--=============================================== TaskListActivity == -->
     
     <style name="TextAppearance.TLA_NoItems">