OSDN Git Service

init
authorYuji Konishi <yuji.k64613@gmail.com>
Tue, 10 Apr 2012 11:45:44 +0000 (20:45 +0900)
committerYuji Konishi <yuji.k64613@gmail.com>
Tue, 10 Apr 2012 11:45:44 +0000 (20:45 +0900)
15 files changed:
workspace/EverClip/gen/com/yuji/ec/R.java
workspace/EverClip/res/drawable-hdpi/icon.png
workspace/EverClip/res/drawable-ldpi/icon.png
workspace/EverClip/res/drawable-mdpi/icon.png
workspace/EverClip/res/drawable-xhdpi/icon.png [new file with mode: 0644]
workspace/EverClip/res/layout/setting.xml
workspace/EverClip/res/values/strings.xml
workspace/EverClip/src/com/yuji/ec/Initialize.java
workspace/EverClip/src/com/yuji/ec/NoteListViewArrayAdapter.java
workspace/EverClip/src/com/yuji/ec/NoteTypeListActivity.java
workspace/EverClip/src/com/yuji/ec/SettingActivity.java
workspace/EverClip/src/com/yuji/ec/common/Constant.java
workspace/EverClip/src/com/yuji/ec/db/NoteListItem.java
workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java [new file with mode: 0644]
workspace/EverClip/src/com/yuji/ec/utility/EvernoteUtil.java

