T27590

diff --git a/workspace/EverMemo/gen/com/yuji/em/R.java b/workspace/EverMemo/gen/com/yuji/em/R.java
index 2e55519..c5de892 100644 (file)
--- a/workspace/EverMemo/gen/com/yuji/em/R.java
+++ b/workspace/EverMemo/gen/com/yuji/em/R.java
@@ -35,10 +35,10 @@ public final class R {
         public static final int noteListCloseButton=0x7f06000d;
         public static final int noteListView=0x7f06000c;
         public static final int selectListCancelButton=0x7f060016;
+        public static final int selectListConfirmDeleteMsg=0x7f060010;
         public static final int selectListDeleteButton=0x7f060013;
         public static final int selectListEditButton=0x7f060012;
         public static final int selectListLayout=0x7f06000f;
-        public static final int selectListMessage=0x7f060010;
         public static final int selectListNoButton=0x7f060015;
         public static final int selectListTitle=0x7f06000e;
         public static final int selectListView=0x7f060011;
@@ -75,30 +75,33 @@ public final class R {
         public static final int cancelButton=0x7f050006;
         public static final int closeButton=0x7f050007;
         public static final int deleteButton=0x7f050005;
-        public static final int headerEditTitle=0x7f050016;
-        public static final int headerExplainText1=0x7f050017;
-        public static final int headerExplainText2=0x7f050018;
-        public static final int headerExplainText3=0x7f050019;
-        public static final int headerExplainText4=0x7f05001a;
+        public static final int headerEditTitle=0x7f050019;
+        public static final int headerExplainText1=0x7f05001a;
+        public static final int headerExplainText2=0x7f05001b;
+        public static final int headerExplainText3=0x7f05001c;
+        public static final int headerExplainText4=0x7f05001d;
         public static final int mainMenuSetting=0x7f050008;
-        public static final int mainTitle=0x7f05001b;
+        public static final int mainTitle=0x7f05001e;
         public static final int noButton=0x7f050003;
-        public static final int noteListGetting=0x7f050015;
-        public static final int selectListConfirmMessage=0x7f05000b;
+        public static final int noteListGetting=0x7f050018;
+        public static final int selectListConfirmDeleteMsg=0x7f05000b;
+        public static final int selectListConfirmNoteMsg=0x7f05000c;
         public static final int selectListConfirmTitle=0x7f05000a;
         public static final int selectListTitle=0x7f050009;
-        public static final int selectTitle=0x7f05001c;
+        public static final int selectTitle=0x7f05001f;
         public static final int sendButton=0x7f050001;
-        public static final int settingConfirmTitle=0x7f05000e;
-        public static final int settingHeaderButton=0x7f050014;
-        public static final int settingHeaderTitle=0x7f050011;
-        public static final int settingNoteButton=0x7f050013;
-        public static final int settingNoteTitle=0x7f050010;
-        public static final int settingUserButton=0x7f050012;
-        public static final int settingUserTitle=0x7f05000f;
+        public static final int settingConfirmNoteMsg=0x7f050011;
+        public static final int settingConfirmTitle=0x7f05000f;
+        public static final int settingConfirmUserMsg=0x7f050010;
+        public static final int settingHeaderButton=0x7f050017;
+        public static final int settingHeaderTitle=0x7f050014;
+        public static final int settingNoteButton=0x7f050016;
+        public static final int settingNoteTitle=0x7f050013;
+        public static final int settingUserButton=0x7f050015;
+        public static final int settingUserTitle=0x7f050012;
         public static final int updateButton=0x7f050004;
-        public static final int userPasswordTitle=0x7f05000d;
-        public static final int userUserTitle=0x7f05000c;
+        public static final int userPasswordTitle=0x7f05000e;
+        public static final int userUserTitle=0x7f05000d;
         public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverMemo/res/layout/select_note_list.xml b/workspace/EverMemo/res/layout/select_note_list.xml
index 7924660..641d960 100644 (file)
--- a/workspace/EverMemo/res/layout/select_note_list.xml
+++ b/workspace/EverMemo/res/layout/select_note_list.xml
@@ -8,7 +8,7 @@
                <TextView android:id="@+id/selectListTitle" android:text="@+string/selectListTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                <LinearLayout android:id="@+id/selectListLayout" android:padding="6px" android:layout_margin="3px" android:background="#666666" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
                        <TextView android:text="@+string/selectListConfirmTitle" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
-                       <TextView android:id="@+id/selectListMessage" android:padding="10px" android:text="@+string/selectTitle" android:background="#ffff66" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+                       <TextView android:id="@+id/selectListConfirmDeleteMsg" android:padding="10px" android:text="@+string/selectTitle" android:background="#ffff66" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                </LinearLayout>
                <ListView android:id="@+id/selectListView" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView>
        </LinearLayout>

diff --git a/workspace/EverMemo/res/values-ja/strings.xml b/workspace/EverMemo/res/values-ja/strings.xml
index f21ba8f..174ecb0 100644 (file)
--- a/workspace/EverMemo/res/values-ja/strings.xml
+++ b/workspace/EverMemo/res/values-ja/strings.xml
@@ -16,6 +16,8 @@
     <string name="userPasswordTitle">パスワード</string>
 
     <string name="settingConfirmTitle">確認</string>
+    <string name="settingConfirmUserMsg">Evernoteにログインするための、ユーザ/パスワードを設定してください</string>
+    <string name="settingConfirmNoteMsg">送信先のノートを設定してください</string>
     <string name="settingUserTitle">ユーザ</string>
     <string name="settingNoteTitle">ノート</string>
     <string name="settingHeaderTitle">ヘッダー</string>
@@ -25,7 +27,8 @@
 
     <string name="selectListTitle">出力先のノート</string>
     <string name="selectListConfirmTitle">確認</string>
-    <string name="selectListConfirmMessage">削除しますか？</string>
+    <string name="selectListConfirmDeleteMsg">削除しますか？</string>
+    <string name="selectListConfirmNoteMsg">送信先のノートを設定するには、リストを選択し、「更新」ボタンを押してください</string>
 
     <string name="noteListGetting">取得中</string>
 

diff --git a/workspace/EverMemo/res/values/strings.xml b/workspace/EverMemo/res/values/strings.xml
index ab24879..1440278 100644 (file)
--- a/workspace/EverMemo/res/values/strings.xml
+++ b/workspace/EverMemo/res/values/strings.xml
@@ -14,12 +14,15 @@
     
     <string name="selectListTitle">Note of the destination</string>
     <string name="selectListConfirmTitle">Confirm</string>
-    <string name="selectListConfirmMessage">Delete?</string>
+    <string name="selectListConfirmDeleteMsg">Delete?</string>
+    <string name="selectListConfirmNoteMsg">To set the destination of note, please select the list and press the update button</string>
 
     <string name="userUserTitle">User</string>
     <string name="userPasswordTitle">Password</string>
 
     <string name="settingConfirmTitle">Confirm</string>
+    <string name="settingConfirmUserMsg">Please set the user and password to login to Evernote.</string>
+    <string name="settingConfirmNoteMsg">Please set the note of the destination.</string>
     <string name="settingUserTitle">User</string>
     <string name="settingNoteTitle">Note</string>
     <string name="settingHeaderTitle">Header</string>

diff --git a/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java b/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
index 9f8a585..b778f37 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
@@ -97,6 +97,11 @@ public class EverMemoActivity extends BaseActivity {
 
                updateList();
                setStatus();
+               
+               if (isEmpty){
+                       Intent intent = new Intent(this, (Class<?>) SettingActivity.class);
+                       startActivityForResult(intent, 0);
+               }
        }
 
        @Override
@@ -217,8 +222,7 @@ public class EverMemoActivity extends BaseActivity {
                        // http://www.taosoftware.co.jp/blog/2009/03/android_20.html
                        // String title = "<hr /><h3>%DATE%</h3><hr />";
                        String title = pref.get(Constant.PREF_HEADER,
-                                       "<hr /><h3>%DATE%</h3><hr />");
-                       // TODO header\89æ\96Ê\82Ì\8f\89\8aú\92l\82à\8dl\97¶\82·\82é\82±\82Æ
+                                       Constant.DEFAULT_HEADER_TEXT);
                        pref.update();
 
                        Calendar cal = Calendar.getInstance();

diff --git a/workspace/EverMemo/src/com/yuji/em/HeaderActivity.java b/workspace/EverMemo/src/com/yuji/em/HeaderActivity.java
index 5439710..69cc5d0 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/HeaderActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/HeaderActivity.java
@@ -34,7 +34,7 @@ public class HeaderActivity extends BaseActivity {
                                cancelButtonOnClick();
                        }});
                
