bold

diff --git a/workspace/EverMemo/res/layout/header.xml b/workspace/EverMemo/res/layout/header.xml
index 30b8627..0ca0ee7 100644 (file)
--- a/workspace/EverMemo/res/layout/header.xml
+++ b/workspace/EverMemo/res/layout/header.xml
@@ -6,7 +6,7 @@
     >
     <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
                <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
-                   <TextView android:text="@+string/headerEditTitle" android:background="#99cccc" android:id="@+id/headerheaderTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+                   <TextView android:text="@+string/headerEditTitle" android:textStyle="bold" android:background="#99cccc" android:id="@+id/headerheaderTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                        <EditText android:id="@+id/headerEditText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:inputType="textMultiLine"
                                android:gravity="top"
                        ></EditText>

diff --git a/workspace/EverMemo/res/layout/main.xml b/workspace/EverMemo/res/layout/main.xml
index c13aa9a..2854a8a 100644 (file)
--- a/workspace/EverMemo/res/layout/main.xml
+++ b/workspace/EverMemo/res/layout/main.xml
@@ -6,7 +6,7 @@
     android:background="#669999" 
     >
                <LinearLayout android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
-                       <TextView android:id="@+id/mainTitle" android:text="@+string/mainTitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:ellipsize="end"></TextView>
+                       <TextView android:id="@+id/mainTitle" android:text="@+string/mainTitle" android:textStyle="bold" android:layout_width="fill_parent" android:layout_height="wrap_content" android:ellipsize="end"></TextView>
                        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal">
                                <LinearLayout android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" android:orientation="horizontal">
                                        <ToggleButton android:textOn="１" android:textOff="１" android:id="@+id/mainToggleButton1" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="fill_parent"></ToggleButton> 

diff --git a/workspace/EverMemo/res/layout/select_note_list.xml b/workspace/EverMemo/res/layout/select_note_list.xml
index 641d960..9f12492 100644 (file)
--- a/workspace/EverMemo/res/layout/select_note_list.xml
+++ b/workspace/EverMemo/res/layout/select_note_list.xml
@@ -5,9 +5,9 @@
     android:layout_height="fill_parent"
     >
        <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1" android:orientation="vertical">
-               <TextView android:id="@+id/selectListTitle" android:text="@+string/selectListTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+               <TextView android:id="@+id/selectListTitle" android:text="@+string/selectListTitle" android:textStyle="bold" 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:text="@+string/selectListConfirmTitle" android:textStyle="bold" android:background="#ccffff" 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>

diff --git a/workspace/EverMemo/res/layout/setting.xml b/workspace/EverMemo/res/layout/setting.xml
index 037f40c..4e5726b 100644 (file)
--- a/workspace/EverMemo/res/layout/setting.xml
+++ b/workspace/EverMemo/res/layout/setting.xml
@@ -7,14 +7,14 @@
     <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
                <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" android:padding="0px">
                        <LinearLayout android:id="@+id/settingLayout" 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/settingConfirmTitle" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+                               <TextView android:text="@+string/settingConfirmTitle" android:textStyle="bold" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                                <TextView android:id="@+id/settingMessage" android:padding="10px" android:text="@+string/selectTitle" android:background="#ffff66" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                        </LinearLayout>
-                       <TextView android:text="@+string/settingUserTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+                       <TextView android:text="@+string/settingUserTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
                        <Button android:text="@+string/settingUserButton" android:id="@+id/settingUserButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
-                       <TextView android:text="@+string/settingNoteTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+                       <TextView android:text="@+string/settingNoteTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
                        <Button android:text="@+string/settingNoteButton" android:id="@+id/settingNoteButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
-                       <TextView android:text="@+string/settingHeaderTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+                       <TextView android:text="@+string/settingHeaderTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
                        <Button android:text="@+string/settingHeaderButton" android:id="@+id/settingHeaderButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
                </LinearLayout>
        </ScrollView>