index 0bfdf08..8431487 100644 (file)
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.\r
- *\r
- * This class was automatically generated by the\r
- * aapt tool from the resource data it found.  It\r
- * should not be modified by hand.\r
- */\r
-\r
-package com.yuji.ec;\r
-\r
-public final class R {\r
-    public static final class attr {\r
-    }\r
-    public static final class color {\r
-        public static final int green1=0x7f040001;\r
-        public static final int green2=0x7f040002;\r
-        public static final int note_list_item=0x7f040003;\r
-        public static final int white=0x7f040000;\r
-    }\r
-    public static final class drawable {\r
-        public static final int icon=0x7f020000;\r
-    }\r
-    public static final class id {\r
-        public static final int mainConfirmDeleteMsg=0x7f060002;\r
-        public static final int mainLayout=0x7f060001;\r
-        public static final int mainTitle=0x7f060000;\r
-        public static final int mainView=0x7f060003;\r
-        public static final int noteTypeCancelButton=0x7f060008;\r
-        public static final int noteTypeConfirmDeleteMsg=0x7f060006;\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=0x7f060015;\r
-        public static final int settingLayout=0x7f060009;\r
-        public static final int settingMessage=0x7f06000a;\r
-        public static final int settingNoteButton=0x7f06000d;\r
-        public static final int settingNoteSpinner=0x7f06000c;\r
-        public static final int settingSortRadio1=0x7f06000f;\r
-        public static final int settingSortRadio2=0x7f060010;\r
-        public static final int settingSortSpinner=0x7f06000e;\r
-        public static final int settingTimeCheckBox=0x7f060012;\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 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
-        public static final int note_type_list=0x7f030001;\r
-        public static final int setting=0x7f030002;\r
-        public static final int simple_list_item_1=0x7f030003;\r
-        public static final int small_list_item_1=0x7f030004;\r
-        public static final int user_password=0x7f030005;\r
-    }\r
-    public static final class string {\r
-        public static final int app_name=0x7f050000;\r
-        public static final int cancelButton=0x7f050006;\r
-        public static final int closeButton=0x7f050007;\r
-        public static final int deleteButton=0x7f050005;\r
-        public static final int mainConfirmTitle=0x7f050013;\r
-        public static final int mainMenuSetting=0x7f050008;\r
-        public static final int mainTitle=0x7f050012;\r
-        public static final int noButton=0x7f050003;\r
-        public static final int noteTypeConfirmTitle=0x7f050016;\r
-        public static final int noteTypeTitle=0x7f050015;\r
-        public static final int selectTitle=0x7f050014;\r
-        public static final int sendButton=0x7f050001;\r
-        public static final int settingConfirmTitle=0x7f050017;\r
-        public static final int settingNoteButton=0x7f05001b;\r
-        public static final int settingNoteTitle=0x7f05001a;\r
-        public static final int settingSortTitle=0x7f05001c;\r
-        public static final int settingTimeTitle=0x7f05001f;\r
-        public static final int settingUpdateButton=0x7f05001e;\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
-        public static final int toastFailedToWrite=0x7f05000b;\r
-        public static final int toastInvalidAuth=0x7f05000f;\r
-        public static final int toastNoteDoesNotExist=0x7f05000d;\r
-        public static final int toastSystem=0x7f050011;\r
-        public static final int updateButton=0x7f050004;\r
-        public static final int userPasswordTitle=0x7f05000a;\r
-        public static final int userUserTitle=0x7f050009;\r
-        public static final int yesButton=0x7f050002;\r
-    }\r
-}\r
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.yuji.ec;
+
+public final class R {
+    public static final class array {
+        public static final int note_item_array=0x7f060000;
+        public static final int note_order_array=0x7f060001;
+    }
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int green1=0x7f040001;
+        public static final int green2=0x7f040002;
+        public static final int note_list_item=0x7f040003;
+        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 mainConfirmDeleteMsg=0x7f070002;
+        public static final int mainLayout=0x7f070001;
+        public static final int mainTitle=0x7f070000;
+        public static final int mainView=0x7f070003;
+        public static final int noteTypeCancelButton=0x7f070008;
+        public static final int noteTypeConfirmDeleteMsg=0x7f070006;
+        public static final int noteTypeLayout=0x7f070005;
+        public static final int noteTypeTitle=0x7f070004;
+        public static final int noteTypeView=0x7f070007;
+        public static final int settingCloseButton=0x7f070017;
+        public static final int settingLayout=0x7f070009;
+        public static final int settingMessage=0x7f07000a;
+        public static final int settingNoteButton=0x7f07000e;
+        public static final int settingNoteSpinner=0x7f07000c;
+        public static final int settingNoteText=0x7f07000d;
+        public static final int settingSortRadio1=0x7f070011;
+        public static final int settingSortRadio2=0x7f070012;
+        public static final int settingSortRadioGroup=0x7f070010;
+        public static final int settingSortSpinner=0x7f07000f;
+        public static final int settingTimeCheckBox=0x7f070014;
+        public static final int settingTimePicker=0x7f070015;
+        public static final int settingUpdateButton=0x7f070013;
+        public static final int settingUserButton=0x7f07000b;
+        public static final int settingXXXButton=0x7f070016;
+        public static final int text1=0x7f070018;
+        public static final int text2=0x7f070019;
+        public static final int userCancelButton=0x7f07001f;
+        public static final int userOkButton=0x7f07001e;
+        public static final int userPasswordEditText=0x7f07001d;
+        public static final int userPasswordTextView=0x7f07001c;
+        public static final int userUserEditText=0x7f07001b;
+        public static final int userUserTextView=0x7f07001a;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+        public static final int note_type_list=0x7f030001;
+        public static final int setting=0x7f030002;
+        public static final int simple_list_item_1=0x7f030003;
+        public static final int small_list_item_1=0x7f030004;
+        public static final int user_password=0x7f030005;
+    }
+    public static final class string {
+        public static final int app_name=0x7f050000;
+        public static final int cancelButton=0x7f050006;
+        public static final int closeButton=0x7f050007;
+        public static final int deleteButton=0x7f050005;
+        public static final int mainConfirmTitle=0x7f050013;
+        public static final int mainMenuSetting=0x7f050008;
+        public static final int mainTitle=0x7f050012;
+        public static final int noButton=0x7f050003;
+        public static final int noteTypeConfirmTitle=0x7f050016;
+        public static final int noteTypeTitle=0x7f050015;
+        public static final int selectTitle=0x7f050014;
+        public static final int sendButton=0x7f050001;
+        public static final int settingConfirmTitle=0x7f050017;
+        public static final int settingNoteButton=0x7f05001c;
+        public static final int settingNoteText=0x7f05001b;
+        public static final int settingNoteTitle=0x7f05001a;
+        public static final int settingSortTitle=0x7f05001d;
+        public static final int settingTimeTitle=0x7f050020;
+        public static final int settingUpdateButton=0x7f05001f;
+        public static final int settingUpdateTitle=0x7f05001e;
+        public static final int settingUserButton=0x7f050019;
+        public static final int settingUserTitle=0x7f050018;
+        public static final int settingXXXTitle=0x7f050021;
+        public static final int toastConnect=0x7f05000c;
+        public static final int toastEvernoteSystem=0x7f050010;
+        public static final int toastFailedToGetList=0x7f05000e;
+        public static final int toastFailedToWrite=0x7f05000b;
+        public static final int toastInvalidAuth=0x7f05000f;
+        public static final int toastNoteDoesNotExist=0x7f05000d;
+        public static final int toastSystem=0x7f050011;
+        public static final int updateButton=0x7f050004;
+        public static final int userPasswordTitle=0x7f05000a;
+        public static final int userUserTitle=0x7f050009;
+        public static final int yesButton=0x7f050002;
+    }
+}
index 8074c4c..96f75cd 100644 (file)
Binary files a/workspace/EverClip/res/drawable-hdpi/icon.png and b/workspace/EverClip/res/drawable-hdpi/icon.png differ
index 1095584..0b6ef15 100644 (file)
Binary files a/workspace/EverClip/res/drawable-ldpi/icon.png and b/workspace/EverClip/res/drawable-ldpi/icon.png differ
index a07c69f..5b2f2dd 100644 (file)
Binary files a/workspace/EverClip/res/drawable-mdpi/icon.png and b/workspace/EverClip/res/drawable-mdpi/icon.png differ
diff --git a/workspace/EverClip/res/drawable-xhdpi/icon.png b/workspace/EverClip/res/drawable-xhdpi/icon.png
new file mode 100644 (file)
index 0000000..8145dad
Binary files /dev/null and b/workspace/EverClip/res/drawable-xhdpi/icon.png differ
index 029b455..c4c60db 100644 (file)
                        
                        <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>
                <Spinner android:id="@+id/settingNoteSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner>
