setting

diff --git a/workspace/EverClip/gen/com/yuji/ec/R.java b/workspace/EverClip/gen/com/yuji/ec/R.java
index 0566663..0bfdf08 100644 (file)
--- a/workspace/EverClip/gen/com/yuji/ec/R.java
+++ b/workspace/EverClip/gen/com/yuji/ec/R.java
@@ -29,7 +29,7 @@ public final class R {
         public static final int noteTypeLayout=0x7f060005;\r
         public static final int noteTypeTitle=0x7f060004;\r
         public static final int noteTypeView=0x7f060007;\r
-        public static final int settingCloseButton=0x7f060014;\r
+        public static final int settingCloseButton=0x7f060015;\r
         public static final int settingLayout=0x7f060009;\r
         public static final int settingMessage=0x7f06000a;\r
         public static final int settingNoteButton=0x7f06000d;\r
@@ -41,14 +41,15 @@ public final class R {
         public static final int settingTimePicker=0x7f060013;\r
         public static final int settingUpdateButton=0x7f060011;\r
         public static final int settingUserButton=0x7f06000b;\r
-        public static final int text1=0x7f060015;\r
-        public static final int text2=0x7f060016;\r
-        public static final int userCancelButton=0x7f06001c;\r
-        public static final int userOkButton=0x7f06001b;\r
-        public static final int userPasswordEditText=0x7f06001a;\r
-        public static final int userPasswordTextView=0x7f060019;\r
-        public static final int userUserEditText=0x7f060018;\r
-        public static final int userUserTextView=0x7f060017;\r
+        public static final int settingXXXButton=0x7f060014;\r
+        public static final int text1=0x7f060016;\r
+        public static final int text2=0x7f060017;\r
+        public static final int userCancelButton=0x7f06001d;\r
+        public static final int userOkButton=0x7f06001c;\r
+        public static final int userPasswordEditText=0x7f06001b;\r
+        public static final int userPasswordTextView=0x7f06001a;\r
+        public static final int userUserEditText=0x7f060019;\r
+        public static final int userUserTextView=0x7f060018;\r
     }\r
     public static final class layout {\r
         public static final int main=0x7f030000;\r
@@ -80,6 +81,7 @@ public final class R {
         public static final int settingUpdateTitle=0x7f05001d;\r
         public static final int settingUserButton=0x7f050019;\r
         public static final int settingUserTitle=0x7f050018;\r
+        public static final int settingXXXTitle=0x7f050020;\r
         public static final int toastConnect=0x7f05000c;\r
         public static final int toastEvernoteSystem=0x7f050010;\r
         public static final int toastFailedToGetList=0x7f05000e;\r

diff --git a/workspace/EverClip/res/layout/setting.xml b/workspace/EverClip/res/layout/setting.xml
index a434ddb..029b455 100644 (file)
--- a/workspace/EverClip/res/layout/setting.xml
+++ b/workspace/EverClip/res/layout/setting.xml
@@ -31,6 +31,10 @@
                        <TextView android:text="@+string/settingTimeTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
                        <CheckBox android:text="自動更新を有効にする" android:id="@+id/settingTimeCheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox> 
                        <TimePicker android:id="@+id/settingTimePicker" android:layout_width="wrap_content" android:layout_height="wrap_content"></TimePicker>
+                       <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+                               <TextView android:text="@+string/settingXXXTitle" android:textAppearance="?android:attr/textAppearanceLarge" android:background="#cccccc" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="fill_parent"></TextView>
+                               <Button android:id="@+id/settingXXXButton" android:text="@+string/settingNoteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
+                       </LinearLayout> 
                </LinearLayout>
        </ScrollView>
        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">

diff --git a/workspace/EverClip/src/com/yuji/ec/db/INoteItem.java b/workspace/EverClip/src/com/yuji/ec/db/INoteItem.java
new file mode 100644 (file)
index 0000000..686be77
--- /dev/null
+++ b/workspace/EverClip/src/com/yuji/ec/db/INoteItem.java
@@ -0,0 +1,6 @@
+package com.yuji.ec.db;\r
+\r
+public interface INoteItem {\r
+       String getGuid();\r
+       String getText();\r
+}\r

diff --git a/workspace/EverClip/src/com/yuji/ec/db/Note.java b/workspace/EverClip/src/com/yuji/ec/db/Note.java
index b9ffbd8..d63cac1 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/db/Note.java
+++ b/workspace/EverClip/src/com/yuji/ec/db/Note.java
@@ -1,6 +1,6 @@
 package com.yuji.ec.db;\r
 \r
-public class Note {\r
+public class Note implements INoteItem {\r
        private long id = -1;\r
        private String guid;\r
        private String text;\r

diff --git a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
index 467f5f2..64ff27e 100644 (file)
--- a/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
+++ b/workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java
@@ -20,6 +20,8 @@ import com.evernote.edam.notestore.NoteList;
 import com.evernote.edam.notestore.NoteStore;
 import com.evernote.edam.type.Note;
 import com.evernote.edam.type.NoteSortOrder;
+import com.evernote.edam.type.Notebook;
+import com.evernote.edam.type.Tag;
 import com.evernote.edam.type.User;
 import com.evernote.edam.userstore.AuthenticationResult;
 import com.evernote.edam.userstore.UserStore;
@@ -110,7 +112,7 @@ public class EvernoteUtil {
                        if (token == null) {
                                return null;
                        }
-                       noteList = noteStore.findNotes(token, filter, 0, 100);
+                       noteList = noteStore.findNotes(token, filter, 0, 100); // TODO 100
                        errorCode = Error.NONE;
                } catch (EDAMUserException e) {
                        Debug.d(this, null, e);
@@ -128,6 +130,54 @@ public class EvernoteUtil {
                return noteList;
        }
 
+       public List<Notebook> getNoteBookList() {
+               errorCode = Error.OTHER;
+
+               List<Notebook> noteBookList = null;
+               try {
+                       String token = getAuthenticationToken();
+                       if (token == null) {
+                               return null;
+                       }
+                       noteBookList = noteStore.listNotebooks(token);
+               } catch (EDAMUserException e) {
+                       Debug.d(this, null, e);
+               } catch (EDAMSystemException e) {
+                       Debug.d(this, null, e);
+               } catch (TException e) {
+                       Debug.d(this, null, e);
+
+                       if (e.getCause() instanceof ConnectException) {
+                               errorCode = Error.CONNECT;
+                       }
+               }
+               return noteBookList;
+       }
+
+       public List<Tag> getTagList() {
+               errorCode = Error.OTHER;
+
+               List<Tag> tagList = null;
+               try {
+                       String token = getAuthenticationToken();
+                       if (token == null) {
+                               return null;
+                       }
+                       tagList = noteStore.listTags(token);
+               } catch (EDAMUserException e) {
+                       Debug.d(this, null, e);
+               } catch (EDAMSystemException e) {
+                       Debug.d(this, null, e);
+               } catch (TException e) {
+                       Debug.d(this, null, e);
+
+                       if (e.getCause() instanceof ConnectException) {
+                               errorCode = Error.CONNECT;
+                       }
+               }
+               return tagList;
+       }
+
        public Note updateNoteContext(String guid, String title, String text) {
                errorCode = Error.OTHER;