Z27594

diff --git a/workspace/EverMemo/gen/com/yuji/em/R.java b/workspace/EverMemo/gen/com/yuji/em/R.java
index 621c8ae..d4b8f2d 100644 (file)
--- a/workspace/EverMemo/gen/com/yuji/em/R.java
+++ b/workspace/EverMemo/gen/com/yuji/em/R.java
@@ -10,47 +10,53 @@ package com.yuji.em;
 public final class R {
     public static final class attr {
     }
+    public static final class color {
+        public static final int green=0x7f040001;
+        public static final int note_list_item=0x7f040002;
+        public static final int white=0x7f040000;
+    }
     public static final class drawable {
         public static final int icon=0x7f020000;
     }
     public static final class id {
-        public static final int headerCancelButton=0x7f050003;
-        public static final int headerEditText=0x7f050001;
-        public static final int headerOkButton=0x7f050002;
-        public static final int headerheaderTextView=0x7f050000;
-        public static final int mainEditText=0x7f05000b;
-        public static final int mainSendButton=0x7f05000a;
-        public static final int mainTitle=0x7f050004;
-        public static final int mainToggleButton1=0x7f050005;
-        public static final int mainToggleButton2=0x7f050006;
-        public static final int mainToggleButton3=0x7f050007;
-        public static final int mainToggleButton4=0x7f050008;
-        public static final int mainToggleButton5=0x7f050009;
-        public static final int noteListCloseButton=0x7f05000d;
-        public static final int noteListView=0x7f05000c;
-        public static final int selectListCancelButton=0x7f050016;
-        public static final int selectListDeleteButton=0x7f050013;
-        public static final int selectListEditButton=0x7f050012;
-        public static final int selectListLayout=0x7f05000f;
-        public static final int selectListMessage=0x7f050010;
-        public static final int selectListNoButton=0x7f050015;
-        public static final int selectListTitle=0x7f05000e;
-        public static final int selectListView=0x7f050011;
-        public static final int selectListYesButton=0x7f050014;
-        public static final int settingCloseButton=0x7f05001c;
-        public static final int settingHeaderButton=0x7f05001b;
-        public static final int settingLayout=0x7f050017;
-        public static final int settingMessage=0x7f050018;
-        public static final int settingNoteButton=0x7f05001a;
-        public static final int settingUserButton=0x7f050019;
-        public static final int text1=0x7f05001d;
-        public static final int text2=0x7f05001e;
-        public static final int userCancelButton=0x7f050024;
-        public static final int userOkButton=0x7f050023;
-        public static final int userPasswordEditText=0x7f050022;
-        public static final int userPasswordTextView=0x7f050021;
-        public static final int userUserEditText=0x7f050020;
-        public static final int userUserTextView=0x7f05001f;
+        public static final int headerCancelButton=0x7f060003;
+        public static final int headerEditText=0x7f060001;
+        public static final int headerOkButton=0x7f060002;
+        public static final int headerheaderTextView=0x7f060000;
+        public static final int mainEditText=0x7f06000b;
+        public static final int mainSendButton=0x7f06000a;
+        public static final int mainTitle=0x7f060004;
+        public static final int mainToggleButton1=0x7f060005;
+        public static final int mainToggleButton2=0x7f060006;
+        public static final int mainToggleButton3=0x7f060007;
+        public static final int mainToggleButton4=0x7f060008;
+        public static final int mainToggleButton5=0x7f060009;
+        public static final int noteListCloseButton=0x7f06000d;
+        public static final int noteListView=0x7f06000c;
+        public static final int selectListCancelButton=0x7f060016;
+        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;
+        public static final int selectListYesButton=0x7f060014;
+        public static final int settingCloseButton=0x7f06001c;
+        public static final int settingHeaderButton=0x7f06001b;
+        public static final int settingLayout=0x7f060017;
+        public static final int settingMessage=0x7f060018;
+        public static final int settingNoteButton=0x7f06001a;
+        public static final int settingUserButton=0x7f060019;
+        public static final int text1=0x7f06001d;
+        public static final int text2=0x7f06001f;
+        public static final int text3=0x7f06001e;
+        public static final int userCancelButton=0x7f060025;
+        public static final int userOkButton=0x7f060024;
+        public static final int userPasswordEditText=0x7f060023;
+        public static final int userPasswordTextView=0x7f060022;
+        public static final int userUserEditText=0x7f060021;
+        public static final int userUserTextView=0x7f060020;
     }
     public static final class layout {
         public static final int header=0x7f030000;
@@ -64,21 +70,21 @@ public final class R {
         public static final int user_password=0x7f030008;
     }
     public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int cancelButton=0x7f040006;
-        public static final int closeButton=0x7f040007;
-        public static final int date_title=0x7f04000f;
-        public static final int deleteButton=0x7f040005;
-        public static final int headerExplainText1=0x7f040009;
-        public static final int headerExplainText2=0x7f04000a;
-        public static final int headerExplainText3=0x7f04000b;
-        public static final int headerExplainText4=0x7f04000c;
-        public static final int mainMenuSetting=0x7f040008;
-        public static final int mainTitle=0x7f04000d;
-        public static final int noButton=0x7f040003;
-        public static final int selectTitle=0x7f04000e;
-        public static final int sendButton=0x7f040001;
-        public static final int updateButton=0x7f040004;
-        public static final int yesButton=0x7f040002;
+        public static final int app_name=0x7f050000;
+        public static final int cancelButton=0x7f050006;
+        public static final int closeButton=0x7f050007;
+        public static final int date_title=0x7f05000f;
+        public static final int deleteButton=0x7f050005;
+        public static final int headerExplainText1=0x7f050009;
+        public static final int headerExplainText2=0x7f05000a;
+        public static final int headerExplainText3=0x7f05000b;
+        public static final int headerExplainText4=0x7f05000c;
+        public static final int mainMenuSetting=0x7f050008;
+        public static final int mainTitle=0x7f05000d;
+        public static final int noButton=0x7f050003;
+        public static final int selectTitle=0x7f05000e;
+        public static final int sendButton=0x7f050001;
+        public static final int updateButton=0x7f050004;
+        public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverMemo/res/color/note_list_item.xml b/workspace/EverMemo/res/color/note_list_item.xml
new file mode 100644 (file)
index 0000000..8caa0d4
--- /dev/null
+++ b/workspace/EverMemo/res/color/note_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector 
+  xmlns:android="http://schemas.android.com/apk/res/android">
+<item 
+  android:state_pressed="true" 
+  android:drawable="@color/green"
+/>
+<item 
+  android:state_selected="true"
+  android:drawable="@color/green"
+/>
+</selector>

diff --git a/workspace/EverMemo/res/layout/simple_list_item_2.xml b/workspace/EverMemo/res/layout/simple_list_item_2.xml
index f1370e6..89f42fa 100755 (executable)
--- a/workspace/EverMemo/res/layout/simple_list_item_2.xml
+++ b/workspace/EverMemo/res/layout/simple_list_item_2.xml
@@ -1,9 +1,11 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"\r
-       android:id="@+id/text1"\r
-       android:layout_width="fill_parent"\r
-       android:layout_height="wrap_content"\r
-       android:textAppearance="?android:attr/textAppearanceLarge"\r
-       android:gravity="center_vertical"\r
-       android:paddingLeft="6dip"\r
-       android:minHeight="?android:attr/listPreferredItemHeight"\r
-/>\r
+<?xml version="1.0" encoding="utf-8"?>\r
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
+       android:orientation="horizontal" android:layout_width="fill_parent"\r
+       android:layout_height="wrap_content" android:background="@color/note_list_item">\r
+\r
+       <TextView\r
+               android:id="@+id/text3" android:layout_width="fill_parent"\r
+               android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge"\r
+               android:gravity="center_vertical" android:paddingLeft="6dip"\r
+               android:minHeight="?android:attr/listPreferredItemHeight" />\r
+</LinearLayout>
\ No newline at end of file

diff --git a/workspace/EverMemo/res/values/colors.xml b/workspace/EverMemo/res/values/colors.xml
new file mode 100644 (file)
index 0000000..87667ad
--- /dev/null
+++ b/workspace/EverMemo/res/values/colors.xml
@@ -0,0 +1,4 @@
+<resources>
+<color name="white">#ffffff</color>
+<color name="green">#94cb08</color>
+</resources>

diff --git a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
index 40390b0..2c3f57c 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
@@ -110,7 +110,7 @@ public class SelectNoteListActivity extends BaseActivity {
                // ArrayAdapter<Note> adapter = new ArrayAdapter<Note>(this,
                // android.R.layout.simple_list_item_1, list);
                ArrayAdapter<Note> adapter = new ArrayAdapter<Note>(this,
-                               R.layout.simple_list_item_2, list);
+                               R.layout.simple_list_item_2, R.id.text3, list);
                selectListView.setAdapter(adapter);
 
                selectedIndex = -1;
@@ -119,13 +119,19 @@ public class SelectNoteListActivity extends BaseActivity {
 
        protected void selectListViewOnItemClick(AdapterView<?> parent, View view,
                        int position, long id) {
+               int a = selectListView.getSelectedItemPosition();
+               System.out.println(""+a);
+               
+               
+
                if (view == prevListView) {
                        return;
                }
-               if (prevListView != null) {
-                       prevListView.setBackgroundColor(Color.WHITE);
-               }
-               view.setBackgroundColor(0xffccffcc);
+               // #27594
+//             if (prevListView != null) {
+//                     prevListView.setBackgroundColor(Color.WHITE);
+//             }
+//             view.setBackgroundColor(0xffccffcc);
                prevListView = view;
 
                selectedIndex = position;

diff --git a/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java b/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java
index 645598a..9d05080 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java
+++ b/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java
@@ -26,6 +26,14 @@ public class NoteDao {
                return search(context, pref);
        }
 
+       public void update(Context context, Note note) {
+               int index = search(context, note);
+               if (index < 0){
+                       return;
+               }
+               update(context, note, index);
+       }
+       
        public void update(Context context, Note note, int index) {
                EditPrefUtil pref = new EditPrefUtil(context);
                update(context, pref, note, index);

diff --git a/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java b/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java
index c61cc0c..97e15f9 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java
+++ b/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java
@@ -5,6 +5,7 @@ import android.widget.Toast;
 
 import com.evernote.edam.error.EDAMNotFoundException;
 import com.evernote.edam.type.Note;
+import com.yuji.em.data.NoteDao;
 import com.yuji.em.utility.AsyncTaskIF;
 import com.yuji.em.utility.Debug;
 import com.yuji.em.utility.EvernoteUtil;
@@ -25,8 +26,8 @@ public class UpdateNoteTask implements AsyncTaskIF {
        private EvernoteUtil util = EvernoteUtil.getInstance();
        private int status = -1;
 
-       public UpdateNoteTask(Context context, String guid, String noteName, String title,
-                       String text) {
+       public UpdateNoteTask(Context context, String guid, String noteName,
+                       String title, String text) {
                this.context = context;
                this.guid = guid;
                this.noteName = noteName;
@@ -36,12 +37,18 @@ public class UpdateNoteTask implements AsyncTaskIF {
 
        @Override
        public void doExecute() {
+               Note note = null;
                try {
                        int i = 0;
                        synchronized (context) {
                                for (i = 0; i < RETRY_COUNT; i++) {
-                                       Note note = util.updateNoteContext(guid, title, text);
+                                       note = util.updateNoteContext(guid, title, text);
                                        if (note != null) {
+                                               NoteDao dao = NoteDao.getInstance();
+                                               com.yuji.em.data.Note n = new com.yuji.em.data.Note(
+                                                               note.getGuid(), note.getTitle());
+                                               dao.update(context, n);
+
                                                break;
                                        }
                                        Debug.d(this, "retry updateNoteContext()"); // TODO
@@ -55,9 +62,9 @@ public class UpdateNoteTask implements AsyncTaskIF {
                        if (i < RETRY_COUNT) {
                                status = ERROR_NONE;
                        } else {
-                               status = ERROR_SYSTEM;
                                Toast.makeText(context, "\8f\91\82«\8d\9e\82Ý\82É\8e¸\94s\82µ\82Ü\82µ\82½" + text, Toast.LENGTH_LONG); // TODO
                                Debug.d(this, "doExecute"); // TODO
+                               status = ERROR_SYSTEM;
                        }
                } catch (EDAMNotFoundException e) {
                        status = ERROR_NOT_FOUND;