-                       <Button android:id="@+id/settingNoteButton" android:text="@+string/settingNoteButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+                       <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+                               <TextView android:id="@+id/settingNoteText" android:text="@+string/settingNoteText" 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/settingNoteButton" android:text="@+string/settingNoteButton" android:layout_width="wrap_content" android:layout_height="wrap_content" /> 
+                       </LinearLayout> 
                        
                        <TextView android:text="@+string/settingSortTitle" android:textStyle="bold" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
                <Spinner android:id="@+id/settingSortSpinner" android:layout_height="wrap_content" android:layout_width="fill_parent"></Spinner>
-                       <RadioGroup android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content">
+                       <RadioGroup android:id="@+id/settingSortRadioGroup" android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content">
                                <RadioButton android:id="@+id/settingSortRadio1" android:text="昇順" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
                                <RadioButton android:id="@+id/settingSortRadio2" android:text="降順" android:layout_width="wrap_content" android:layout_height="wrap_content"></RadioButton>
                        </RadioGroup>
index 1e23c62..fdf37d9 100644 (file)
     <string name="toastInvalidAuth">認証に失敗しました</string>
     <string name="toastEvernoteSystem">Evernoteとの連係に失敗しました</string>
     <string name="toastSystem">システムエラーが発生しました</string>
+
+       <string-array name="note_item_array">
+           <item>全て</item>
+           <item>ノートブック</item>
+           <item>タグ</item>
+       </string-array>
+       <string-array name="note_order_array">
+           <item>作成日</item>
+           <item>更新日</item>
+           <item>テキスト</item>
+       </string-array>
 </resources>
index 61de656..4e253c1 100644 (file)
@@ -2,8 +2,11 @@ package com.yuji.ec;
 \r
 import android.content.Context;\r
 \r
+import com.yuji.ec.common.CommonUtil;\r
 import com.yuji.ec.db.DatabaseHelper;\r
 import com.yuji.ec.utility.ECException;\r
