Commit: 8418af9158ae4852a31e8aa609d2e5db45f3d9ff - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• Revision: 8418af9158ae4852a31e8aa609d2e5db45f3d9ff (tree)
• Time: 2012-09-05 16:28:50
• Author: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

テンプレートの書式を変更

* とりあえず以下の変数を実装した

• #{date} : 日付
  
• #{time} : 時間
  

* 変数名の大文字小文字は無視する

Change Summary

• modified: ToDo.txt
• modified: notepad-app-level-11/res/values/note_template_data.xml
• modified: notepad-app-level-11/src/org/routine_work/notepad/NotepadActivity.java
• modified: notepad-app-level-11/src/org/routine_work/notepad/fragment/EditNoteFragment.java
• modified: notepad-app/res/values/note_template_data.xml
• modified: notepad-app/src/org/routine_work/notepad/NoteDetailActivity.java
• modified: notepad-app/src/org/routine_work/notepad/NotepadActivity.java
• modified: notepad-common/src/org/routine_work/notepad/utils/NoteUtils.java

Incremental Difference

--- a/ToDo.txt
+++ b/ToDo.txt
@@ -58,9 +58,6 @@ Title, Content, Focus
 #############################
 !! notepad-common
 
-* テンプレートの書式を変更
-** '#{date}' '#{time}' など？
-
 * TimeFormatUtils 修正
 ** 西暦部分のないフォーマットにできないか？
 
@@ -135,6 +132,11 @@ Title, Content, Focus
 #############################
 !! notepad-common
 
+#* テンプレートの書式を変更
+#** 変数名を変更、変数名の大文字小文字は無視する
+#*** #{date} : 日付
+#*** #{time} : 時間
+
 #* 定数定義用インターフェースを notepad-comon に移動
 #** NotepadConstants
 #** NoteTemplateConstants

--- a/notepad-app-level-11/res/values/note_template_data.xml
+++ b/notepad-app-level-11/res/values/note_template_data.xml
@@ -6,12 +6,12 @@
 	<bool name="template_blank_note_title_locked">false</bool>
 
 	<string name="template_diary_note_name">Diary</string>
-	<string name="template_diary_note_title">%1$s</string>
+	<string name="template_diary_note_title">#{date}</string>
 	<string name="template_diary_note_content"></string>
 	<bool name="template_diary_note_title_locked">true</bool>
 
 	<string name="template_quick_note_name">Quick Note</string>
-	<string name="template_quick_note_title">%1$s %2$s</string>
+	<string name="template_quick_note_title">#{date} #{time}</string>
 	<string name="template_quick_note_content"></string>
 	<bool name="template_quick_note_title_locked">true</bool>
 

--- a/notepad-app-level-11/src/org/routine_work/notepad/NotepadActivity.java
+++ b/notepad-app-level-11/src/org/routine_work/notepad/NotepadActivity.java
@@ -403,14 +403,21 @@ public class NotepadActivity extends Activity implements NotepadConstants,
 	{
 		Log.v(LOG_TAG, "Hello");
 
-//		Intent intent = new Intent(Intent.ACTION_INSERT, NoteStore.Note.CONTENT_URI);
-//		startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
-
 //		Intent intent = new Intent(this, AddNewNoteActivity.class);
 //		startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
 
-		NoteTemplatePickerDialogFragment dialogFragment = new NoteTemplatePickerDialogFragment();
-		dialogFragment.show(getFragmentManager(), FT_NOTE_TEMPLATE_PICKER);
+		if (NoteStore.getNoteTemplateCount(getContentResolver()) == 0)
+		{
+			Intent intent = new Intent(Intent.ACTION_INSERT, NoteStore.Note.CONTENT_URI);
+			intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
+		}
+		else
+		{
+			NoteTemplatePickerDialogFragment dialogFragment = new NoteTemplatePickerDialogFragment();
+			dialogFragment.show(getFragmentManager(), FT_NOTE_TEMPLATE_PICKER);
+		}
+
 		Log.v(LOG_TAG, "Bye");
 	}
 

--- a/notepad-app-level-11/src/org/routine_work/notepad/fragment/EditNoteFragment.java
+++ b/notepad-app-level-11/src/org/routine_work/notepad/fragment/EditNoteFragment.java
@@ -34,6 +34,7 @@ import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.CursorLoader;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
 import android.net.Uri;
@@ -541,8 +542,17 @@ public class EditNoteFragment extends Fragment
 //		startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
 
 		saveNote();
-		NoteTemplatePickerDialogFragment dialogFragment = new NoteTemplatePickerDialogFragment();
-		dialogFragment.show(getFragmentManager(), FT_NOTE_TEMPLATE_PICKER);
+		if (NoteStore.getNoteTemplateCount(getActivity().getContentResolver()) == 0)
+		{
+			Intent intent = new Intent(Intent.ACTION_INSERT, NoteStore.Note.CONTENT_URI);
+			intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
+		}
+		else
+		{
+			NoteTemplatePickerDialogFragment dialogFragment = new NoteTemplatePickerDialogFragment();
+			dialogFragment.show(getFragmentManager(), FT_NOTE_TEMPLATE_PICKER);
+		}
 
 		Log.v(LOG_TAG, "Bye");
 	}

