Commit: 7e4c2c8e759f7e44224d4bc3d5dece5bfc9443e9 - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Revision: 7e4c2c8e759f7e44224d4bc3d5dece5bfc9443e9 (tree)
• Time: 2012-09-04 14:47:54
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Dialog 用のテーマを作成

* Theme.Notepad.Dark.Dialog
* Theme.Notepad.Light.Dialog

Change Summary

• modified: ToDo.txt
• add: notepad-app/res/drawable-hdpi/dialog_bg_holo_dark.9.png
• add: notepad-app/res/drawable-hdpi/dialog_bg_holo_light.9.png
• add: notepad-app/res/drawable-ldpi/dialog_bg_holo_dark.9.png
• add: notepad-app/res/drawable-ldpi/dialog_bg_holo_light.9.png
• add: notepad-app/res/drawable-xhdpi/dialog_bg_holo_dark.9.png
• add: notepad-app/res/drawable-xhdpi/dialog_bg_holo_light.9.png
• add: notepad-app/res/drawable/dialog_bg_holo_dark.9.png
• add: notepad-app/res/drawable/dialog_bg_holo_light.9.png
• add: notepad-app/res/drawable/dialog_title_bg.9.png
• modified: notepad-app/res/layout/note_template_picker_dialog.xml
• modified: notepad-app/res/values/styles_theme.xml
• modified: notepad-app/src/org/routine_work/notepad/prefs/NotepadPreferenceUtils.java
• modified: notepad-app/src/org/routine_work/notepad/template/NoteTemplatePickerDialog.java

Incremental Difference

--- a/ToDo.txt
+++ b/ToDo.txt
@@ -20,10 +20,6 @@ Title, Content, Focus
 #############################
 !! notepad-app
 
-* Dialog 用のテーマを作成
-** Theme.Notepad.Dark.Dialog
-** Theme.Notepad.Light.Dialog
-
 * テンプレートの書式を変更
 ** '#{date}' '#{time}' など？
 
@@ -43,10 +39,6 @@ Title, Content, Focus
 #############################
 !! notepad-app-level-11
 
-* Dialog 用のテーマを作成
-** Theme.Notepad.Dark.Dialog
-** Theme.Notepad.Light.Dialog
-
 * 各種 ListView の layout_margin を修正
 ** layout_margin を減らしてリスト項目の layout_margin で調整する
 ** ListView 用のスタイルを用意
@@ -106,6 +98,10 @@ Title, Content, Focus
 
 !! notepad-app
 
+#* Dialog 用のテーマを作成
+#** Theme.Notepad.Dark.Dialog
+#** Theme.Notepad.Light.Dialog
+
 #* AddNewNoteActivity をリファクタリング
 #** NoteUtils のメソッドを呼ぶように修正
 #** 不要になったメソッドの削除
@@ -116,6 +112,7 @@ Title, Content, Focus
 #   -> NoteTemplatePickerDialog を実装
 
 
+#############################
 !! notepad-app-level-11
 
 #* 新規ノート作成時にテンプレートを選ぶ処理を変更
@@ -135,6 +132,7 @@ Title, Content, Focus
 #* NoteListItemViewBinder を NoteCursorAdapter に変更
 
 
+#############################
 !! notepad-common
 
 #* 定数定義用インターフェースを notepad-comon に移動

Binary files /dev/null and b/notepad-app/res/drawable-hdpi/dialog_bg_holo_dark.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable-hdpi/dialog_bg_holo_light.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable-ldpi/dialog_bg_holo_dark.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable-ldpi/dialog_bg_holo_light.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable-xhdpi/dialog_bg_holo_dark.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable-xhdpi/dialog_bg_holo_light.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable/dialog_bg_holo_dark.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable/dialog_bg_holo_light.9.png differ

Binary files /dev/null and b/notepad-app/res/drawable/dialog_title_bg.9.png differ

--- a/notepad-app/res/layout/note_template_picker_dialog.xml
+++ b/notepad-app/res/layout/note_template_picker_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/body"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 >

--- a/notepad-app/res/values/styles_theme.xml
+++ b/notepad-app/res/values/styles_theme.xml
@@ -47,23 +47,36 @@
 		<item name="ic_unlock">@drawable/ic_unlock_light</item>
 	</style>
 