-               String header = pref.get(Constant.PREF_HEADER, "<hr /><h3>{DATE} {TIME}</h3><hr />");
+               String header = pref.get(Constant.PREF_HEADER, Constant.DEFAULT_HEADER_TEXT);
                editText.setText(header);
        }
 

diff --git a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
index d33f0fe..a7bc357 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
@@ -44,7 +44,7 @@ public class SelectNoteListActivity extends BaseActivity {
 
                titleView = (TextView) this.findViewById(R.id.selectListTitle);
                messageLayout = (LinearLayout) this.findViewById(R.id.selectListLayout);
-               messageView = (TextView) this.findViewById(R.id.selectListMessage);
+               messageView = (TextView) this.findViewById(R.id.selectListConfirmDeleteMsg);
                editButton = (Button) this.findViewById(R.id.selectListEditButton);
                deleteButton = (Button) this.findViewById(R.id.selectListDeleteButton);
                cancelButton = (Button) this.findViewById(R.id.selectListCancelButton);
@@ -182,7 +182,7 @@ public class SelectNoteListActivity extends BaseActivity {
                        if (isEmpty) {
                                messageLayout.setVisibility((isEmpty) ? View.VISIBLE
                                                : View.GONE);
-                               messageView.setText("\91\97\90M\90æ\82Ì\83m\81[\83g\82ð\90Ý\92è\82·\82é\82É\82Í\81A\83\8a\83X\83g\82ð\91I\91ð\82µ\81A\81u\8dX\90V\81v\83{\83^\83\93\82ð\89\9f\82µ\82Ä\82­\82¾\82³\82¢\81B"); // TODO
+                               messageView.setText(R.string.selectListConfirmNoteMsg);
                                selectListView.setEnabled(true);
                                editButton.setVisibility(View.VISIBLE);
                                editButton.setEnabled(isSelected());
@@ -213,7 +213,7 @@ public class SelectNoteListActivity extends BaseActivity {
                        noButton.setVisibility(View.GONE);
                } else if (view == deleteButton) {
                        messageLayout.setVisibility(View.VISIBLE);
-                       messageView.setText(getString(R.string.selectListConfirmMessage));
+                       messageView.setText(getString(R.string.selectListConfirmDeleteMsg));
                        selectListView.setEnabled(false);
                        editButton.setVisibility(View.GONE);
                        deleteButton.setVisibility(View.GONE);

diff --git a/workspace/EverMemo/src/com/yuji/em/SettingActivity.java b/workspace/EverMemo/src/com/yuji/em/SettingActivity.java
index d54604c..1586f69 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/SettingActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/SettingActivity.java
@@ -87,7 +87,7 @@ public class SettingActivity extends BaseActivity {
                
                if (CommonUtil.isNull(passwd)){
                        messageLayout.setVisibility(View.VISIBLE);                      
-                       messageView.setText("Evernote\82É\83\8d\83O\83C\83\93\82·\82é\82½\82ß\82Ì\81A\83\86\81[\83U/\83p\83X\83\8f\81[\83h\82ð\90Ý\92è\82µ\82Ä\82­\82¾\82³\82¢\81B"); // TODO
+                       messageView.setText(getString(R.string.settingConfirmUserMsg));
                        noteButton.setEnabled(false);
                        headerButton.setEnabled(false);
                        return;
@@ -96,7 +96,7 @@ public class SettingActivity extends BaseActivity {
                NoteDao dao = NoteDao.getInstance();
                if (dao.isEmpty(this)){
                        messageLayout.setVisibility(View.VISIBLE);                      
-                       messageView.setText("\91\97\90M\90æ\82Ì\83m\81[\83g\82ð\90Ý\92è\82µ\82Ä\82­\82¾\82³\82¢\81B"); // TODO
+                       messageView.setText(getString(R.string.settingConfirmNoteMsg));
                        noteButton.setEnabled(true);
                        headerButton.setEnabled(false);
                        return;

diff --git a/workspace/EverMemo/src/com/yuji/em/common/Constant.java b/workspace/EverMemo/src/com/yuji/em/common/Constant.java
index a61eb49..1ddafc2 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/common/Constant.java
+++ b/workspace/EverMemo/src/com/yuji/em/common/Constant.java
@@ -2,15 +2,17 @@ package com.yuji.em.common;
 
 public class Constant {
 
-       public final static String PREF_USER = "USER";
-       public final static String PREF_PASSWORD = "PASSWORD";
-       public final static String PREF_HEADER = "HEADER";
-       public final static String PREF_NOTE_DAO = "NOTE_DAO";
-       public final static String PREF_NOTE_INDEX = "NOTE_INDEX";
+       public static final String PREF_USER = "USER";
+       public static final String PREF_PASSWORD = "PASSWORD";
+       public static final String PREF_HEADER = "HEADER";
+       public static final String PREF_NOTE_DAO = "NOTE_DAO";
+       public static final String PREF_NOTE_INDEX = "NOTE_INDEX";
        
-       public final static String PREF_SELECTED_INDEX = "SELECTED_INDEX";
+       public static final String PREF_SELECTED_INDEX = "SELECTED_INDEX";
 
-       public final static String EXTRA_INDEX = "EXTRA_INDEX";
+       public static final String EXTRA_INDEX = "EXTRA_INDEX";
        
-       public final static int TOGGLE_SIZE = 5;
+       public static final int TOGGLE_SIZE = 5;
+       
+       public static final String DEFAULT_HEADER_TEXT = "<hr /><h3>{DATE} {TIME}</h3><hr />";
 }