--- a/notepad-app/res/values/note_template_data.xml
+++ b/notepad-app/res/values/note_template_data.xml
@@ -6,12 +6,12 @@
 	<bool name="template_blank_note_title_locked">false</bool>
 
 	<string name="template_diary_note_name">Diary</string>
-	<string name="template_diary_note_title">%1$s</string>
+	<string name="template_diary_note_title">#{date}</string>
 	<string name="template_diary_note_content"></string>
 	<bool name="template_diary_note_title_locked">true</bool>
 
 	<string name="template_quick_note_name">Quick Note</string>
-	<string name="template_quick_note_title">%1$s %2$s</string>
+	<string name="template_quick_note_title">#{date} #{time}</string>
 	<string name="template_quick_note_content"></string>
 	<bool name="template_quick_note_title_locked">true</bool>
 

--- a/notepad-app/src/org/routine_work/notepad/NoteDetailActivity.java
+++ b/notepad-app/src/org/routine_work/notepad/NoteDetailActivity.java
@@ -940,8 +940,16 @@ public class NoteDetailActivity extends Activity
 //		Intent intent = new Intent(this, AddNewNoteActivity.class);
 //		startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
 
-		if (NoteStore.getNoteTemplateCount(getContentResolver()) > 0)
+		if (NoteStore.getNoteTemplateCount(getContentResolver()) == 0)
 		{
+			// Add Blank Note
+			Intent intent = new Intent(Intent.ACTION_INSERT, NoteStore.Note.CONTENT_URI);
+			intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
+		}
+		else
+		{
+			// Select Note Template
 			showDialog(DIALOG_ID_NOTE_TEMPLATE_PICKER);
 		}
 

--- a/notepad-app/src/org/routine_work/notepad/NotepadActivity.java
+++ b/notepad-app/src/org/routine_work/notepad/NotepadActivity.java
@@ -555,7 +555,18 @@ public class NotepadActivity extends ListActivity
 //		Intent intent = new Intent(this, AddNewNoteActivity.class);
 //		startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
 
-		showDialog(DIALOG_ID_NOTE_TEMPLATE_PICKER);
+		if (NoteStore.getNoteTemplateCount(getContentResolver()) == 0)
+		{
+			// Add Blank Note
+			Intent intent = new Intent(Intent.ACTION_INSERT, NoteStore.Note.CONTENT_URI);
+			intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			startActivityForResult(intent, REQUEST_CODE_ADD_NOTE);
+		}
+		else
+		{
+			// Select Note Template
+			showDialog(DIALOG_ID_NOTE_TEMPLATE_PICKER);
+		}
 
 		Log.v(LOG_TAG, "Bye");
 	}

--- a/notepad-common/src/org/routine_work/notepad/utils/NoteUtils.java
+++ b/notepad-common/src/org/routine_work/notepad/utils/NoteUtils.java
@@ -13,6 +13,8 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import org.routine_work.notepad.provider.NoteStore;
 import org.routine_work.utils.Log;
 
@@ -102,15 +104,18 @@ public class NoteUtils implements NotepadConstants
 				int titleIndex = cursor.getColumnIndex(NoteStore.NoteTemplate.Columns.TITLE);
 				int contentIndex = cursor.getColumnIndex(NoteStore.NoteTemplate.Columns.CONTENT);
 				int titleLockedIndex = cursor.getColumnIndex(NoteStore.NoteTemplate.Columns.TITLE_LOCKED);
-				boolean titleLocked = (cursor.getInt(titleLockedIndex) != 0);
 
-				Date now = new Date();
-				String dateText = DateFormat.getDateFormat(context).format(now);
-				String timeText = DateFormat.getTimeFormat(context).format(now);
 				String titleTemplate = cursor.getString(titleIndex);
 				String contentTemplate = cursor.getString(contentIndex);
-				String title = String.format(titleTemplate, dateText, timeText);
-				String content = String.format(contentTemplate, dateText, timeText);
+				boolean titleLocked = (cursor.getInt(titleLockedIndex) != 0);
+
+				Map<String, String> templateContextMap = new HashMap<String, String>();
+				Date now = new Date();
+				templateContextMap.put("date", DateFormat.getDateFormat(context).format(now));
+				templateContextMap.put("time", DateFormat.getTimeFormat(context).format(now));
+
+				String title = expandTemplate(titleTemplate, templateContextMap);
+				String content = expandTemplate(contentTemplate, templateContextMap);
 
 				Uri noteUri = searchNoteByTitle(context, title);
 				Log.d(LOG_TAG, "noteUri => " + noteUri);
@@ -182,4 +187,21 @@ public class NoteUtils implements NotepadConstants
 		Log.v(LOG_TAG, "Bye");
 		return result;
 	}
+
+	public static String expandTemplate(String template, Map<String, String> templateContextMap)
+	{
+		String text = template;
+
+		for (String key : templateContextMap.keySet())
+		{
+			String value = templateContextMap.get(key);
+			Log.d(LOG_TAG, "key => " + key);
+			Log.d(LOG_TAG, "value => " + value);
+			String regexp = "(?i)#\\{" + key + "\\}";
+			Log.d(LOG_TAG, "regexp => " + regexp);
+			text = text.replaceAll(regexp, value);
+		}
+
+		return text;
+	}
 }