From 71dcdc75b275865c52e4bde77a4474211644f73f Mon Sep 17 00:00:00 2001
From: Kk-juejuezi <253292942@qq.com>
Date: Thu, 20 Oct 2022 11:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/.idea/.gitignore | 2 -
src/main/.idea/codeStyles/Project.xml | 116 ------------------
src/main/.idea/main.iml | 9 --
src/main/.idea/modules.xml | 8 --
src/main/.idea/vcs.xml | 6 -
.../{ => net/micode}/notes/data/Contact.java | 0
.../{ => net/micode}/notes/data/Notes.java | 1 +
.../notes/data/NotesDatabaseHelper.java | 13 +-
.../micode}/notes/data/NotesProvider.java | 0
.../micode}/notes/gtask/data/MetaData.java | 0
.../notes/gtask/data/MetaData.java.bak | 0
.../micode}/notes/gtask/data/Node.java | 0
.../micode}/notes/gtask/data/SqlData.java | 0
.../micode}/notes/gtask/data/SqlNote.java | 12 +-
.../micode}/notes/gtask/data/Task.java | 0
.../micode}/notes/gtask/data/TaskList.java | 0
.../exception/ActionFailureException.java | 0
.../exception/NetworkFailureException.java | 0
.../notes/gtask/remote/GTaskASyncTask.java | 0
.../notes/gtask/remote/GTaskClient.java | 0
.../notes/gtask/remote/GTaskManager.java | 0
.../notes/gtask/remote/GTaskSyncService.java | 0
.../{ => net/micode}/notes/model/Note.java | 0
.../micode}/notes/model/WorkingNote.java | 24 +++-
.../micode}/notes/tool/BackupUtils.java | 0
.../micode}/notes/tool/DataUtils.java | 0
.../micode}/notes/tool/GTaskStringUtils.java | 0
.../micode}/notes/tool/ResourceParser.java | 0
.../micode}/notes/ui/AlarmAlertActivity.java | 0
.../micode}/notes/ui/AlarmInitReceiver.java | 0
.../notes/ui/AlarmInitReceiver.java.bak | 0
.../micode}/notes/ui/AlarmReceiver.java | 0
.../micode}/notes/ui/AlarmReceiver.java.bak | 0
.../micode}/notes/ui/DateTimePicker.java | 0
.../micode}/notes/ui/DateTimePicker.java.bak | 0
.../notes/ui/DateTimePickerDialog.java | 0
.../micode}/notes/ui/DropdownMenu.java | 0
.../micode}/notes/ui/FoldersListAdapter.java | 0
.../micode}/notes/ui/NoteEditActivity.java | 8 +-
.../notes/ui/NoteEditActivity.java.bak | 0
.../micode}/notes/ui/NoteEditText.java | 0
.../micode}/notes/ui/NoteItemData.java | 16 ++-
.../micode}/notes/ui/NotesListActivity.java | 2 +-
.../micode}/notes/ui/NotesListAdapter.java | 0
.../micode}/notes/ui/NotesListItem.java | 8 ++
.../notes/ui/NotesPreferenceActivity.java | 0
.../notes/widget/NoteWidgetProvider.java | 0
.../notes/widget/NoteWidgetProvider_2x.java | 0
.../notes/widget/NoteWidgetProvider_4x.java | 0
src/main/res/drawable-hdpi/title_tuding.png | Bin 0 -> 311 bytes
src/main/res/layout/note_item.xml | 9 ++
src/main/res/menu/note_edit.xml | 4 +-
src/main/res/values/strings.xml | 2 +
53 files changed, 89 insertions(+), 151 deletions(-)
delete mode 100644 src/main/.idea/.gitignore
delete mode 100644 src/main/.idea/codeStyles/Project.xml
delete mode 100644 src/main/.idea/main.iml
delete mode 100644 src/main/.idea/modules.xml
delete mode 100644 src/main/.idea/vcs.xml
rename src/main/java/{ => net/micode}/notes/data/Contact.java (100%)
rename src/main/java/{ => net/micode}/notes/data/Notes.java (99%)
rename src/main/java/{ => net/micode}/notes/data/NotesDatabaseHelper.java (98%)
rename src/main/java/{ => net/micode}/notes/data/NotesProvider.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/data/MetaData.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/data/MetaData.java.bak (100%)
rename src/main/java/{ => net/micode}/notes/gtask/data/Node.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/data/SqlData.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/data/SqlNote.java (98%)
rename src/main/java/{ => net/micode}/notes/gtask/data/Task.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/data/TaskList.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/exception/ActionFailureException.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/exception/NetworkFailureException.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/remote/GTaskASyncTask.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/remote/GTaskClient.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/remote/GTaskManager.java (100%)
rename src/main/java/{ => net/micode}/notes/gtask/remote/GTaskSyncService.java (100%)
rename src/main/java/{ => net/micode}/notes/model/Note.java (100%)
rename src/main/java/{ => net/micode}/notes/model/WorkingNote.java (96%)
rename src/main/java/{ => net/micode}/notes/tool/BackupUtils.java (100%)
rename src/main/java/{ => net/micode}/notes/tool/DataUtils.java (100%)
rename src/main/java/{ => net/micode}/notes/tool/GTaskStringUtils.java (100%)
rename src/main/java/{ => net/micode}/notes/tool/ResourceParser.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/AlarmAlertActivity.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/AlarmInitReceiver.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/AlarmInitReceiver.java.bak (100%)
rename src/main/java/{ => net/micode}/notes/ui/AlarmReceiver.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/AlarmReceiver.java.bak (100%)
rename src/main/java/{ => net/micode}/notes/ui/DateTimePicker.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/DateTimePicker.java.bak (100%)
rename src/main/java/{ => net/micode}/notes/ui/DateTimePickerDialog.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/DropdownMenu.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/FoldersListAdapter.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/NoteEditActivity.java (99%)
rename src/main/java/{ => net/micode}/notes/ui/NoteEditActivity.java.bak (100%)
rename src/main/java/{ => net/micode}/notes/ui/NoteEditText.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/NoteItemData.java (96%)
rename src/main/java/{ => net/micode}/notes/ui/NotesListActivity.java (99%)
rename src/main/java/{ => net/micode}/notes/ui/NotesListAdapter.java (100%)
rename src/main/java/{ => net/micode}/notes/ui/NotesListItem.java (95%)
rename src/main/java/{ => net/micode}/notes/ui/NotesPreferenceActivity.java (100%)
rename src/main/java/{ => net/micode}/notes/widget/NoteWidgetProvider.java (100%)
rename src/main/java/{ => net/micode}/notes/widget/NoteWidgetProvider_2x.java (100%)
rename src/main/java/{ => net/micode}/notes/widget/NoteWidgetProvider_4x.java (100%)
create mode 100644 src/main/res/drawable-hdpi/title_tuding.png
diff --git a/src/main/.idea/.gitignore b/src/main/.idea/.gitignore
deleted file mode 100644
index 5c98b42..0000000
--- a/src/main/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/src/main/.idea/codeStyles/Project.xml b/src/main/.idea/codeStyles/Project.xml
deleted file mode 100644
index 681f41a..0000000
--- a/src/main/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- xmlns:android
-
- ^$
-
-
-
-
-
-
-
-
- xmlns:.*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*:id
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- .*:name
-
- http://schemas.android.com/apk/res/android
-
-
-
-
-
-
-
-
- name
-
- ^$
-
-
-
-
-
-
-
-
- style
-
- ^$
-
-
-
-
-
-
-
-
- .*
-
- ^$
-
-
- BY_NAME
-
-
-
-
-
-
- .*
-
- http://schemas.android.com/apk/res/android
-
-
- ANDROID_ATTRIBUTE_ORDER
-
-
-
-
-
-
- .*
-
- .*
-
-
- BY_NAME
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/.idea/main.iml b/src/main/.idea/main.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/src/main/.idea/main.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/.idea/modules.xml b/src/main/.idea/modules.xml
deleted file mode 100644
index aaf7df4..0000000
--- a/src/main/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/.idea/vcs.xml b/src/main/.idea/vcs.xml
deleted file mode 100644
index b2bdec2..0000000
--- a/src/main/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java
similarity index 100%
rename from src/main/java/notes/data/Contact.java
rename to src/main/java/net/micode/notes/data/Contact.java
diff --git a/src/main/java/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java
similarity index 99%
rename from src/main/java/notes/data/Notes.java
rename to src/main/java/net/micode/notes/data/Notes.java
index a15bf19..3884cd4 100644
--- a/src/main/java/notes/data/Notes.java
+++ b/src/main/java/net/micode/notes/data/Notes.java
@@ -198,6 +198,7 @@ AUTHORITY + "/data");//定义查找数据的指针。
*/
public static final String PASSWORD = "set_password";//设置密码的什么东西啊？
public static final String TAG_PASSWORD = "set_tag";
+ public static final String TOP = "top";
}//这些常量主要是定义便签的属性的。
// 定义DataColumns的常量,用于后面创建数据库的表头
diff --git a/src/main/java/notes/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 98%
rename from src/main/java/notes/data/NotesDatabaseHelper.java
rename to src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index 274458b..253c26a 100644
--- a/src/main/java/notes/data/NotesDatabaseHelper.java
+++ b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -62,7 +62,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.PASSWORD + " TEXT NOT NULL DEFAULT ''," +
- NoteColumns.TAG_PASSWORD + " TEXT NOT NULL DEFAULT ''" +
+ NoteColumns.TAG_PASSWORD + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.TOP + " INTEGER NOT NULL DEFAULT 0" +
")";//数据库中需要存储的项目的名称，就相当于创建一个表格的表头的内容。
private static final String CREATE_DATA_TABLE_SQL =
@@ -337,6 +338,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
oldVersion++;
}
+ if (oldVersion == 6){
+ upgradeToV7(db);
+ oldVersion++;
+ }
+
if (reCreateTriggers) {
reCreateNoteTableTriggers(db);
reCreateDataTableTriggers(db);
@@ -384,4 +390,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TAG_PASSWORD
+ " INTEGER NOT NULL DEFAULT 0");
}
+
+ private void upgradeToV7(SQLiteDatabase db){
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TOP
+ + " INTEGER NOT NULL DEFAULT 0");
+ }
}
diff --git a/src/main/java/notes/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/main/java/notes/data/NotesProvider.java
rename to src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/src/main/java/notes/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/main/java/notes/gtask/data/MetaData.java
rename to src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/main/java/notes/gtask/data/MetaData.java.bak b/src/main/java/net/micode/notes/gtask/data/MetaData.java.bak
similarity index 100%
rename from src/main/java/notes/gtask/data/MetaData.java.bak
rename to src/main/java/net/micode/notes/gtask/data/MetaData.java.bak
diff --git a/src/main/java/notes/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from src/main/java/notes/gtask/data/Node.java
rename to src/main/java/net/micode/notes/gtask/data/Node.java
diff --git a/src/main/java/notes/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/main/java/notes/gtask/data/SqlData.java
rename to src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/main/java/notes/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 98%
rename from src/main/java/notes/gtask/data/SqlNote.java
rename to src/main/java/net/micode/notes/gtask/data/SqlNote.java
index 6e6452c..2eae91d 100644
--- a/src/main/java/notes/gtask/data/SqlNote.java
+++ b/src/main/java/net/micode/notes/gtask/data/SqlNote.java
@@ -61,7 +61,7 @@ public class SqlNote {
NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
- NoteColumns.VERSION
+ NoteColumns.VERSION,NoteColumns.TOP
};
//以下设置17个列的编号
@@ -99,6 +99,8 @@ public class SqlNote {
public static final int VERSION_COLUMN = 16;
+ public static final int Top_COLUMN = 17;
+
//一下定义了17个内部的变量，其中12个可以由content中获得，5个需要初始化为0或者new
private Context mContext;
@@ -135,6 +137,7 @@ public class SqlNote {
private ContentValues mDiffNoteValues;
private ArrayList mDataList;
+ private String mTop;
/*
* 功能描述：构造函数
@@ -149,6 +152,7 @@ public class SqlNote {
mIsCreate = true;
mId = INVALID_ID;
mAlertDate = 0;
+ mTop = getmTop();
mBgColorId = ResourceParser.getDefaultBgId(context);
mCreatedDate = System.currentTimeMillis();//调用系统函数获得创建时间
mHasAttachment = 0;
@@ -176,6 +180,7 @@ public class SqlNote {
mContext = context;
mContentResolver = context.getContentResolver();
mIsCreate = false;
+ mTop = getmTop();
loadFromCursor(c);
mDataList = new ArrayList();
//
@@ -195,6 +200,7 @@ public class SqlNote {
mContext = context;
mContentResolver = context.getContentResolver();
mIsCreate = false;
+ mTop = getmTop();
loadFromCursor(id);
mDataList = new ArrayList();
if (mType == Notes.TYPE_NOTE)
@@ -245,6 +251,7 @@ public class SqlNote {
mWidgetId = c.getInt(WIDGET_ID_COLUMN);
mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
mVersion = c.getLong(VERSION_COLUMN);
+ mTop = c.getString(Top_COLUMN);
}
/*
@@ -608,4 +615,7 @@ public class SqlNote {
mDiffNoteValues.clear();
mIsCreate = false;
}
+ public String getmTop(){
+ return mTop;
+ }
}
diff --git a/src/main/java/notes/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/main/java/notes/gtask/data/Task.java
rename to src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/src/main/java/notes/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/main/java/notes/gtask/data/TaskList.java
rename to src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/main/java/notes/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/main/java/notes/gtask/exception/ActionFailureException.java
rename to src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/main/java/notes/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/main/java/notes/gtask/exception/NetworkFailureException.java
rename to src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/main/java/notes/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 100%
rename from src/main/java/notes/gtask/remote/GTaskASyncTask.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
diff --git a/src/main/java/notes/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/main/java/notes/gtask/remote/GTaskClient.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/main/java/notes/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from src/main/java/notes/gtask/remote/GTaskManager.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/src/main/java/notes/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from src/main/java/notes/gtask/remote/GTaskSyncService.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/src/main/java/notes/model/Note.java b/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from src/main/java/notes/model/Note.java
rename to src/main/java/net/micode/notes/model/Note.java
diff --git a/src/main/java/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 96%
rename from src/main/java/notes/model/WorkingNote.java
rename to src/main/java/net/micode/notes/model/WorkingNote.java
index 637da5b..d813cae 100644
--- a/src/main/java/notes/model/WorkingNote.java
+++ b/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -43,6 +43,8 @@ public class WorkingNote {
private String mPassword = "";
private String mTag = "";
//note password,initial = 0
+ //TOP
+ private String mTop = "";
private int mMode;
private long mAlertDate;
@@ -85,7 +87,8 @@ public class WorkingNote {
NoteColumns.WIDGET_TYPE,
NoteColumns.MODIFIED_DATE,
NoteColumns.PASSWORD,
- NoteColumns.TAG_PASSWORD
+ NoteColumns.TAG_PASSWORD,
+ NoteColumns.TOP
};
private static final int DATA_ID_COLUMN = 0;
@@ -112,6 +115,8 @@ public class WorkingNote {
private static final int NOTE_TAG_PASSWORD_COLUMN = 7;
+ private static final int NOTE_TOP_COLUMN = 8;
+
// New note construct
public WorkingNote(Context context, long folderId) {
mContext = context;
@@ -123,6 +128,7 @@ public class WorkingNote {
mIsDeleted = false;
mMode = 0;
mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+ mTop = String.valueOf(getTopId());
}
// WorkingNote的构造函数
@@ -154,6 +160,7 @@ public class WorkingNote {
mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
mPassword = cursor.getString(NOTE_PASSWORD_COLUMN);
mTag = cursor.getString(NOTE_TAG_PASSWORD_COLUMN);
+ mTop = cursor.getString(NOTE_TOP_COLUMN);
}
cursor.close();
// 若不存在，报错
@@ -441,4 +448,19 @@ public class WorkingNote {
mNote.setNoteValue(NoteColumns.TAG_PASSWORD,String.valueOf(mTag));
}
+ public void setTop(String Top){
+ if (Top != mTop){
+ mTop = Top;
+ mNote.setNoteValue(NoteColumns.TOP,String.valueOf(mTop));
+ }
+ }
+
+ public int getTopId(){
+ if (mTop.equals("1")){
+ return 1;
+ }else {
+ return 0;
+ }
+ }
+
}
diff --git a/src/main/java/notes/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/main/java/notes/tool/BackupUtils.java
rename to src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/main/java/notes/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from src/main/java/notes/tool/DataUtils.java
rename to src/main/java/net/micode/notes/tool/DataUtils.java
diff --git a/src/main/java/notes/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from src/main/java/notes/tool/GTaskStringUtils.java
rename to src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/src/main/java/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from src/main/java/notes/tool/ResourceParser.java
rename to src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/src/main/java/notes/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 100%
rename from src/main/java/notes/ui/AlarmAlertActivity.java
rename to src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
diff --git a/src/main/java/notes/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 100%
rename from src/main/java/notes/ui/AlarmInitReceiver.java
rename to src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
diff --git a/src/main/java/notes/ui/AlarmInitReceiver.java.bak b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java.bak
similarity index 100%
rename from src/main/java/notes/ui/AlarmInitReceiver.java.bak
rename to src/main/java/net/micode/notes/ui/AlarmInitReceiver.java.bak
diff --git a/src/main/java/notes/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 100%
rename from src/main/java/notes/ui/AlarmReceiver.java
rename to src/main/java/net/micode/notes/ui/AlarmReceiver.java
diff --git a/src/main/java/notes/ui/AlarmReceiver.java.bak b/src/main/java/net/micode/notes/ui/AlarmReceiver.java.bak
similarity index 100%
rename from src/main/java/notes/ui/AlarmReceiver.java.bak
rename to src/main/java/net/micode/notes/ui/AlarmReceiver.java.bak
diff --git a/src/main/java/notes/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from src/main/java/notes/ui/DateTimePicker.java
rename to src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/src/main/java/notes/ui/DateTimePicker.java.bak b/src/main/java/net/micode/notes/ui/DateTimePicker.java.bak
similarity index 100%
rename from src/main/java/notes/ui/DateTimePicker.java.bak
rename to src/main/java/net/micode/notes/ui/DateTimePicker.java.bak
diff --git a/src/main/java/notes/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 100%
rename from src/main/java/notes/ui/DateTimePickerDialog.java
rename to src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
diff --git a/src/main/java/notes/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from src/main/java/notes/ui/DropdownMenu.java
rename to src/main/java/net/micode/notes/ui/DropdownMenu.java
diff --git a/src/main/java/notes/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from src/main/java/notes/ui/FoldersListAdapter.java
rename to src/main/java/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/src/main/java/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 99%
rename from src/main/java/notes/ui/NoteEditActivity.java
rename to src/main/java/net/micode/notes/ui/NoteEditActivity.java
index fd0838b..c49e37a 100644
--- a/src/main/java/notes/ui/NoteEditActivity.java
+++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -541,6 +541,10 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
menu.findItem(R.id.menu_alert).setVisible(false);
} else {
menu.findItem(R.id.menu_delete_remind).setVisible(false);
+ }if (mWorkingNote.getTopId() == 1){
+ menu.findItem(R.id.menu_top).setTitle("Cancel top");
+ }else {
+ menu.findItem(R.id.menu_top).setTitle("Top");
}
return true;
}
@@ -603,9 +607,9 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
mWorkingNote.setPassword("","");
Toast.makeText(NoteEditActivity.this,"Password unlocked successfully",Toast.LENGTH_SHORT).show();
break;
- case R.id.menu_new_note:
+ case R.id.menu_top:
//创建一个新的便签
- createNewNote();
+ mWorkingNote.setTop((mWorkingNote.getTopId())==1? "0" : "1");
break;
case R.id.menu_delete:
//删除便签
diff --git a/src/main/java/notes/ui/NoteEditActivity.java.bak b/src/main/java/net/micode/notes/ui/NoteEditActivity.java.bak
similarity index 100%
rename from src/main/java/notes/ui/NoteEditActivity.java.bak
rename to src/main/java/net/micode/notes/ui/NoteEditActivity.java.bak
diff --git a/src/main/java/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/main/java/notes/ui/NoteEditText.java
rename to src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/src/main/java/notes/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 96%
rename from src/main/java/notes/ui/NoteItemData.java
rename to src/main/java/net/micode/notes/ui/NoteItemData.java
index f424958..9d67af6 100644
--- a/src/main/java/notes/ui/NoteItemData.java
+++ b/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -41,7 +41,8 @@ public class NoteItemData {
NoteColumns.WIDGET_ID,
NoteColumns.WIDGET_TYPE,
NoteColumns.PASSWORD,
- NoteColumns.TAG_PASSWORD
+ NoteColumns.TAG_PASSWORD,
+ NoteColumns.TOP
};
//常量标记和数据就不一一标记了，意义翻译基本就知道
private static final int ID_COLUMN = 0;
@@ -58,6 +59,7 @@ public class NoteItemData {
private static final int WIDGET_TYPE_COLUMN = 11;
private static final int PASSWORD_COLUMN = 12;
private static final int TAG_PASSWORD_COLUMN = 13;
+ private static final int TOP_COLUMN = 14;
private long mId;
private long mAlertDate;
@@ -73,6 +75,7 @@ public class NoteItemData {
private int mWidgetType;
private String mPassword;
private String mTAG;
+ private String mTop;
private String mName;
private String mPhoneNumber;
@@ -100,7 +103,7 @@ public class NoteItemData {
mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
mPassword = cursor.getString(PASSWORD_COLUMN);
mTAG = cursor.getString(TAG_PASSWORD_COLUMN);
-
+ mTop = cursor.getString(TOP_COLUMN);
//初始化电话号码的信息
mPhoneNumber = "";
if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
@@ -241,4 +244,13 @@ public class NoteItemData {
public boolean hasPassword() { return mPassword.equals("") ;}
public String getmTAG() {return mTAG;}
+
+ public boolean isTOP() {
+ if(mTop.equals("1")){
+ return true;
+ }else{
+ return false;
+ }
+
+ }
}
diff --git a/src/main/java/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 99%
rename from src/main/java/notes/ui/NotesListActivity.java
rename to src/main/java/net/micode/notes/ui/NotesListActivity.java
index 93c406e..cb6c547 100644
--- a/src/main/java/notes/ui/NotesListActivity.java
+++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -437,7 +437,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
String.valueOf(mCurrentFolderId)
- }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }, NoteColumns.TOP + " DESC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
}
private final class BackgroundQueryHandler extends AsyncQueryHandler {
diff --git a/src/main/java/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from src/main/java/notes/ui/NotesListAdapter.java
rename to src/main/java/net/micode/notes/ui/NotesListAdapter.java
diff --git a/src/main/java/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 95%
rename from src/main/java/notes/ui/NotesListItem.java
rename to src/main/java/net/micode/notes/ui/NotesListItem.java
index 9f0f5f2..c7630c8 100644
--- a/src/main/java/notes/ui/NotesListItem.java
+++ b/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -39,6 +39,7 @@ public class NotesListItem extends LinearLayout {
private NoteItemData mItemData; //标签数据
private CheckBox mCheckBox; //打钩框
private ImageView mLocker;//锁图片
+ private ImageView mTop;//图钉图片
/*初始化基本信息*/
public NotesListItem(Context context) {
@@ -51,6 +52,7 @@ public class NotesListItem extends LinearLayout {
mCallName = (TextView) findViewById(R.id.tv_name);
mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
mLocker = (ImageView) findViewById(R.id.iv_locker);
+ mTop = (ImageView)findViewById(R.id.iv_top_icon);
}
///根据data的属性对各个控件的属性的控制，主要是可见性Visibility，内容setText，格式setTextAppearance
public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
@@ -113,6 +115,12 @@ public class NotesListItem extends LinearLayout {
String text = " 不给你看哟~" + " (tag:" + data.getmTAG() + ")";
mTitle.setText(text);
}
+ mTop.setImageResource(R.drawable.title_tuding);
+ if (data.isTOP()){
+ mTop.setVisibility(View.VISIBLE);
+ }else {
+ mTop.setVisibility(View.GONE);
+ }
///设置内容，获取相关时间，从data里编辑的日期中获取
mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
diff --git a/src/main/java/notes/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from src/main/java/notes/ui/NotesPreferenceActivity.java
rename to src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/src/main/java/notes/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/main/java/notes/widget/NoteWidgetProvider.java
rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/main/java/notes/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/main/java/notes/widget/NoteWidgetProvider_2x.java
rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/src/main/java/notes/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from src/main/java/notes/widget/NoteWidgetProvider_4x.java
rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
diff --git a/src/main/res/drawable-hdpi/title_tuding.png b/src/main/res/drawable-hdpi/title_tuding.png
new file mode 100644
index 0000000000000000000000000000000000000000..39d90b5ce7907b953e01a5389d6064bca5cb1e4c
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3oCO|{#S9E$svykh8Km+7DEQLT
z#WBR=_}giFxtanb+U!*qDJ+?mmD#bUZClnCwpV<+JF;?LaYbeMXRK_?xH!#yLVurB
zW90$yI60B?ANSNfcb^!w^^@tr>==)C``upunGxdhghjr9efl+ZKQ_xSPur
+
+
+
- Lock
Unlock
Add note
+ Top
+ Cancel top
Delete reminder successfully
Set reminder
Expired