diff --git a/workspace/EverMemo/res/layout/user_password.xml b/workspace/EverMemo/res/layout/user_password.xml
index e0a57e1..2c6f35e 100644 (file)
--- a/workspace/EverMemo/res/layout/user_password.xml
+++ b/workspace/EverMemo/res/layout/user_password.xml
@@ -6,9 +6,9 @@
     >
     <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
        <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
-           <TextView android:text="@+string/userUserTitle" android:background="#99cccc" android:id="@+id/userUserTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+           <TextView android:text="@+string/userUserTitle" android:textStyle="bold" android:background="#99cccc" android:id="@+id/userUserTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
            <EditText android:layout_height="wrap_content" android:id="@+id/userUserEditText" android:layout_width="fill_parent" android:inputType="text"></EditText>
-           <TextView android:text="@+string/userPasswordTitle" android:background="#99cccc" android:id="@+id/userPasswordTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+           <TextView android:text="@+string/userPasswordTitle" android:textStyle="bold" android:background="#99cccc" android:id="@+id/userPasswordTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
            <EditText android:layout_height="wrap_content" android:id="@+id/userPasswordEditText" android:hint="********" android:layout_width="fill_parent" android:inputType="textPassword"></EditText>
        </LinearLayout>
        </ScrollView>

diff --git a/workspace/EverMemo/res/values-ja/strings.xml b/workspace/EverMemo/res/values-ja/strings.xml
index c425fc5..d473794 100644 (file)
--- a/workspace/EverMemo/res/values-ja/strings.xml
+++ b/workspace/EverMemo/res/values-ja/strings.xml
@@ -25,7 +25,7 @@
     <string name="settingNoteButton">送信先のノートを設定する</string>
     <string name="settingHeaderButton">ヘッダーを設定する</string>
 
-    <string name="selectListTitle">å\87ºå\8a\9bå\85\88ã\81®ã\83\8eã\83¼ã\83\88</string>
+    <string name="selectListTitle">出力先ノート</string>
     <string name="selectListConfirmTitle">確認</string>
     <string name="selectListConfirmDeleteMsg">削除しますか？</string>
     <string name="selectListConfirmNoteMsg">送信先のノートを設定するには、リストを選択し、「更新」ボタンを押してください</string>

diff --git a/workspace/EverMemo/src/com/yuji/em/task/NoteListTask.java b/workspace/EverMemo/src/com/yuji/em/task/NoteListTask.java
index 679235c..4d08489 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/task/NoteListTask.java
+++ b/workspace/EverMemo/src/com/yuji/em/task/NoteListTask.java
@@ -12,18 +12,19 @@ public class NoteListTask implements AsyncTaskIF {
        private NoteList noteList;
        private WeakReference<NoteListActivity> activityRef;
        private EvernoteUtil.Error errorCode = null;
-       
+
        public NoteListTask(NoteListActivity activity) {
                activityRef = new WeakReference<NoteListActivity>(activity);
        }
 
        @Override
        public void doExecute() {
-               try {
-                       noteList = util.getNoteList();
-               }
-               finally {
-                       errorCode = util.getErrorCode();
+               synchronized (util) {
+                       try {
+                               noteList = util.getNoteList();
+                       } finally {
+                               errorCode = util.getErrorCode();
+                       }
                }
        }
 
@@ -49,8 +50,8 @@ public class NoteListTask implements AsyncTaskIF {
        public NoteList getNoteList() {
                return noteList;
        }
-       
-       public EvernoteUtil.Error getErrorCode(){
+
+       public EvernoteUtil.Error getErrorCode() {
                return errorCode;
        }
 }

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java b/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java
index 2bb6497..e2a9544 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java
@@ -99,7 +99,12 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
                                command = null;\r
                        }\r
                        if (dialog != null) {\r
-                               dialog.dismiss();\r
+                               try {\r
+                                       dialog.dismiss();\r
+                               }\r
+                               catch (IllegalArgumentException e){\r
+                                       ;\r
+                               }\r
                                dialog = null;\r
                        }\r
                        activityRef = null;\r