parent
e2d0d30bbf
commit
f0033b5dd5
@ -0,0 +1,230 @@
|
|||||||
|
Notes.java
|
||||||
|
|
||||||
|
public static final String INTENT_EXTRA_FONT_SIZE_ID = "net.micode.notes.font_size_id";
|
||||||
|
public static final String FONT_SIZE_ID = "font_size_id";
|
||||||
|
|
||||||
|
NotesDatabaseHelper.java
|
||||||
|
|
||||||
|
private static final String CREATE_NOTE_TABLE_SQL =
|
||||||
|
"CREATE TABLE " + TABLE.NOTE + "(" +
|
||||||
|
NoteColumns.ID + " INTEGER PRIMARY KEY," +
|
||||||
|
NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.FONT_SIZE_ID + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
|
||||||
|
NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
|
||||||
|
NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
|
||||||
|
NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
|
||||||
|
NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
|
||||||
|
NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
|
||||||
|
NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
|
||||||
|
")";
|
||||||
|
|
||||||
|
SqlNote.java
|
||||||
|
|
||||||
|
private int mFontSizeId;
|
||||||
|
|
||||||
|
int fontSizeId = note.has(NoteColumns.FONT_SIZE_ID) ? note
|
||||||
|
.getInt(NoteColumns.FONT_SIZE_ID) : ResourceParser.getDefaultBgId(mContext);
|
||||||
|
if(mIsCreate || mFontSizeId != fontSizeId) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.FONT_SIZE_ID,fontSizeId);
|
||||||
|
}
|
||||||
|
mFontSizeId = fontSizeId;
|
||||||
|
|
||||||
|
public JSONObject getContent() {
|
||||||
|
try {
|
||||||
|
JSONObject js = new JSONObject();
|
||||||
|
|
||||||
|
if (mIsCreate) {
|
||||||
|
Log.e(TAG, "it seems that we haven't created this in database yet");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
JSONObject note = new JSONObject();
|
||||||
|
if (mType == Notes.TYPE_NOTE) {
|
||||||
|
note.put(NoteColumns.ID, mId);
|
||||||
|
note.put(NoteColumns.ALERTED_DATE, mAlertDate);
|
||||||
|
note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
|
||||||
|
note.put(NoteColumns.FONT_SIZE_ID, mFontSizeId);
|
||||||
|
note.put(NoteColumns.CREATED_DATE, mCreatedDate);
|
||||||
|
note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
|
||||||
|
note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
|
||||||
|
note.put(NoteColumns.PARENT_ID, mParentId);
|
||||||
|
note.put(NoteColumns.SNIPPET, mSnippet);
|
||||||
|
note.put(NoteColumns.TYPE, mType);
|
||||||
|
note.put(NoteColumns.WIDGET_ID, mWidgetId);
|
||||||
|
note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
|
||||||
|
note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
|
||||||
|
js.put(GTaskStringUtils.META_HEAD_NOTE, note);
|
||||||
|
|
||||||
|
JSONArray dataArray = new JSONArray();
|
||||||
|
for (SqlData sqlData : mDataList) {
|
||||||
|
JSONObject data = sqlData.getContent();
|
||||||
|
if (data != null) {
|
||||||
|
dataArray.put(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
|
||||||
|
} else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
|
||||||
|
note.put(NoteColumns.ID, mId);
|
||||||
|
note.put(NoteColumns.TYPE, mType);
|
||||||
|
note.put(NoteColumns.SNIPPET, mSnippet);
|
||||||
|
js.put(GTaskStringUtils.META_HEAD_NOTE, note);
|
||||||
|
}
|
||||||
|
|
||||||
|
return js;
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.e(TAG, e.toString());
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public boolean setContent(JSONObject js) {
|
||||||
|
try {
|
||||||
|
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
|
||||||
|
if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
|
||||||
|
Log.w(TAG, "cannot set system folder");
|
||||||
|
} else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
|
||||||
|
// for folder we can only update the snnipet and type
|
||||||
|
String snippet = note.has(NoteColumns.SNIPPET) ? note
|
||||||
|
.getString(NoteColumns.SNIPPET) : "";
|
||||||
|
if (mIsCreate || !mSnippet.equals(snippet)) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
|
||||||
|
}
|
||||||
|
mSnippet = snippet;
|
||||||
|
|
||||||
|
int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
|
||||||
|
: Notes.TYPE_NOTE;
|
||||||
|
if (mIsCreate || mType != type) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.TYPE, type);
|
||||||
|
}
|
||||||
|
mType = type;
|
||||||
|
} else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
|
||||||
|
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
|
||||||
|
long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
|
||||||
|
if (mIsCreate || mId != id) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.ID, id);
|
||||||
|
}
|
||||||
|
mId = id;
|
||||||
|
|
||||||
|
long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
|
||||||
|
.getLong(NoteColumns.ALERTED_DATE) : 0;
|
||||||
|
if (mIsCreate || mAlertDate != alertDate) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
|
||||||
|
}
|
||||||
|
mAlertDate = alertDate;
|
||||||
|
|
||||||
|
int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
|
||||||
|
.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
|
||||||
|
if (mIsCreate || mBgColorId != bgColorId) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
|
||||||
|
}
|
||||||
|
mBgColorId = bgColorId;
|
||||||
|
|
||||||
|
int fontSizeId = note.has(NoteColumns.FONT_SIZE_ID) ? note
|
||||||
|
.getInt(NoteColumns.FONT_SIZE_ID) : ResourceParser.getDefaultBgId(mContext);
|
||||||
|
if(mIsCreate || mFontSizeId != fontSizeId) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.FONT_SIZE_ID,fontSizeId);
|
||||||
|
}
|
||||||
|
mFontSizeId = fontSizeId;
|
||||||
|
|
||||||
|
long createDate = note.has(NoteColumns.CREATED_DATE) ? note
|
||||||
|
.getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
|
||||||
|
if (mIsCreate || mCreatedDate != createDate) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
|
||||||
|
}
|
||||||
|
mCreatedDate = createDate;
|
||||||
|
|
||||||
|
int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
|
||||||
|
.getInt(NoteColumns.HAS_ATTACHMENT) : 0;
|
||||||
|
if (mIsCreate || mHasAttachment != hasAttachment) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
|
||||||
|
}
|
||||||
|
mHasAttachment = hasAttachment;
|
||||||
|
|
||||||
|
long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
|
||||||
|
.getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
|
||||||
|
if (mIsCreate || mModifiedDate != modifiedDate) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
|
||||||
|
}
|
||||||
|
mModifiedDate = modifiedDate;
|
||||||
|
|
||||||
|
long parentId = note.has(NoteColumns.PARENT_ID) ? note
|
||||||
|
.getLong(NoteColumns.PARENT_ID) : 0;
|
||||||
|
if (mIsCreate || mParentId != parentId) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
|
||||||
|
}
|
||||||
|
mParentId = parentId;
|
||||||
|
|
||||||
|
String snippet = note.has(NoteColumns.SNIPPET) ? note
|
||||||
|
.getString(NoteColumns.SNIPPET) : "";
|
||||||
|
if (mIsCreate || !mSnippet.equals(snippet)) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
|
||||||
|
}
|
||||||
|
mSnippet = snippet;
|
||||||
|
|
||||||
|
int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
|
||||||
|
: Notes.TYPE_NOTE;
|
||||||
|
if (mIsCreate || mType != type) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.TYPE, type);
|
||||||
|
}
|
||||||
|
mType = type;
|
||||||
|
|
||||||
|
int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
|
||||||
|
: AppWidgetManager.INVALID_APPWIDGET_ID;
|
||||||
|
if (mIsCreate || mWidgetId != widgetId) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
|
||||||
|
}
|
||||||
|
mWidgetId = widgetId;
|
||||||
|
|
||||||
|
int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
|
||||||
|
.getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
|
||||||
|
if (mIsCreate || mWidgetType != widgetType) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
|
||||||
|
}
|
||||||
|
mWidgetType = widgetType;
|
||||||
|
|
||||||
|
long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
|
||||||
|
.getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
|
||||||
|
if (mIsCreate || mOriginParent != originParent) {
|
||||||
|
mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
|
||||||
|
}
|
||||||
|
mOriginParent = originParent;
|
||||||
|
|
||||||
|
for (int i = 0; i < dataArray.length(); i++) {
|
||||||
|
JSONObject data = dataArray.getJSONObject(i);
|
||||||
|
SqlData sqlData = null;
|
||||||
|
if (data.has(DataColumns.ID)) {
|
||||||
|
long dataId = data.getLong(DataColumns.ID);
|
||||||
|
for (SqlData temp : mDataList) {
|
||||||
|
if (dataId == temp.getId()) {
|
||||||
|
sqlData = temp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sqlData == null) {
|
||||||
|
sqlData = new SqlData(mContext);
|
||||||
|
mDataList.add(sqlData);
|
||||||
|
}
|
||||||
|
|
||||||
|
sqlData.setContent(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.e(TAG, e.toString());
|
||||||
|
e.printStackTrace();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
@ -0,0 +1,133 @@
|
|||||||
|
ResourceParser.java
|
||||||
|
|
||||||
|
public static final int ORANGE = 5;
|
||||||
|
|
||||||
|
private final static int[] BG_EDIT_RESOURCES = new int[]{
|
||||||
|
R.drawable.edit_yellow,
|
||||||
|
R.drawable.edit_blue,
|
||||||
|
R.drawable.edit_white,
|
||||||
|
R.drawable.edit_green,
|
||||||
|
R.drawable.edit_red,
|
||||||
|
R.drawable.edit_orange
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_EDIT_TITLE_RESOURCES = new int[]{
|
||||||
|
R.drawable.edit_title_yellow,
|
||||||
|
R.drawable.edit_title_blue,
|
||||||
|
R.drawable.edit_title_white,
|
||||||
|
R.drawable.edit_title_green,
|
||||||
|
R.drawable.edit_title_red,
|
||||||
|
R.drawable.edit_title_orange
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_FIRST_RESOURCES = new int[]{
|
||||||
|
R.drawable.list_yellow_up,
|
||||||
|
R.drawable.list_blue_up,
|
||||||
|
R.drawable.list_white_up,
|
||||||
|
R.drawable.list_green_up,
|
||||||
|
R.drawable.list_red_up,
|
||||||
|
R.drawable.list_orange_up
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_NORMAL_RESOURCES = new int[]{
|
||||||
|
R.drawable.list_yellow_middle,
|
||||||
|
R.drawable.list_blue_middle,
|
||||||
|
R.drawable.list_white_middle,
|
||||||
|
R.drawable.list_green_middle,
|
||||||
|
R.drawable.list_red_middle,
|
||||||
|
R.drawable.list_orange_middle
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_LAST_RESOURCES = new int[]{
|
||||||
|
R.drawable.list_yellow_down,
|
||||||
|
R.drawable.list_blue_down,
|
||||||
|
R.drawable.list_white_down,
|
||||||
|
R.drawable.list_green_down,
|
||||||
|
R.drawable.list_red_down,
|
||||||
|
R.drawable.list_orange_down
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_SINGLE_RESOURCES = new int[]{
|
||||||
|
R.drawable.list_yellow_single,
|
||||||
|
R.drawable.list_blue_single,
|
||||||
|
R.drawable.list_white_single,
|
||||||
|
R.drawable.list_green_single,
|
||||||
|
R.drawable.list_red_single,
|
||||||
|
R.drawable.list_orange_single
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_2X_RESOURCES = new int[]{
|
||||||
|
R.drawable.widget_2x_yellow,
|
||||||
|
R.drawable.widget_2x_blue,
|
||||||
|
R.drawable.widget_2x_white,
|
||||||
|
R.drawable.widget_2x_green,
|
||||||
|
R.drawable.widget_2x_red,
|
||||||
|
R.drawable.widget_2x_orange
|
||||||
|
};
|
||||||
|
|
||||||
|
private final static int[] BG_4X_RESOURCES = new int[]{
|
||||||
|
R.drawable.widget_4x_yellow,
|
||||||
|
R.drawable.widget_4x_blue,
|
||||||
|
R.drawable.widget_4x_white,
|
||||||
|
R.drawable.widget_4x_green,
|
||||||
|
R.drawable.widget_4x_red,
|
||||||
|
R.drawable.widget_4x_orange
|
||||||
|
};
|
||||||
|
|
||||||
|
NoteEditActivity.java
|
||||||
|
|
||||||
|
static {
|
||||||
|
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
|
||||||
|
sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
|
||||||
|
sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
|
||||||
|
sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
|
||||||
|
sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
|
||||||
|
sBgSelectorBtnsMap.put(R.id.iv_bg_orange, ResourceParser.ORANGE);
|
||||||
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
|
||||||
|
sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
|
||||||
|
sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
|
||||||
|
sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
|
||||||
|
sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
|
||||||
|
sBgSelectorSelectionMap.put(ResourceParser.ORANGE, R.id.iv_bg_orange_select);
|
||||||
|
}
|
||||||
|
|
||||||
|
新增了美术素材
|
||||||
|
|
||||||
|
edit_orange.9.png
|
||||||
|
edit_title_orange.9.png
|
||||||
|
list_orange_down.9.png
|
||||||
|
list_orange_middle.9.png
|
||||||
|
list_orange_single.9.png
|
||||||
|
list_orange_up.9.png
|
||||||
|
note_edit_color_selector_panel.png
|
||||||
|
widget_2x_orange.png
|
||||||
|
widget_4x_orange.png
|
||||||
|
|
||||||
|
调整了布局文件
|
||||||
|
|
||||||
|
note_eidt.xml
|
||||||
|
|
||||||
|
<!-- 橙色背景(自定义)-->
|
||||||
|
<FrameLayout
|
||||||
|
android:layout_width="0dip"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/iv_bg_orange"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/iv_bg_orange_select"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="bottom|right"
|
||||||
|
android:focusable="false"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_marginRight="2dip"
|
||||||
|
android:src="@drawable/selected" />
|
||||||
|
</FrameLayout>
|
||||||
|
After Width: | Height: | Size: 182 KiB |
|
After Width: | Height: | Size: 133 KiB |
|
After Width: | Height: | Size: 44 KiB |
Loading…
Reference in new issue