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 settingCloseButton=0x7f070019;
public static final int settingLayout=0x7f070009;
public static final int settingMessage=0x7f07000a;
- public static final int settingNoteButton=0x7f07000e;
+ public static final int settingNoteButton=0x7f07000f;
+ public static final int settingNoteLayout=0x7f07000d;
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 settingNoteText=0x7f07000e;
+ public static final int settingSortRadio1=0x7f070012;
+ public static final int settingSortRadio2=0x7f070013;
+ public static final int settingSortRadioGroup=0x7f070011;
+ public static final int settingSortSpinner=0x7f070010;
+ public static final int settingTimeButton=0x7f070018;
+ public static final int settingTimeCheckBox=0x7f070015;
+ public static final int settingTimePicker=0x7f070016;
+ public static final int settingTimeText=0x7f070017;
+ public static final int settingUpdateButton=0x7f070014;
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 int text1=0x7f07001a;
+ public static final int text2=0x7f07001b;
+ public static final int userCancelButton=0x7f070021;
+ public static final int userOkButton=0x7f070020;
+ public static final int userPasswordEditText=0x7f07001f;
+ public static final int userPasswordTextView=0x7f07001e;
+ public static final int userUserEditText=0x7f07001d;
+ public static final int userUserTextView=0x7f07001c;
}
public static final class layout {
public static final int main=0x7f030000;
public static final int settingNoteText=0x7f05001b;
public static final int settingNoteTitle=0x7f05001a;
public static final int settingSortTitle=0x7f05001d;
+ public static final int settingTimeButton=0x7f050022;
+ public static final int settingTimeText=0x7f050021;
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;
<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>
- <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <LinearLayout android:id="@+id/settingNoteLayout" 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>
<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" />
+ <TextView android:id="@+id/settingTimeText" android:text="@+string/settingTimeText" 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/settingTimeButton" android:text="@+string/settingTimeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>
package com.yuji.ec;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import android.content.Intent;
import android.widget.TextView;
import com.yuji.ec.common.CommonUtil;
+import com.yuji.ec.common.Constant;
+import com.yuji.ec.db.INoteItem;
import com.yuji.ec.db.Note;
import com.yuji.ec.db.NoteDao;
import com.yuji.ec.db.NoteListItem;
import com.yuji.ec.utility.BaseActivity;
+import com.yuji.ec.utility.EditPrefUtil;
+import com.yuji.ec.utility.NoteComparator;
public class EverClipActivity extends BaseActivity {
private static final String ACTION_INTERCEPT = "com.adamrocker.android.simeji.ACTION_INTERCEPT";
private static final String REPLACE_KEY = "replace_key";
private final static String NL = System.getProperty("line.separator");
+ private EditPrefUtil pref = new EditPrefUtil(this);
+
private LinearLayout layoutView = null;
private TextView messageText = null;
private ListView listView = null;
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- layoutView = (LinearLayout)this.findViewById(R.id.mainLayout);
- messageText = (TextView)this.findViewById(R.id.mainConfirmDeleteMsg);
- listView = (ListView)this.findViewById(R.id.mainView);
-
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+
+ layoutView = (LinearLayout) this.findViewById(R.id.mainLayout);
+ messageText = (TextView) this.findViewById(R.id.mainConfirmDeleteMsg);
+ listView = (ListView) this.findViewById(R.id.mainView);
+
listView.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View view,
int position, long id) {
listViewOnItemClickListener(parent, view, position, id);
}
});
-
- Intent it = getIntent();
- String action = it.getAction();
- if (action != null && ACTION_INTERCEPT.equals(action)) {
- String str = it.getStringExtra(REPLACE_KEY);
- if (CommonUtil.isNull(str)){
- layoutView.setVisibility(View.GONE);
- str = null;
- }
- else {
- messageText.setText(str);
- }
- updateList(str);
- }
- else {
- updateList(null);
- }
- }
-
+
+// Intent it = getIntent();
+// String action = it.getAction();
+// if (action != null && ACTION_INTERCEPT.equals(action)) {
+// String str = it.getStringExtra(REPLACE_KEY);
+// if (CommonUtil.isNull(str)) {
+// layoutView.setVisibility(View.GONE);
+// str = null;
+// } else {
+// messageText.setText(str);
+// }
+// updateList(str);
+// } else {
+// updateList(null);
+// }
+ updateList();
+ }
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-
+ updateList();
+ //settStatus();
}
@Override
int position, long id) {
ListView listView = (ListView) parent;
NoteListItem item = (NoteListItem) listView.getItemAtPosition(position);
-
+
String result = item.getTitle();
-
+
Intent data = new Intent();
data.putExtra(REPLACE_KEY, result);
setResult(RESULT_OK, data);
finish();
}
+ private void updateList(){
+ Intent it = getIntent();
+ String action = it.getAction();
+ if (action != null && ACTION_INTERCEPT.equals(action)) {
+ String str = it.getStringExtra(REPLACE_KEY);
+ if (CommonUtil.isNull(str)) {
+ layoutView.setVisibility(View.GONE);
+ str = null;
+ } else {
+ messageText.setText(str);
+ }
+ updateList(str);
+ } else {
+ updateList(null);
+ }
+ }
+
private void updateList(String str) {
List<NoteListItem> list = getNoteList(str);
-
+
NoteListViewArrayAdapter adapter = new NoteListViewArrayAdapter(this,
R.layout.simple_list_item_1, list);
listView.setAdapter(adapter);
}
private List<NoteListItem> getNoteList(String str) {
- NoteDao dao = (NoteDao)NoteDao.getInstance();
-
+ int noteOrder = pref.getInt(Constant.PREF_NOTE_ORDER,
+ Constant.NOTE_ORDER_CREATE);
+
+ NoteDao dao = (NoteDao) NoteDao.getInstance();
+
List<Note> list = dao.search();
+ sortList(list);
List<NoteListItem> listItem = new ArrayList<NoteListItem>();
String oldTitle = "";
NoteListItem item;
- int len = (str != null)? str.length() : -1;
-
+ int len = (str != null) ? str.length() : -1;
+
for (Note note : list) {
- if (str != null){
+ if (str != null) {
String title = note.getText();
- if (title.length() < len){
+ if (title.length() < len) {
continue;
}
- if (!title.substring(0, len).equals(str)){
+ if (!title.substring(0, len).equals(str)) {
continue;
}
}
-
- //long l = note.getUpdated();
- // long l = note.getCreated(); // \83\\81[\83g\8f\87\82Í\81A\8dX\90V\93ú
- long l = note.getDate();
- String title = DateUtils.formatDateTime(this, l,
- DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE);
+
+ String title = " ";
+ String s;
+ long l;
+ switch (noteOrder){
+ case Constant.NOTE_ORDER_CREATE:
+ l = note.getCreated();
+ title = DateUtils.formatDateTime(this, l,
+ DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE);
+ break;
+ case Constant.NOTE_ORDER_UPDATE:
+ l = note.getUpdated();
+ title = DateUtils.formatDateTime(this, l,
+ DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE);
+ break;
+ case Constant.NOTE_ORDER_TEXT:
+ s = note.getText();
+ if (s.length() > 0){
+ title = s.substring(0, 1);
+ }
+ break;
+ }
if (!title.equals(oldTitle)) {
item = new NoteListItem(title, null);
listItem.add(item);
String text = note.getText();
text = text.replace(NL, " ");
-
- Note n = new Note(note.getGuid(), text, note.getDate());
+
+ Note n = new Note(note.getGuid(), text, note.getCreated(),
+ note.getUpdated());
item = new NoteListItem(null, n);
listItem.add(item);
}
return listItem;
}
+
+ private void sortList(List<Note> list) {
+ int noteOrder = pref.getInt(Constant.PREF_NOTE_ORDER,
+ Constant.NOTE_ORDER_CREATE);
+
+ int orderBy = pref.getInt(Constant.PREF_NOTE_ORDER_BY,
+ Constant.NOTE_ORDER_BY_ASC);
+
+ NoteComparator comp = new NoteComparator(noteOrder, orderBy);
+ Collections.sort(list, comp);
+ }
}
\ No newline at end of file
int position, long id) {\r
ListView listView = (ListView) parent;\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
+ NoteListItem selectedItem = (NoteListItem) listView\r
+ .getItemAtPosition(position);\r
+ INoteItem item = selectedItem.getItem();\r
+\r
+ String guid = item.getGuid();\r
+ String title = item.getText();\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
+ // 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
package com.yuji.ec;
+import java.util.Calendar;
+
+import android.app.TimePickerDialog;
import android.content.Intent;
import android.os.Bundle;
import android.view.KeyEvent;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.TimePicker;
+import android.widget.Toast;
import com.yuji.ec.common.Constant;
import com.yuji.ec.task.NoteUpdateTask;
private LinearLayout messageLayout = null;
private TextView messageView = null;
private Button userButton = null;
+ private LinearLayout noteTypeLayout = null;
private Spinner noteTypeSpinner = null;
+ private TextView noteTypeView = null;
private Button noteTypeButton = null;
private Spinner sortSpinner = null;
private RadioGroup sortRadioGroup = null;
private RadioButton sortRadio2 = null;
private Button updateButton = null;
private CheckBox timeCheckBox = null;
+ private TextView timeView = null;
+ private Button timeButton = null;
private TimePicker timePicker = null;
private Button closeButton = null;
+ private String guid;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
messageView = (TextView) this.findViewById(R.id.settingMessage);
userButton = (Button) this.findViewById(R.id.settingUserButton);
noteTypeSpinner = (Spinner) this.findViewById(R.id.settingNoteSpinner);
+ noteTypeLayout = (LinearLayout) this
+ .findViewById(R.id.settingNoteLayout);
+ noteTypeView = (TextView) this.findViewById(R.id.settingNoteText);
noteTypeButton = (Button) this.findViewById(R.id.settingNoteButton);
sortSpinner = (Spinner) this.findViewById(R.id.settingSortSpinner);
- sortRadioGroup = (RadioGroup) this.findViewById(R.id.settingSortRadioGroup);
+ 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);
timeCheckBox = (CheckBox) this.findViewById(R.id.settingTimeCheckBox);
+ timeView = (TextView) this.findViewById(R.id.settingTimeText);
+ timeButton = (Button) this.findViewById(R.id.settingTimeButton);
timePicker = (TimePicker) this.findViewById(R.id.settingTimePicker);
closeButton = (Button) this.findViewById(R.id.settingCloseButton);
timePickerOnClick();
}
});
+ timeButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View view) {
+ timeButtonOnClick();
+ }
+ });
closeButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
closeButtonOnClick();
}
});
- 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);
+ 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);
+ 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();
Constant.NOTE_ITEM_TYPE_ALL);
noteTypeSpinner.setSelection(noteItemType);
- int noteOrder= pref.getInt(Constant.PREF_NOTE_ORDER,
+ guid = pref.get(Constant.PREF_NOTE_ITEM_GUID);
+ String title = pref.get(Constant.PREF_NOTE_ITEM_TEXT);
+ noteTypeView.setText(title);
+
+ int noteOrder = pref.getInt(Constant.PREF_NOTE_ORDER,
Constant.NOTE_ORDER_CREATE);
sortSpinner.setSelection(noteOrder);
- int orderBy= pref.getInt(Constant.PREF_NOTE_ORDER_BY,
+ int orderBy = pref.getInt(Constant.PREF_NOTE_ORDER_BY,
Constant.NOTE_ORDER_BY_ASC);
- switch (orderBy){
+ switch (orderBy) {
case Constant.NOTE_ORDER_BY_ASC:
sortRadioGroup.check(sortRadio1.getId());
break;
sortRadioGroup.check(sortRadio2.getId());
break;
}
-
- int autoUpdate = pref.getInt(Constant.PREF_AUTO_UPDATE,
- Constant.OFF);
+
+ int autoUpdate = pref.getInt(Constant.PREF_AUTO_UPDATE, Constant.OFF);
timeCheckBox.setChecked(autoUpdate == Constant.ON);
}
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()){
+ if (orderById == sortRadio1.getId()) {
orderBy = Constant.NOTE_ORDER_BY_ASC;
- }
- else if (orderById == sortRadio2.getId()){
+ } 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);
+
+ int autoUpdate = timeCheckBox.isChecked() ? Constant.ON : Constant.OFF;
+ pref.put(Constant.PREF_AUTO_UPDATE, autoUpdate);
pref.update();
-
+
super.onPause();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (resultCode == RESULT_OK) {
+ Bundle ex = data.getExtras();
+ String guid = ex.getString(Constant.EXTRA_GUID);
+ String title = ex.getString(Constant.EXTRA_TITLE);
+
+ pref.put(Constant.PREF_NOTE_ITEM_GUID, guid);
+ pref.put(Constant.PREF_NOTE_ITEM_TEXT, title);
+ pref.update();
+
+ noteTypeView.setText(title);
+ }
+
setStatus();
}
private void noteTypeSpinnerItemSelected(AdapterView<?> parent, View view,
int position, long id) {
-
+ setStatus();
}
private void noteTypeButtonOnClick() {
Intent intent = new Intent(this, (Class<?>) NoteTypeListActivity.class);
- startActivityForResult(intent, 0);
+ startActivityForResult(intent, 1); // TODO
}
private void sortSpinnerItemSelected(AdapterView<?> parent, View view,
setStatus();
}
+ private void timeButtonOnClick() {
+ Calendar calendar = Calendar.getInstance();
+ int hour = calendar.get(Calendar.HOUR_OF_DAY);
+ int minute = calendar.get(Calendar.MINUTE);
+
+ TimePickerDialog timePickerDialog = new TimePickerDialog(this,
+ new TimePickerDialog.OnTimeSetListener() {
+ public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+
+ }
+ }, hour, minute, true);
+ timePickerDialog.show();
+ }
+
private void closeButtonOnClick() {
Intent intent = new Intent();
setResult(RESULT_OK, intent);
// headerButton.setEnabled(false);
// return;
// }
+
+ int noteType = noteTypeSpinner.getSelectedItemPosition();
+ noteTypeLayout
+ .setVisibility((noteType == Constant.NOTE_ITEM_TYPE_ALL) ? View.GONE
+ : View.VISIBLE);
+
messageLayout.setVisibility(View.GONE);
// noteButton.setEnabled(true);
// headerButton.setEnabled(true);
public static final String PREF_USER = "USER";
public static final String PREF_PASSWORD = "PASSWORD";
public static final String PREF_NOTE_ITEM_TYPE = "NOTE_ITEM_TYPE";
+ public static final String PREF_NOTE_ITEM_GUID = "NOTE_ITEM_GUID";
+ public static final String PREF_NOTE_ITEM_TEXT = "NOTE_ITEM_TEXT";
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";
private long id = -1;\r
private String guid;\r
private String text;\r
- private long date;\r
+ private long created;\r
+ private long updated;\r
\r
- public Note(long id, String guid, String text, long date){\r
+ public Note(long id, String guid, String text, long created, long updated){\r
this.id = id;\r
this.guid = guid;\r
this.text = text;\r
- this.date = date;\r
+ this.created = created;\r
+ this.updated = updated;\r
}\r
\r
- public Note(String guid, String text, long date){\r
- this(-1, guid, text, date);\r
+ public Note(String guid, String text, long created, long updated){\r
+ this(-1, guid, text, created, updated);\r
}\r
\r
public long getId(){\r
return text;\r
}\r
\r
- public long getDate() {\r
- return date;\r
+ public long getCreated() {\r
+ return created;\r
+ }\r
+\r
+ public long getUpdated() {\r
+ return updated;\r
}\r
}\r
+ android.provider.BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"\r
+ "GUID TEXT,"\r
+ "TEXT TEXT,"\r
- + "DATE INTEGER"\r
+ + "CREATED INTEGER,"\r
+ + "UPDATED INTEGER"\r
+ ");");\r
}\r
\r
"INSERT INTO NOTE ("\r
+ "GUID,"\r
+ "TEXT,"\r
- + "DATE"\r
+ + "CREATED,"\r
+ + "UPDATED"\r
+ ") VALUES ("\r
- + "?,?,?"\r
+ + "?,?,?,?"\r
+ ");"); \r
deleteStmt = db.compileStatement(\r
"DELETE FROM NOTE");\r
public void start(SQLiteDatabase db) {\r
Note note;\r
\r
- note = new Note("id0", "\83T\83\93\83v\83\8bA", 0);\r
+ note = new Note("id0", "\83T\83\93\83v\83\8bA", 0, 0);\r
add(db, note);\r
- note = new Note("id1", "\83T\83\93\83v\83\8bB", 0);\r
+ note = new Note("id1", "\83T\83\93\83v\83\8bB", 0, 0);\r
add(db, note);\r
- note = new Note("id2", "\83T\83\93\83v\83\8bC", 0);\r
+ note = new Note("id2", "\83T\83\93\83v\83\8bC", 0, 0);\r
add(db, note);\r
- note = new Note("id3", "abcdefg", 0);\r
+ note = new Note("id3", "abcdefg", 0, 0);\r
add(db, note);\r
- note = new Note("id4", "aXYZ\82 \82¢\82¤\82¦\82¨", 0);\r
+ note = new Note("id4", "aXYZ\82 \82¢\82¤\82¦\82¨", 0, 0);\r
add(db, note);\r
}\r
\r
public List<Note> search(){\r
- return search(null, null, "DATE");\r
+ return search(null, null, null);\r
}\r
\r
private List<Note> search(String selection, String[] selectionArgs, String orderBy){\r
Cursor cursor = db.query(\r
"NOTE",\r
new String[] {\r
- android.provider.BaseColumns._ID, "GUID", "TEXT", "DATE"},\r
+ android.provider.BaseColumns._ID, "GUID", "TEXT", "CREATED", "UPDATED"},\r
selection, selectionArgs, null, null, orderBy);\r
cursor.moveToFirst();\r
int size = cursor.getCount();\r
cursor.getLong(0),\r
cursor.getString(1),\r
cursor.getString(2),\r
- cursor.getLong(3));\r
+ cursor.getLong(3),\r
+ cursor.getLong(4));\r
list.add(note);\r
cursor.moveToNext();\r
}\r
SQLiteStatement stmt = insertStmt;\r
stmt.bindString(i++, note.getGuid());\r
stmt.bindString(i++, note.getText());\r
- stmt.bindLong(i++, note.getDate());\r
+ stmt.bindLong(i++, note.getCreated());\r
+ stmt.bindLong(i++, note.getUpdated());\r
id = stmt.executeInsert();\r
return id;\r
}\r
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());
+ n.getCreated(), n.getUpdated());
return note;
}
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);
+ notebook.getGuid(), notebook.getName(), -1, -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);
+ com.yuji.ec.db.Note item = new com.yuji.ec.db.Note(tag.getGuid(),
+ tag.getName(), -1, -1);
list.add(item);
}
return list;
--- /dev/null
+package com.yuji.ec.utility;
+
+import java.util.Comparator;
+
+import com.yuji.ec.common.Constant;
+import com.yuji.ec.db.Note;
+
+public class NoteComparator implements Comparator<Note> {
+ private int noteOrder;
+ private int orderBy;
+
+ public NoteComparator(int noteOrder, int orderBy){
+ this.noteOrder = noteOrder;
+ this.orderBy = orderBy;
+ }
+
+ public int compare(Note arg0, Note arg1) {
+ int comp = 0;
+
+ switch (noteOrder){
+ case Constant.NOTE_ORDER_CREATE:
+ comp = (int)(arg0.getCreated() - arg1.getCreated());
+ break;
+ case Constant.NOTE_ORDER_UPDATE:
+ comp = (int)(arg0.getUpdated() - arg1.getUpdated());
+ break;
+ case Constant.NOTE_ORDER_TEXT:
+ comp = arg0.getText().compareTo(arg1.getText());
+ break;
+ }
+
+ if (orderBy == Constant.NOTE_ORDER_BY_DES){
+ comp = -comp;
+ }
+
+ return comp;
+ }
+
+ /*
+ int noteOrder = pref.getInt(Constant.PREF_NOTE_ORDER,
+ Constant.NOTE_ORDER_CREATE);
+
+ int orderBy = pref.getInt(Constant.PREF_NOTE_ORDER_BY,
+ Constant.NOTE_ORDER_BY_ASC);
+ switch (orderBy) {
+ case Constant.NOTE_ORDER_BY_ASC:
+ break;
+ case Constant.NOTE_ORDER_BY_DES:
+ break;
+ }
+*/
+}
OSDN Git Service
