T27615

T27614

diff --git a/workspace/EverMemo/gen/com/yuji/em/R.java b/workspace/EverMemo/gen/com/yuji/em/R.java
index cb94ff2..621c8ae 100644 (file)
--- a/workspace/EverMemo/gen/com/yuji/em/R.java
+++ b/workspace/EverMemo/gen/com/yuji/em/R.java
@@ -64,22 +64,21 @@ public final class R {
         public static final int user_password=0x7f030008;
     }
     public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int cancelButton=0x7f040007;
-        public static final int closeButton=0x7f040008;
-        public static final int date_title=0x7f040010;
-        public static final int deleteButton=0x7f040006;
-        public static final int headerExplainText1=0x7f04000a;
-        public static final int headerExplainText2=0x7f04000b;
-        public static final int headerExplainText3=0x7f04000c;
-        public static final int headerExplainText4=0x7f04000d;
-        public static final int hello=0x7f040000;
-        public static final int mainAddButton=0x7f040002;
-        public static final int mainMenuSetting=0x7f040009;
-        public static final int mainTitle=0x7f04000e;
-        public static final int noButton=0x7f040004;
-        public static final int selectTitle=0x7f04000f;
-        public static final int updateButton=0x7f040005;
-        public static final int yesButton=0x7f040003;
+        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;
     }
 }

diff --git a/workspace/EverMemo/res/layout/main.xml b/workspace/EverMemo/res/layout/main.xml
index 92f483e..47726a6 100644 (file)
--- a/workspace/EverMemo/res/layout/main.xml
+++ b/workspace/EverMemo/res/layout/main.xml
@@ -16,7 +16,7 @@
                                        <ToggleButton android:textOn="５" android:textOff="５" android:id="@+id/mainToggleButton5" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="fill_parent"></ToggleButton> 
                                </LinearLayout>
                                <LinearLayout android:gravity="right" android:layout_width="fill_parent" android:layout_weight="2" android:layout_height="fill_parent" android:orientation="horizontal">
-                                       <Button android:text="@+string/mainAddButton" android:id="@+id/mainSendButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
+                                       <Button android:text="@+string/sendButton" android:id="@+id/mainSendButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
                                </LinearLayout>
                        </LinearLayout>
                </LinearLayout>

diff --git a/workspace/EverMemo/res/values/strings.xml b/workspace/EverMemo/res/values/strings.xml
index 69733b6..c39606d 100644 (file)
--- a/workspace/EverMemo/res/values/strings.xml
+++ b/workspace/EverMemo/res/values/strings.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, EverMemoActivity!</string>
     <string name="app_name">EverMemo</string>
 
-    <string name="mainAddButton">送信</string>
-
+    <string name="sendButton">送信</string>
     <string name="yesButton">はい</string>
     <string name="noButton">いいえ</string>
     <string name="updateButton">更新</string>

diff --git a/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java b/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
index 140ee5d..40e2e87 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/EverMemoActivity.java
@@ -6,6 +6,8 @@ import java.util.List;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -64,6 +66,24 @@ public class EverMemoActivity extends Activity {
                        }
                });
 
+               editText.addTextChangedListener(new TextWatcher(){
+                       @Override
+                       public void afterTextChanged(Editable s) {
+                               updateText();                           
+                       }
+
+                       @Override
+                       public void beforeTextChanged(CharSequence s, int start, int count,
+                                       int after) {
+                               
+                       }
+
+                       @Override
+                       public void onTextChanged(CharSequence s, int start, int before,
+                                       int count) {
+                               
+                       }});
+
                for (int i = 0; i < Constant.TOGGLE_SIZE; i++) {
                        toggleButton[i]
                                        .setOnCheckedChangeListener(new OnCheckedChangeListener() {
@@ -86,6 +106,8 @@ public class EverMemoActivity extends Activity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data){  
                updateList();
                setStatus();
+               editText.setText("");
+               updateText();
     }     
        
 //     @Override
@@ -179,6 +201,11 @@ public class EverMemoActivity extends Activity {
                isEmpty = dao.isEmpty(noteList);
        }
        
+       private void updateText(){
+               String text = editText.getText().toString();
+               sendButton.setEnabled(!CommonUtil.isNull(text) && !isEmpty);
+       }
+       
        private void sendButtonOnClick() {
                // NoteList noteList = util.getNoteList();
                // List<Note> list = noteList.getNotes();
@@ -271,7 +298,7 @@ public class EverMemoActivity extends Activity {
                        }
                }
                
-               sendButton.setEnabled(!isEmpty);
+               updateText();
                editText.setEnabled(!isEmpty);
        }
 }