+import com.yuji.ec.utility.EvernoteUtil;\r
+import com.yuji.ec.utility.PasswordUtil;\r
 \r
 public class Initialize {\r
        private static boolean isInit = true;\r
@@ -13,6 +16,14 @@ public class Initialize {
                        return;\r
                }\r
                \r
+               // TODO Simeji\82©\82Ì\8fê\8d\87\82Í\81A\90Ý\92è\82µ\82È\82¢\r
+               EvernoteUtil util = EvernoteUtil.getInstance();\r
+               String username = PasswordUtil.getUsername(context);\r
+               String password = PasswordUtil.getPassword(context);\r
+               if (!CommonUtil.isNull(username) && !CommonUtil.isNull(password)) {\r
+                       util.setConfig(username, password);\r
+               }\r
+\r
                try {\r
                        DatabaseHelper.init(context);\r
                } catch (ECException e) {\r
index eb1fae0..1c50aa1 100644 (file)
@@ -26,7 +26,7 @@ public class NoteListViewArrayAdapter extends ArrayAdapter<NoteListItem> {
                View view;
                TextView textView;
                NoteListItem item = getItem(position);
-               if (item.getNote() != null) {
+               if (item.getItem() != null) {
                        view = inflater.inflate(R.layout.simple_list_item_1, null);
                        textView = (TextView) view.findViewById(R.id.text1);
                } else {
@@ -41,6 +41,6 @@ public class NoteListViewArrayAdapter extends ArrayAdapter<NoteListItem> {
        @Override
        public boolean isEnabled(int position) {
                NoteListItem item = getItem(position);
-               return item.getNote() != null;
+               return item.getItem() != null;
        }
 }
index 3e13661..2d826b8 100644 (file)
@@ -1,32 +1,44 @@
 package com.yuji.ec;\r
 \r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r
+import android.widget.AdapterView.OnItemClickListener;\r
 import android.widget.LinearLayout;\r
 import android.widget.ListView;\r
 import android.widget.TextView;\r
-import android.widget.AdapterView.OnItemClickListener;\r
+import android.widget.Toast;\r
 \r
-import com.yuji.ec.common.CommonUtil;\r
+import com.yuji.ec.common.Constant;\r
+import com.yuji.ec.db.INoteItem;\r
 import com.yuji.ec.db.NoteListItem;\r
+import com.yuji.ec.task.NoteTypeListTask;\r
+import com.yuji.ec.utility.AsyncTaskCommand;\r
 import com.yuji.ec.utility.BaseActivity;\r
+import com.yuji.ec.utility.EditPrefUtil;\r
+import com.yuji.ec.utility.EvernoteUtil;\r
+import com.yuji.ec.utility.EvernoteUtil.Error;\r
 \r
 public class NoteTypeListActivity extends BaseActivity {\r
+       private EditPrefUtil pref = new EditPrefUtil(this);\r
+\r
        private LinearLayout layoutView = null;\r
        private TextView messageText = null;\r
        private ListView listView = null;\r
 \r
        @Override\r
-    public void onCreate(Bundle savedInstanceState) {\r
-       \r
-           super.onCreate(savedInstanceState);\r
-           setContentView(R.layout.note_type_list);\r
-       \r
-           layoutView = (LinearLayout)this.findViewById(R.id.noteTypeLayout);\r
-           messageText = (TextView)this.findViewById(R.id.noteTypeConfirmDeleteMsg);\r
-           listView  = (ListView)this.findViewById(R.id.noteTypeView);\r
+       public void onCreate(Bundle savedInstanceState) {\r
+               super.onCreate(savedInstanceState);\r
+               setContentView(R.layout.note_type_list);\r
+\r
+               layoutView = (LinearLayout) this.findViewById(R.id.noteTypeLayout);\r
+               messageText = (TextView) this\r
+                               .findViewById(R.id.noteTypeConfirmDeleteMsg);\r
+               listView = (ListView) this.findViewById(R.id.noteTypeView);\r
 \r
                listView.setOnItemClickListener(new OnItemClickListener() {\r
                        public void onItemClick(AdapterView<?> parent, View view,\r
@@ -34,24 +46,94 @@ public class NoteTypeListActivity extends BaseActivity {
                                listViewOnItemClickListener(parent, view, position, id);\r
                        }\r
                });\r
-               \r
-               updateList();                   \r
+\r
+               // updateList();\r
+               int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,\r
+                               Constant.NOTE_ITEM_TYPE_ALL);\r
+               NoteTypeListTask task = new NoteTypeListTask(this, noteItemType);\r
+               AsyncTaskCommand command = new AsyncTaskCommand(this, task);\r
+               // command.setTitle(getString(R.string.noteListGetting));\r
+               command.setButtonTitle(getString(R.string.cancelButton));\r
+               command.execute("");\r
        }\r
-       \r
+\r
        private void listViewOnItemClickListener(AdapterView<?> parent, View view,\r
                        int position, long id) {\r
                ListView listView = (ListView) parent;\r
-//             NoteListItem item = (NoteListItem) listView.getItemAtPosition(position);\r
-//             \r
-//             String result = item.getTitle();\r
-//             \r
-//             Intent data = new Intent();\r
-//             data.putExtra(REPLACE_KEY, result);\r
-//             setResult(RESULT_OK, data);\r
-//             finish();\r
-       }\r
-       \r
-       private void updateList(){\r
+\r
+               // TODO \83e\83L\83X\83g\8eæ\93¾\r
+               String guid = "";\r
+               String title = "\83m\81[\83g\83^\83C\83g\83\8b";\r
                \r
+                Intent data = new Intent();\r
+                data.putExtra(Constant.EXTRA_GUID, guid);\r
+                data.putExtra(Constant.EXTRA_TITLE, title);\r
+                setResult(RESULT_OK, data);\r
+                finish();\r
+       }\r
+\r
+//     private void updateList() {\r
+//             List<NoteListItem> list = getNoteList();\r
+//             if (list == null) {\r
+//                     return;\r
+//             }\r
+//\r
+//             NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this,\r
+//                             R.layout.simple_list_item_1, list);\r
+//             listView.setAdapter(adapter);\r
+//\r
+//     }\r
+//\r
+//     private List<NoteListItem> getNoteList() {\r
+//             int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,\r
+//                             Constant.NOTE_ITEM_TYPE_ALL);\r
+//\r
+//             List<INoteItem> list = null;\r
+//             EvernoteUtil util = EvernoteUtil.getInstance();\r
+//             switch (noteItemType) {\r
+//             case Constant.NOTE_ITEM_TYPE_NOTE_BOOK:\r
+//                     List<Notebook> noteList = util.getNoteBookList();\r
+//                     list = util.toNoteItemFromNoteBook(noteList);\r
+//                     break;\r
+//             case Constant.NOTE_ITEM_TYPE_TAG:\r
+//                     List<Tag> tagList = util.getTagList();\r
+//                     list = util.toNoteItemFromTag(tagList);\r
+//                     break;\r
+//             default:\r
+//                     return null;\r
+//             }\r
+//\r
+//             List<NoteListItem> itemList = new ArrayList<NoteListItem>();\r
+//             for (INoteItem iItem : list) {\r
+//                     NoteListItem item = new NoteListItem(iItem.getText(), iItem);\r
+//                     itemList.add(item);\r
+//             }\r
+//\r
+//             return itemList;\r
+//     }\r
+//\r
+       public void done(Error errorCode, List<INoteItem> nList) {\r
+               if (errorCode != null && !errorCode.equals(Error.NONE)) {\r
+                       EvernoteUtil util = EvernoteUtil.getInstance();\r
+                       Toast.makeText(this, util.getErrorMessage(this, errorCode),\r
+                                       Toast.LENGTH_LONG).show();\r
+               }\r
+\r
+               if (nList == null) {\r
+                       // \83L\83\83\83\93\83Z\83\8b\83{\83^\83\93\89\9f\89º\8e\9e\r
+                       // TODO\r
+                       // closeButtonOnClick();\r
+                       return;\r
+               }\r
+\r
+               List<NoteListItem> itemList = new ArrayList<NoteListItem>();\r
+               for (INoteItem iItem : nList) {\r
+                       NoteListItem item = new NoteListItem(iItem.getText(), iItem);\r
+                       itemList.add(item);\r
+               }\r
+\r
+               NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this,\r
+                               R.layout.simple_list_item_1, itemList);\r
+               listView.setAdapter(adapter);\r
        }\r
 }\r
index 13029ee..c35d0c3 100644 (file)
@@ -7,28 +7,35 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
+import com.yuji.ec.common.Constant;
 import com.yuji.ec.task.NoteUpdateTask;
 import com.yuji.ec.utility.AsyncTaskCommand;
 import com.yuji.ec.utility.BaseActivity;
+import com.yuji.ec.utility.EditPrefUtil;
 import com.yuji.ec.utility.EvernoteUtil;
 
 public class SettingActivity extends BaseActivity {
+       private EditPrefUtil pref = new EditPrefUtil(this);
+
        private LinearLayout messageLayout = null;
        private TextView messageView = null;
        private Button userButton = null;
        private Spinner noteTypeSpinner = null;
        private Button noteTypeButton = null;
        private Spinner sortSpinner = null;
+       private RadioGroup sortRadioGroup = null;
        private RadioButton sortRadio1 = null;
        private RadioButton sortRadio2 = null;
        private Button updateButton = null;
@@ -47,6 +54,7 @@ public class SettingActivity extends BaseActivity {
                noteTypeSpinner = (Spinner) this.findViewById(R.id.settingNoteSpinner);
                noteTypeButton = (Button) this.findViewById(R.id.settingNoteButton);
                sortSpinner = (Spinner) this.findViewById(R.id.settingSortSpinner);
+               sortRadioGroup = (RadioGroup) this.findViewById(R.id.settingSortRadioGroup);
                sortRadio1 = (RadioButton) this.findViewById(R.id.settingSortRadio1);
                sortRadio2 = (RadioButton) this.findViewById(R.id.settingSortRadio2);
                updateButton = (Button) this.findViewById(R.id.settingUpdateButton);
@@ -119,10 +127,77 @@ public class SettingActivity extends BaseActivity {
                        }
                });
 
+               ArrayAdapter<CharSequence> noteTypeAdapter = ArrayAdapter.createFromResource(
+                               this, R.array.note_item_array,
+                               android.R.layout.simple_spinner_item);
+               noteTypeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+               noteTypeSpinner.setAdapter(noteTypeAdapter);
+
+               ArrayAdapter<CharSequence> noteOrderAdapter = ArrayAdapter.createFromResource(
+                               this, R.array.note_order_array,
+                               android.R.layout.simple_spinner_item);
+               noteOrderAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+               sortSpinner.setAdapter(noteOrderAdapter);
+
                setStatus();
        }
 
        @Override
+       public void onStart() {
+               super.onStart();
+
+               int noteItemType = pref.getInt(Constant.PREF_NOTE_ITEM_TYPE,
+                               Constant.NOTE_ITEM_TYPE_ALL);
+               noteTypeSpinner.setSelection(noteItemType);
+
+               int noteOrder= pref.getInt(Constant.PREF_NOTE_ORDER,
+                               Constant.NOTE_ORDER_CREATE);
+               sortSpinner.setSelection(noteOrder);
+
+               int orderBy= pref.getInt(Constant.PREF_NOTE_ORDER_BY,
+                               Constant.NOTE_ORDER_BY_ASC);
+               switch (orderBy){
+               case Constant.NOTE_ORDER_BY_ASC:
+                       sortRadioGroup.check(sortRadio1.getId());
+                       break;
+               case Constant.NOTE_ORDER_BY_DES:
+                       sortRadioGroup.check(sortRadio2.getId());
+                       break;
+               }
+               
+               int autoUpdate = pref.getInt(Constant.PREF_AUTO_UPDATE,
+                               Constant.OFF);
+               timeCheckBox.setChecked(autoUpdate == Constant.ON);
+       }
+
+       @Override
+       public void onPause() {
+               int noteItemType = noteTypeSpinner.getSelectedItemPosition();
+               pref.put(Constant.PREF_NOTE_ITEM_TYPE, noteItemType);
+               
+               int noteOrder = sortSpinner.getSelectedItemPosition();
+               pref.put(Constant.PREF_NOTE_ORDER, noteOrder);
+
+               int orderById = sortRadioGroup.getCheckedRadioButtonId();
+               int orderBy = Constant.NOTE_ORDER_BY_ASC;
+               if (orderById == sortRadio1.getId()){
+                       orderBy = Constant.NOTE_ORDER_BY_ASC;
+               }
+               else if (orderById == sortRadio2.getId()){
+                       orderBy = Constant.NOTE_ORDER_BY_DES;
+               }
+               pref.put(Constant.PREF_NOTE_ORDER_BY, orderBy);
+               
+               int autoUpdate = timeCheckBox.isChecked()? Constant.ON : Constant.OFF;
+               pref.put(Constant.PREF_AUTO_UPDATE,
+                               autoUpdate);
+
+               pref.update();
+               
+               super.onPause();
+       }
+
+       @Override
        public boolean onKeyDown(int keyCode, KeyEvent event) {
                if (keyCode != KeyEvent.KEYCODE_BACK) {
                        return super.onKeyDown(keyCode, event);
@@ -148,7 +223,8 @@ public class SettingActivity extends BaseActivity {
        }
 
        private void noteTypeButtonOnClick() {
-
+               Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
+               startActivityForResult(intent, 0);
        }
 
        private void sortSpinnerItemSelected(AdapterView<?> parent, View view,
index 47047b2..a82ed9d 100644 (file)
@@ -4,15 +4,27 @@ public class Constant {
 
        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 static final String PREF_SELECTED_INDEX = "SELECTED_INDEX";
-//
-//     public static final String EXTRA_INDEX = "EXTRA_INDEX";
-//     
-//     public static final int TOGGLE_SIZE = 5;
-//     
-//     public static final String DEFAULT_HEADER_TEXT = "<hr /><h3>{DATE} {TIME}</h3><hr />";
+       public static final String PREF_NOTE_ITEM_TYPE = "NOTE_ITEM_TYPE";
+       public static final String PREF_NOTE_ORDER = "NOTE_ORDER";
+       public static final String PREF_NOTE_ORDER_BY = "NOTE_ORDER_BY";
+       public static final String PREF_AUTO_UPDATE = "AUTO_UPDATE";
+       
+       public static final String EXTRA_GUID = "GUID";
+       public static final String EXTRA_TITLE = "TITLE";
+
+       public static final int NOTE_ITEM_TYPE_NONE = -1;
+       public static final int NOTE_ITEM_TYPE_ALL = 0;
+       public static final int NOTE_ITEM_TYPE_NOTE_BOOK = 1;
+       public static final int NOTE_ITEM_TYPE_TAG = 2;
+       
+       public static final int NOTE_ORDER_NONE = -1;
+       public static final int NOTE_ORDER_CREATE = 0;
+       public static final int NOTE_ORDER_UPDATE = 1;
+       public static final int NOTE_ORDER_TEXT = 2;
+
+       public static final int NOTE_ORDER_BY_ASC = 0;
+       public static final int NOTE_ORDER_BY_DES = 1;
+
+       public static final int OFF = 0;
+       public static final int ON = 1;
 }
index 46287b6..5e09df6 100644 (file)
@@ -3,15 +3,15 @@ package com.yuji.ec.db;
 
 public class NoteListItem {
        private String title;
-       private Note note;
+       private INoteItem item;
        
-       public NoteListItem(String title, Note note){
-               if (note == null){
+       public NoteListItem(String title, INoteItem item){
+               if (item == null){
                        this.title = title;
                }
                else {
-                       this.title = note.getText();
-                       this.note = note;
+                       this.title = item.getText();
+                       this.item = item;
                }
        }
 
@@ -19,7 +19,7 @@ public class NoteListItem {
                return title;
        }
 
-       public Note getNote() {
-               return note;
+       public INoteItem getItem() {
+               return item;
        }
 }
diff --git a/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java b/workspace/EverClip/src/com/yuji/ec/task/NoteTypeListTask.java
new file mode 100644 (file)
index 0000000..43ce324
--- /dev/null
@@ -0,0 +1,75 @@
+package com.yuji.ec.task;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+import com.evernote.edam.notestore.NoteList;
+import com.evernote.edam.type.Notebook;
+import com.evernote.edam.type.Tag;
+import com.yuji.ec.NoteTypeListActivity;
+import com.yuji.ec.common.Constant;
+import com.yuji.ec.db.INoteItem;
+import com.yuji.ec.utility.AsyncTaskIF;
+import com.yuji.ec.utility.EvernoteUtil;
+import com.yuji.ec.utility.NoteUpdator;
+
+public class NoteTypeListTask implements AsyncTaskIF {
+       private EvernoteUtil util = EvernoteUtil.getInstance();
+       private NoteList noteList;
+       private WeakReference<NoteTypeListActivity> activityRef;
+       private EvernoteUtil.Error errorCode = null;
+
+       private List<INoteItem> list = null;
+       private int noteItemType;
+       
+       public NoteTypeListTask(NoteTypeListActivity activity, int noteItemType) {
+               activityRef = new WeakReference<NoteTypeListActivity>(activity);
+               this.noteItemType = noteItemType;
+       }
+
+       public void doExecute() {
+               synchronized (util) {
+                       try {
+                               EvernoteUtil util = EvernoteUtil.getInstance();
+                               switch (noteItemType){
+                               case Constant.NOTE_ITEM_TYPE_NOTE_BOOK:
+                                       List<Notebook> noteList = util.getNoteBookList();
+                                       list = util.toNoteItemFromNoteBook(noteList);
+                                       break;
+                               case Constant.NOTE_ITEM_TYPE_TAG:
+                                       List<Tag> tagList = util.getTagList();
+                                       list = util.toNoteItemFromTag(tagList);
+                                       break;
+                               default:
+                                       break;
+                               }
+                       } finally {
+                               errorCode = util.getErrorCode();
+                       }
+               }
+       }
+
+       public void cancel() {
+
+       }
+
+       public void done(boolean isCancel) {
+               NoteTypeListActivity activity = activityRef.get();
+               if (activity != null) {
+                       activity.done(errorCode, list);
+                       activityRef = null;
+               }
+       }
+
+       public int getStatus() {
+               return 0;
+       }
+
+       public NoteList getNoteList() {
+               return noteList;
+       }
+
+       public EvernoteUtil.Error getErrorCode() {
+               return errorCode;
+       }
+}
index 64ff27e..e6a9244 100644 (file)
@@ -26,6 +26,7 @@ import com.evernote.edam.type.User;
 import com.evernote.edam.userstore.AuthenticationResult;
 import com.evernote.edam.userstore.UserStore;
 import com.yuji.ec.R;
+import com.yuji.ec.db.INoteItem;
 
 public class EvernoteUtil {
        private String username;
@@ -140,6 +141,7 @@ public class EvernoteUtil {
                                return null;
                        }
                        noteBookList = noteStore.listNotebooks(token);
+                       errorCode = Error.NONE;
                } catch (EDAMUserException e) {
                        Debug.d(this, null, e);
                } catch (EDAMSystemException e) {
@@ -164,6 +166,7 @@ public class EvernoteUtil {
                                return null;
                        }
                        tagList = noteStore.listTags(token);
+                       errorCode = Error.NONE;
                } catch (EDAMUserException e) {
                        Debug.d(this, null, e);
                } catch (EDAMSystemException e) {
@@ -323,8 +326,8 @@ public class EvernoteUtil {
        }
 
        public static com.yuji.ec.db.Note toNote(Note n, String text) {
-               com.yuji.ec.db.Note note = new com.yuji.ec.db.Note(n.getGuid(),
-                               text, n.getUpdated());
+               com.yuji.ec.db.Note note = new com.yuji.ec.db.Note(n.getGuid(), text,
+                               n.getUpdated());
                return note;
        }
 
@@ -351,9 +354,30 @@ public class EvernoteUtil {
                                list.add(note);
                        }
                } catch (EDAMNotFoundException e) {
-                       // TODO 
+                       // TODO
                        return null;
                }
                return list;
        }
+
+       public List<INoteItem> toNoteItemFromNoteBook(List<Notebook> noteList) {
+               List<INoteItem> list = new ArrayList<INoteItem>();
+               for (Notebook notebook : noteList) {
+                       com.yuji.ec.db.Note item = new com.yuji.ec.db.Note(
+                                       notebook.getGuid(), notebook.getName(), -1);
+                       list.add(item);
+               }
+               return list;
+       }
+
+       public List<INoteItem> toNoteItemFromTag(List<Tag> tagList) {
+               List<INoteItem> list = new ArrayList<INoteItem>();
+               for (Tag tag : tagList) {
+                       com.yuji.ec.db.Note item = new com.yuji.ec.db.Note(
+                                       tag.getGuid(), tag.getName(), -1);
+                       list.add(item);
+               }
+               return list;
+       }
+
 }