-	<!-- Dark Theme Dialog -->
-	<!-- 
-	<style name="Theme.Notepad.Dark.Dialog" parent="@style/Theme.Notepad.Dark" >
-		<item name="android:windowFrame">@drawable/dialog_window_frame</item>
+	<!-- Dialog Theme -->
+	<style name="DialogWindowTitle" >
+		<item name="android:maxLines">1</item>
+		<item name="android:scrollHorizontally">true</item>
+		<item name="android:background">@drawable/dialog_title_bg</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:textAppearance">?android:textAppearance</item>
+		<item name="android:textSize">20sp</item>
+		<item name="android:textColor">#FF00C99B</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:paddingLeft">8dip</item>
+	</style>
+
+	<!-- Dark Dialog -->
+	<style name="Theme.Notepad.Dark.Dialog" >
+		<item name="android:windowFrame">@null</item>
+		<item name="android:windowBackground">@drawable/dialog_bg_holo_dark</item>
+		<item name="android:windowIsFloating">true</item>
 		<item name="android:windowContentOverlay">@null</item>
 		<item name="android:windowNoTitle">false</item>
-		<item name="android:windowIsFloating">true</item>
+		<item name="android:windowTitleStyle">@style/DialogWindowTitle</item>
 	</style>
-	-->
 
-	<!-- Light Theme Dialog -->
-	<!--
-	<style name="Theme.Notepad.Light.Dialog" parent="@style/Theme.Notepad.Light" >
-		<item name="android:windowFrame">@drawable/dialog_window_frame</item>
+	<!-- Light Dialog -->
+	<style name="Theme.Notepad.Light.Dialog" >
+		<item name="android:windowFrame">@null</item>
+		<item name="android:windowBackground">@drawable/dialog_bg_holo_light</item>
+		<item name="android:windowIsFloating">true</item>
 		<item name="android:windowContentOverlay">@null</item>
 		<item name="android:windowNoTitle">false</item>
-		<item name="android:windowIsFloating">true</item>
+		<item name="android:windowTitleStyle">@style/DialogWindowTitle</item>
 	</style>
-	-->
 </resources>

--- a/notepad-app/src/org/routine_work/notepad/prefs/NotepadPreferenceUtils.java
+++ b/notepad-app/src/org/routine_work/notepad/prefs/NotepadPreferenceUtils.java
@@ -64,6 +64,30 @@ public class NotepadPreferenceUtils
 		return themeId;
 	}
 
+	public static int getDialogTheme(Context context)
+	{
+		int themeId = R.style.Theme_Notepad_Dark_Dialog;
+
+		String preferenceName = context.getPackageName() + "_preferences";
+		SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
+		String key = context.getString(R.string.notepad_theme_key);
+		String defaultValue = context.getString(R.string.notepad_theme_default_value);
+		String themeValue = sharedPreferences.getString(key, defaultValue);
+
+		final String themeDark = context.getString(R.string.notepad_theme_dark_value);
+		final String themeLight = context.getString(R.string.notepad_theme_light_value);
+		if (themeDark.equals(themeValue))
+		{
+			themeId = R.style.Theme_Notepad_Dark_Dialog;
+		}
+		else if (themeLight.equals(themeValue))
+		{
+			themeId = R.style.Theme_Notepad_Light_Dialog;
+		}
+
+		return themeId;
+	}
+
 	public static boolean getActionBarAutoHide(Context context)
 	{
 		boolean actionBarAutoHide;

--- a/notepad-app/src/org/routine_work/notepad/template/NoteTemplatePickerDialog.java
+++ b/notepad-app/src/org/routine_work/notepad/template/NoteTemplatePickerDialog.java
@@ -34,6 +34,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import org.routine_work.notepad.R;
+import org.routine_work.notepad.prefs.NotepadPreferenceUtils;
 import org.routine_work.notepad.provider.NoteStore;
 import org.routine_work.notepad.utils.NoteTemplateConstants;
 import org.routine_work.notepad.utils.NoteUtils;
@@ -57,7 +58,8 @@ public class NoteTemplatePickerDialog extends Dialog
 
 	public NoteTemplatePickerDialog(Context context)
 	{
-		super(context);
+		super(context, NotepadPreferenceUtils.getDialogTheme(context));
+//		super(context);
 	}
 
 	public OnItemClickListener getOnItemClickListener()