\ No newline at end of file

diff --git a/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
index 4dfdc60..eb57f85 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
@@ -77,6 +77,14 @@ public class NoteListActivity extends Activity {
                }
 
                NoteDao dao = NoteDao.getInstance();
+               int n = dao.search(this, note);
+               if (n >= 0){
+                       // TODO #27613
+                       
+                       Intent intent = new Intent();
+                       setResult(RESULT_CANCELED, intent); 
+                       finish();                       
+               }
                dao.update(this, note, index);
                
                Intent intent = new Intent();
@@ -84,42 +92,12 @@ public class NoteListActivity extends Activity {
                finish();
        }
 
-//     private void createList() {
-//             NoteList noteList = util.getNoteList();
-//             List<NoteListItem> list = new ArrayList<NoteListItem>();
-//
-//             List<Note> notes = noteList.getNotes();
-//             String oldTitle = "";
-//             NoteListItem item;
-//             for (Note note : notes) {
-//                     // long l = note.getUpdated();
-//                     long l = note.getCreated();
-//                     String title = DateUtils
-//                                     .formatDateTime(this, l, DateUtils.FORMAT_SHOW_YEAR
-//                                                     | DateUtils.FORMAT_SHOW_DATE/*
-//                                                                                                              * | DateUtils.
-//                                                                                                              * FORMAT_SHOW_TIME
-//                                                                                                              */);
-//                     if (!title.equals(oldTitle)) {
-//                             item = new NoteListItem(title, null);
-//                             list.add(item);
-//                             oldTitle = title;
-//                     }
-//
-//                     item = new NoteListItem(null, note);
-//                     list.add(item);
-//             }
-//
-//             NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this,
-//                             R.layout.simple_list_item_1, list);
-//             listView.setAdapter(adapter);
-//     }
-
        public void done(NoteList noteList) {
                if (noteList == null){
+                       // \83L\83\83\83\93\83Z\83\8b\83{\83^\83\93\89\9f\89º\8e\9e
+                       closeButtonOnClick();
                        return;
                }
-               
                List<NoteListItem> list = new ArrayList<NoteListItem>();
 
                // TODO

diff --git a/workspace/EverMemo/src/com/yuji/em/data/Note.java b/workspace/EverMemo/src/com/yuji/em/data/Note.java
index 5cd476b..fc9a139 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/data/Note.java
+++ b/workspace/EverMemo/src/com/yuji/em/data/Note.java
@@ -24,4 +24,17 @@ public class Note {
        public String toString(){
                return (title != null)? title : "";
        }
+       
+    public boolean equals(Object obj) {
+        // \83I\83u\83W\83F\83N\83g\82ªnull\82Å\82È\82¢\82±\82Æ
+        if (obj == null) {
+            return false;
+        }
+        // \83I\83u\83W\83F\83N\83g\82ª\93¯\82¶\8c^\82Å\82 \82é\82±\82Æ
+        if (!(obj instanceof Note)) {
+            return false;
+        }
+        // \93¯\92l\90«\82ð\94ä\8ar
+        return guid.equals(((Note)obj).getGuid());
+    }  
 }

diff --git a/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java b/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java
index a1d094b..645598a 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java
+++ b/workspace/EverMemo/src/com/yuji/em/data/NoteDao.java
@@ -85,10 +85,14 @@ public class NoteDao {
                return list;
        }
 
+       public int search(Context context, Note note) {
+               List<Note> list = search(context);
+               return list.indexOf(note);
+       }
+       
        private void update(Context context, EditPrefUtil pref, Note note, int index) {
                List<Note> list = search(context, pref);
                list.set(index, note);
                store(pref, list);
        }
-
 }