*/
public static final String DATA1 = "data1";
/**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * Generic data column, the meaning is specific, used for
* integer data type
*
Type: INTEGER
*/
public static final String DATA2 = "data2";
/**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * Generic data column, the meaning is specific, used for
* TEXT data type
*
Type: TEXT
*/
public static final String DATA3 = "data3";
/**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * Generic data column, the meaning is specific, used for
* TEXT data type
*
Type: TEXT
*/
public static final String DATA4 = "data4";
/**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * Generic data column, the meaning is specific, used for
* TEXT data type
*
Type: TEXT
*/
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
new file mode 100644
index 0000000..42b7e40
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.gtask.data;
+
+import android.database.Cursor;
+
+import org.json.JSONObject;
+
+public abstract class Node {
+ public static final int SYNC_ACTION_NONE = 0;
+
+ public static final int SYNC_ACTION_ADD_REMOTE = 1;
+
+ public static final int SYNC_ACTION_ADD_LOCAL = 2;
+
+ public static final int SYNC_ACTION_DEL_REMOTE = 3;
+
+ public static final int SYNC_ACTION_DEL_LOCAL = 4;
+
+ public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
+
+ public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
+
+ public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
+
+ public static final int SYNC_ACTION_ERROR = 8;
+
+ private String mGid;
+
+ private String mName;
+
+ private long mLastModified;
+
+ private boolean mDeleted;
+ private String title;
+ private String content;
+
+ private boolean isPinned; // 置顶状态
+ private boolean isStarred; // 星标状态
+
+ public boolean isPinned() {
+ return isPinned;
+ }
+
+ public void setPinned(boolean pinned) {
+ isPinned = pinned;
+ }
+
+ public boolean isStarred() {
+ return isStarred;
+ }
+
+ public void setStarred(boolean starred) {
+ isStarred = starred;
+ }
+
+ public String getmGid() {
+ return mGid;
+ }
+
+ public void setmGid(String mGid) {
+ this.mGid = mGid;
+ }
+
+ public String getmName() {
+ return mName;
+ }
+
+ public void setmName(String mName) {
+ this.mName = mName;
+ }
+
+ public long getmLastModified() {
+ return mLastModified;
+ }
+
+ public void setmLastModified(long mLastModified) {
+ this.mLastModified = mLastModified;
+ }
+
+ public boolean ismDeleted() {
+ return mDeleted;
+ }
+
+ public void setmDeleted(boolean mDeleted) {
+ this.mDeleted = mDeleted;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Node() {
+ mGid = null;
+ mName = "";
+ mLastModified = 0;
+ mDeleted = false;
+ }
+
+ public abstract JSONObject getCreateAction(int actionId);
+
+ public abstract JSONObject getUpdateAction(int actionId);
+
+ public abstract void setContentByRemoteJSON(JSONObject js);
+
+ public abstract void setContentByLocalJSON(JSONObject js);
+
+ public abstract JSONObject getLocalJSONFromContent();
+
+ public abstract int getSyncAction(Cursor c);
+
+ public void setGid(String gid) {
+ this.mGid = gid;
+ }
+
+ public void setName(String name) {
+ this.mName = name;
+ }
+
+ public void setLastModified(long lastModified) {
+ this.mLastModified = lastModified;
+ }
+
+ public void setDeleted(boolean deleted) {
+ this.mDeleted = deleted;
+ }
+
+ public String getGid() {
+ return this.mGid;
+ }
+
+ public String getName() {
+ return this.mName;
+ }
+
+ public long getLastModified() {
+ return this.mLastModified;
+ }
+
+ public boolean getDeleted() {
+ return this.mDeleted;
+ }
+
+}
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 99%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index 0e332f3..5947524 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -64,17 +64,16 @@ public class GTaskASyncTask extends AsyncTask {
}
private void showNotification(int tickerId, String content) {
+
PendingIntent pendingIntent;
if (tickerId != R.string.ticker_success) {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesPreferenceActivity.class), 0);
-
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesListActivity.class), 0);
}
-
Notification.Builder builder = new Notification.Builder(mContext)
.setAutoCancel(true)
.setContentTitle(mContext.getString(R.string.app_name))
@@ -83,11 +82,10 @@ public class GTaskASyncTask extends AsyncTask {
.setWhen(System.currentTimeMillis())
.setOngoing(true);
Notification notification=builder.getNotification();
+
mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
}
-
-
@Override
protected Integer doInBackground(Void... unused) {
publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 99%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
index d2b4082..ba6820d 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -97,6 +97,7 @@ public class GTaskManager {
mLocalDeleteIdMap = new HashSet();
mGidToNid = new HashMap();
mNidToGid = new HashMap();
+
}
public static synchronized GTaskManager getInstance() {
@@ -104,11 +105,13 @@ public class GTaskManager {
mInstance = new GTaskManager();
}
return mInstance;
+
}
public synchronized void setActivityContext(Activity activity) {
// used for getting authtoken
mActivity = activity;
+
}
public int sync(Context context, GTaskASyncTask asyncTask) {
@@ -148,13 +151,16 @@ public class GTaskManager {
} catch (NetworkFailureException e) {
Log.e(TAG, e.toString());
return STATE_NETWORK_ERROR;
+
} catch (ActionFailureException e) {
Log.e(TAG, e.toString());
return STATE_INTERNAL_ERROR;
+
} catch (Exception e) {
Log.e(TAG, e.toString());
e.printStackTrace();
return STATE_INTERNAL_ERROR;
+
} finally {
mGTaskListHashMap.clear();
mGTaskHashMap.clear();
@@ -163,6 +169,7 @@ public class GTaskManager {
mGidToNid.clear();
mNidToGid.clear();
mSyncing = false;
+
}
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 99%
rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
index cca36f7..e136dde 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -42,6 +42,8 @@ public class GTaskSyncService extends Service {
private static String mSyncProgress = "";
+ //TODO
+ //同步操作
private void startSync() {
if (mSyncTask == null) {
mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/model/Note.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 98%
rename from src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
index be081e4..3e0791e 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -38,7 +38,7 @@ public class WorkingNote {
// Note Id
private long mNoteId;
// Note content
- private String mContent;
+ public String mContent;
// Note mode
private int mMode;
@@ -187,6 +187,8 @@ public class WorkingNote {
return new WorkingNote(context, id, 0);
}
+ //TODO
+ //保存便签（自动）
public synchronized boolean saveNote() {
if (isWorthSaving()) {
if (!existInDatabase()) {
@@ -229,6 +231,8 @@ public class WorkingNote {
mNoteSettingStatusListener = l;
}
+ //TODO
+ //删除提醒
public void setAlertDate(long date, boolean set) {
if (date != mAlertDate) {
mAlertDate = date;
@@ -247,6 +251,8 @@ public class WorkingNote {
}
}
+ //TODO
+ //修改便签背景颜色
public void setBgColorId(int id) {
if (id != mBgColorId) {
mBgColorId = id;
@@ -257,6 +263,8 @@ public class WorkingNote {
}
}
+ //TODO
+ //进入清单模式
public void setCheckListMode(int mode) {
if (mMode != mode) {
if (mNoteSettingStatusListener != null) {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 99%
rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
index 2a14982..7de6ac7 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
@@ -72,6 +72,8 @@ public class DataUtils {
return false;
}
+ // TODO
+ // 移动标签
public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
ContentValues values = new ContentValues();
values.put(NoteColumns.PARENT_ID, desFolderId);
@@ -80,6 +82,8 @@ public class DataUtils {
resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
}
+ // TODO
+ // 移动标签文件
public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids,
long folderId) {
if (ids == null) {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 83%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..ad74c15 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -41,34 +41,44 @@ import java.io.IOException;
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
- private long mNoteId;
- private String mSnippet;
+ private long mNoteId; //文本的id号
+ private String mSnippet; //闹钟提示出现的文本字段
private static final int SNIPPET_PREW_MAX_LEN = 60;
MediaPlayer mPlayer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ ////Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的
+ // onsaveInstanceState方法是用来保存Activity的状态的
+ // 能从onCreate的参数savedInsanceState中获得状态数据
requestWindowFeature(Window.FEATURE_NO_TITLE);
+ ////界面显示——无标题
final Window win = getWindow();
win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
if (!isScreenOn()) {
+ //保持窗体点亮
win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+ //点亮
| WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+ //允许窗体点亮时候锁屏
| WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+ //手机锁屏后到了闹钟提示时间，自动点亮屏幕
| WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
}
Intent intent = getIntent();
try {
+ //根据ID从数据库中获取标签的内容；
+ //getContentResolver（）是实现数据共享，实例存储。
mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
- : mSnippet;
+ : mSnippet;//判断标签片段是否达到符合长度
} catch (IllegalArgumentException e) {
e.printStackTrace();
return;
@@ -84,11 +94,14 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
private boolean isScreenOn() {
+ //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
return pm.isScreenOn();
}
private void playAlarmSound() {
+ //闹钟提示音激发
+ //调用系统的铃声管理URI，得到闹钟提示音
Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
int silentModeStreams = Settings.System.getInt(getContentResolver(),
@@ -101,8 +114,11 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
try {
mPlayer.setDataSource(this, url);
+ //准备同步
mPlayer.prepare();
+ //设置循环播放
mPlayer.setLooping(true);
+ //开始播放
mPlayer.start();
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 93%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..d54cf6a 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -35,12 +35,14 @@ public class AlarmInitReceiver extends BroadcastReceiver {
NoteColumns.ALERTED_DATE
};
+ //对数据库的操作，调用标签ID和闹钟时间
private static final int COLUMN_ID = 0;
private static final int COLUMN_ALERTED_DATE = 1;
@Override
public void onReceive(Context context, Intent intent) {
long currentDate = System.currentTimeMillis();
+ //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 75%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..85d7c22 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -22,9 +22,15 @@ import android.content.Intent;
public class AlarmReceiver extends BroadcastReceiver {
@Override
+ //启动AlarmAlertActivity
public void onReceive(Context context, Intent intent) {
intent.setClass(context, AlarmAlertActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
+ //所以要新起一个栈装入启动的activity
+
context.startActivity(intent);
}
}
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还需要深究但是对于setClass和addFlags
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 97%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
index 496b0cd..f796b56 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -28,6 +28,8 @@ import android.view.View;
import android.widget.FrameLayout;
import android.widget.NumberPicker;
+//FrameLayout是布局模板之一
+//所有的子元素全部在屏幕的右上方
public class DateTimePicker extends FrameLayout {
private static final boolean DEFAULT_ENABLE_STATE = true;
@@ -83,6 +85,7 @@ public class DateTimePicker extends FrameLayout {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
isDateChanged = true;
+ //这里是对于12小时制时，晚上11点和12点交替时对日期的更改
} else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
@@ -94,6 +97,7 @@ public class DateTimePicker extends FrameLayout {
updateAmPmControl();
}
} else {
+ //24小时
if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
@@ -117,10 +121,14 @@ public class DateTimePicker extends FrameLayout {
private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
+ //这里是对 分钟（Minute）改变的监听
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int minValue = mMinuteSpinner.getMinValue();
int maxValue = mMinuteSpinner.getMaxValue();
int offset = 0;
+ //如果原值为59，新值为0，则offset加1
+ //如果原值为0，新值为59，则offset减1
+
if (oldVal == maxValue && newVal == minValue) {
offset += 1;
} else if (oldVal == minValue && newVal == maxValue) {
@@ -167,6 +175,7 @@ public class DateTimePicker extends FrameLayout {
this(context, System.currentTimeMillis());
}
+ //通过对数据库的访问，获取当前的系统时间
public DateTimePicker(Context context, long date) {
this(context, date, DateFormat.is24HourFormat(context));
}
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 84%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..ff7f1c9 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -33,9 +33,12 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
private Calendar mDate = Calendar.getInstance();
private boolean mIs24HourView;
- private OnDateTimeSetListener mOnDateTimeSetListener;
+ private OnDateTimeSetListener mOnDateTimeSetListener; //滚动日期选择
private DateTimePicker mDateTimePicker;
+ //DateTimePicker控件，控件一般用于让用户可以从日期列表中选择单个值。
+ //运行时，单击控件边上的下拉箭头，会显示为两个部分：一个下拉列表，一个用于选择日期的
+
public interface OnDateTimeSetListener {
void OnDateTimeSet(AlertDialog dialog, long date);
}
@@ -47,6 +50,8 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
public void onDateTimeChanged(DateTimePicker view, int year, int month,
int dayOfMonth, int hourOfDay, int minute) {
+ //将视图中的各选项设置为系统当前时间
+
mDate.set(Calendar.YEAR, year);
mDate.set(Calendar.MONTH, month);
mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
@@ -56,6 +61,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
}
});
mDate.setTimeInMillis(date);
+ //系统时间
mDate.set(Calendar.SECOND, 0);
mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
setButton(context.getString(R.string.datetime_dialog_ok), this);
@@ -80,11 +86,15 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
}
+ //android开发中常见日期管理工具类（API）——DateUtils：按照上下午显示时间
public void onClick(DialogInterface arg0, int arg1) {
if (mOnDateTimeSetListener != null) {
mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
}
+ //第一个参数arg0是接收到点击事件的对话框
+ //第二个参数arg1是该对话框上的按钮
+
}
}
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 86%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..eb73582 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -30,14 +30,19 @@ import net.micode.notes.R;
public class DropdownMenu {
private Button mButton;
private PopupMenu mPopupMenu;
+ //声明一个下拉菜单
private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
+
mButton = button;
- mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ mButton.setBackgroundResource(R.drawable.dropdown_icon);//设置view背景
mPopupMenu = new PopupMenu(context, mButton);
mMenu = mPopupMenu.getMenu();
mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
+
+ //MenuInflater是用来实例化Menu目录下的Menu布局文件
+ //根据ID来确认menu的内容选项
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
mPopupMenu.show();
@@ -45,16 +50,19 @@ public class DropdownMenu {
});
}
+ //设置菜单的监听
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
if (mPopupMenu != null) {
mPopupMenu.setOnMenuItemClickListener(listener);
}
}
+ //对于菜单选项的初始化，根据索引搜索菜单需要的选项
public MenuItem findItem(int id) {
return mMenu.findItem(id);
}
+ //设置标题
public void setTitle(CharSequence title) {
mButton.setText(title);
}
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 86%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..a4093e1 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -30,6 +30,12 @@ import net.micode.notes.data.Notes.NoteColumns;
public class FoldersListAdapter extends CursorAdapter {
+ //CursorAdapter是Cursor和ListView的接口
+ //FoldersListAdapter继承了CursorAdapter的类
+ //主要作用是便签数据库和用户的交互
+ //这里就是用folder（文件夹）的形式展现给用户
+
+ //调用便签的id和片段
public static final String [] PROJECTION = {
NoteColumns.ID,
NoteColumns.SNIPPET
@@ -38,6 +44,7 @@ public class FoldersListAdapter extends CursorAdapter {
public static final int ID_COLUMN = 0;
public static final int NAME_COLUMN = 1;
+ //数据库
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
// TODO Auto-generated constructor stub
@@ -48,6 +55,7 @@ public class FoldersListAdapter extends CursorAdapter {
return new FolderListItem(context);
}
+ //视图布局绑定
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof FolderListItem) {
@@ -68,7 +76,9 @@ public class FoldersListAdapter extends CursorAdapter {
public FolderListItem(Context context) {
super(context);
+ //操作数据库
inflate(context, R.layout.folder_list_item, this);
+ //根据布局文件的名字等信息将其找出来
mName = (TextView) findViewById(R.id.tv_folder_name);
}
diff --git a/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/LoginActivity.java
new file mode 100644
index 0000000..02035df
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/LoginActivity.java
@@ -0,0 +1,6 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+
+public class LoginActivity extends Activity {
+}
diff --git a/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
new file mode 100644
index 0000000..11fe21d
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -0,0 +1,1267 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.app.SearchManager;
+import android.appwidget.AppWidgetManager;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Paint;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.format.DateUtils;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ImageSpan;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageSwitcher;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.TextNote;
+import net.micode.notes.model.WorkingNote;
+import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
+import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
+import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
+import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_4x;
+
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.function.ToDoubleBiFunction;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+//该类主要是针对标签的编辑
+//继承了系统内部许多和监听有关的类
+
+public class NoteEditActivity extends AppCompatActivity implements OnClickListener,
+ NoteSettingChangedListener, OnTextViewChangeListener {
+ private int mode;
+
+ private class HeadViewHolder {
+ public TextView tvModified;
+
+ public ImageView ivAlertIcon;
+
+ public TextView tvAlertDate;
+
+ public ImageView ibSetBgColor;
+ }
+
+ //Map实现数据管理
+ private static final Map sBgSelectorBtnsMap = new HashMap();
+ 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);
+ }
+
+ private static final Map sBgSelectorSelectionMap = new HashMap();
+ 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);
+ }
+
+ private static final Map sFontSizeBtnsMap = new HashMap();
+ static {
+ sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
+ sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
+ sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
+ sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
+ }
+
+ private static final Map sFontSelectorSelectionMap = new HashMap();
+ static {
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
+ }
+
+ private static final String TAG = "NoteEditActivity";
+ //私有化一个界面操作mHeadViewPanel，对表头的操作
+ private HeadViewHolder mNoteHeaderHolder;
+
+ private View mHeadViewPanel;
+
+ private View mNoteBgColorSelector;
+ //私有化一个界面操作mFontSizeSelector，对标签字体的操作
+ private View mFontSizeSelector;
+ //声明编辑控件，对文本操作
+ private EditText mNoteEditor;
+ //私有化一个界面操作mNoteEditorPanel，文本编辑的控制板
+ private View mNoteEditorPanel;
+ //对模板WorkingNote的初始化
+ private WorkingNote mWorkingNote;
+ //私有化SharedPreferences的数据存储方式
+ //它的本质是基于XML文件存储key-value键值对数据
+ private SharedPreferences mSharedPrefs;
+ private int mFontSizeId;
+
+ private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
+
+ private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
+
+ public static final String TAG_CHECKED = String.valueOf('\u221A');
+ public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
+
+ private LinearLayout mEditTextList;
+
+ private String mUserQuery;
+ private Pattern mPattern;
+ private final int PHOTO_REQUEST = 1;//请求码
+
+ private NoteEditText editText;
+ private TextView textView;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ this.setContentView(R.layout.note_edit);
+
+ if (savedInstanceState == null && !initActivityState(getIntent())) {
+ finish();
+ return;
+ }
+ initResources();
+
+ //在Activity后实现的点击图标,但是为了目录导航栏的统一,使用了AppCompatActivity的目录功能
+// //根据id获取添加图片按钮
+// final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
+// //为点击图片按钮设置监听器
+// add_img_btn.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View view) {
+// Log.d(TAG, "onClick: click add image button");
+// //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音）
+// Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
+// //Category属性用于指定当前动作（Action）被执行的环境.
+// //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
+// loadImage.addCategory(Intent.CATEGORY_OPENABLE);
+// loadImage.setType("image/*");
+// startActivityForResult(loadImage, PHOTO_REQUEST);
+// }
+// });
+
+ editText = findViewById(R.id.note_edit_view);
+ textView = findViewById(R.id.text_num);
+ // 添加文本改变监听器
+ editText.addTextChangedListener(new TextWatcher() {
+ int currentLength = 0;
+
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ textView.setText("字数：" + currentLength);
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ String processedText = removeImagesAndLinks(editText.getText().toString());
+ currentLength = processedText.length();
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ textView.setText("字数：" + currentLength);
+ }
+ });
+
+ }
+ private String removeImagesAndLinks(String text) {
+ // 剔除标签
+ text = text.replaceAll("]*>", "");
+ // 剔除链接
+ text = text.replaceAll("]*>(.*?)", "");
+ // 剔除图片路径名称字符
+ text = text.replaceAll("\\[local\\].*?\\[/local\\]", "");
+ // 剔除换行符和空格
+ text = text.replaceAll("\\s", "");
+ return text;
+
+// StringBuffer stringBuffer = new StringBuffer(text);
+// // 剔除标签
+//
+// // 剔除链接
+//
+// int Flag1 = -1;
+// int Flag2 = -1;
+// do {//不计入表示图片的字符
+// Flag1 = stringBuffer.indexOf("[local]");
+// Flag2 = stringBuffer.indexOf("[/local]");
+// if (Flag1 != -1 && Flag2 != -1) {
+// stringBuffer = stringBuffer.replace(Flag1, Flag2+1, "");
+// }
+// } while (Flag1 != -1 && Flag2 != -1);
+// do {//不计入换行字符
+// Flag1 = stringBuffer.indexOf("\n");
+// if (Flag1 != -1){
+// stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
+// }
+// } while (Flag1 != -1);
+// do {//不计入空格字符
+// Flag1 = stringBuffer.indexOf(" ");
+// if (Flag1 != -1) {
+// stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
+// }
+// } while (Flag1 != -1);
+// return stringBuffer.toString();
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.note_edit, menu);
+ return true;
+ }
+
+
+ /**
+ * Current activity may be killed when the memory is low. Once it is killed, for another time
+ * user load this activity, we should restore the former state
+ */
+ @Override
+ protected void onRestoreInstanceState(Bundle savedInstanceState) {
+ super.onRestoreInstanceState(savedInstanceState);
+ if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
+ if (!initActivityState(intent)) {
+ finish();
+ return;
+ }
+ Log.d(TAG, "Restoring from killed activity");
+ }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
+ }
+
+ private boolean initActivityState(Intent intent) {
+ /**
+ * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
+ * then jump to the NotesListActivity
+ */
+ mWorkingNote = null;
+ if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
+ long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
+ mUserQuery = "";
+
+ /**
+ * Starting from the searched result
+ */
+ if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
+ noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
+ mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
+ }
+
+ if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
+ Intent jump = new Intent(this, NotesListActivity.class);
+ startActivity(jump);
+ showToast(R.string.error_note_not_exist);
+ finish();
+ return false;
+ } else {
+ mWorkingNote = WorkingNote.load(this, noteId);
+ if (mWorkingNote == null) {
+ Log.e(TAG, "load note failed with note id" + noteId);
+ finish();
+ return false;
+ }
+ }
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
+ | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+ } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
+ // New note
+ long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
+ int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
+ AppWidgetManager.INVALID_APPWIDGET_ID);
+ int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
+ Notes.TYPE_WIDGET_INVALIDE);
+ int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
+ ResourceParser.getDefaultBgId(this));
+
+ // Parse call-record note
+ String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
+ long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
+ if (callDate != 0 && phoneNumber != null) {
+ if (TextUtils.isEmpty(phoneNumber)) {
+ Log.w(TAG, "The call record number is null");
+ }
+ long noteId = 0;
+ if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
+ phoneNumber, callDate)) > 0) {
+ mWorkingNote = WorkingNote.load(this, noteId);
+ if (mWorkingNote == null) {
+ Log.e(TAG, "load call note failed with note id" + noteId);
+ finish();
+ return false;
+ }
+ } else {
+ mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
+ widgetType, bgResId);
+ mWorkingNote.convertToCallNote(phoneNumber, callDate);
+ }
+ } else {
+ mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
+ bgResId);
+ }
+
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+ | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+ } else {
+ Log.e(TAG, "Intent not specified action, should not support");
+ finish();
+ return false;
+ }
+ mWorkingNote.setOnSettingStatusChangedListener(this);
+ return true;
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ initNoteScreen();
+ }
+
+ //设置外观
+ private void initNoteScreen() {
+ mNoteEditor.setTextAppearance(this, TextAppearanceResources
+ .getTexAppearanceResource(mFontSizeId));
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ switchToListMode(mWorkingNote.getContent());
+ } else {
+ mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+ mNoteEditor.setSelection(mNoteEditor.getText().length());
+ }
+ for (Integer id : sBgSelectorSelectionMap.keySet()) {
+ findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
+ }
+ mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
+ mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+
+ mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
+ mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
+ | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
+ | DateUtils.FORMAT_SHOW_YEAR));
+
+ /**
+ * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
+ * is not ready
+ */
+ showAlertHeader();
+
+ //!注意这里需要将有图片的位置转换图片格式
+ convertToImage();
+ }
+
+ private void showAlertHeader() {
+ if (mWorkingNote.hasClockAlert()) {
+ long time = System.currentTimeMillis();
+ if (time > mWorkingNote.getAlertDate()) {
+ mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
+ } else {
+ mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
+ mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
+ }
+ mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
+ mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
+ } else {
+ mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
+ mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
+ };
+ }
+
+ //路径字符串格式 转换为 图片image格式
+ private void convertToImage() {
+ NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
+ Editable editable = noteEditText.getText();//1.获取text
+ String noteText = editable.toString(); //2.将note内容转换为字符串
+ int length = editable.length(); //内容的长度
+ //3.截取img片段 [local]+uri+[local]，提取uri
+ for(int i = 0; i < length; i++) {
+ for(int j = i; j < length; j++) {
+ String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段
+ if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){
+ int limit = 7; //[local]为7个字符
+ //[local][/local]共15个字符，剩下的为真正的path长度
+ int len = img_fragment.length()-15;
+ //从[local]之后的len个字符就是path
+ String path = img_fragment.substring(limit,limit+len);//获取到了图片路径
+ Bitmap bitmap = null;
+ Log.d(TAG, "图片的路径是："+path);
+ try {
+ bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(bitmap!=null){ //若图片存在
+ Log.d(TAG, "图片不为null");
+ ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+ //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
+ String ss = "[local]" + path + "[/local]";
+ SpannableString spannableString = new SpannableString(ss);
+ //5.将指定的标记对象附加到文本的开始...结束范围
+ spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ Log.d(TAG, "Create spannable string success!");
+ Editable edit_text = noteEditText.getEditableText();
+ edit_text.delete(i,i+len+15); //6.删掉图片路径的文字
+ edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
+ }
+ }
+ }
+ }
+ }
+
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ initActivityState(intent);
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ //在创建一个新的标签时，先在数据库中匹配
+ //如果不存在，那么先在数据库中存储
+ /**
+ * For new note without note id, we should firstly save it to
+ * generate a id. If the editing note is not worth saving, there
+ * is no id which is equivalent to create new note
+ */
+ if (!mWorkingNote.existInDatabase()) {
+ saveNote();
+ }
+ outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
+ Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent ev) {
+ if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
+ && !inRangeOfView(mNoteBgColorSelector, ev)) {
+ mNoteBgColorSelector.setVisibility(View.GONE);
+ return true;
+ }
+
+ if (mFontSizeSelector.getVisibility() == View.VISIBLE
+ && !inRangeOfView(mFontSizeSelector, ev)) {
+ mFontSizeSelector.setVisibility(View.GONE);
+ return true;
+ }
+ return super.dispatchTouchEvent(ev);
+ }
+
+ //对屏幕触控的坐标范围进行操作
+ private boolean inRangeOfView(View view, MotionEvent ev) {
+ int []location = new int[2];
+ view.getLocationOnScreen(location);
+ int x = location[0];
+ int y = location[1];
+ if (ev.getX() < x
+ || ev.getX() > (x + view.getWidth())
+ || ev.getY() < y
+ || ev.getY() > (y + view.getHeight())) {
+ return false;
+ }
+ return true;
+ }
+
+ private void initResources() {
+ mHeadViewPanel = findViewById(R.id.note_title);
+ mNoteHeaderHolder = new HeadViewHolder();
+ mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
+ mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
+ mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
+ mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
+ mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
+ mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
+ mNoteEditorPanel = findViewById(R.id.sv_note_edit);
+ mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
+ for (int id : sBgSelectorBtnsMap.keySet()) {
+ ImageView iv = (ImageView) findViewById(id);
+ iv.setOnClickListener(this);
+ }
+
+ mFontSizeSelector = findViewById(R.id.font_size_selector);
+ for (int id : sFontSizeBtnsMap.keySet()) {
+ View view = findViewById(id);
+ view.setOnClickListener(this);
+ };
+ mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
+ /**
+ * HACKME: Fix bug of store the resource id in shared preference.
+ * The id may larger than the length of resources, in this case,
+ * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
+ */
+ if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
+ mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
+ }
+ mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ if(saveNote()) {
+ Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
+ }
+ clearSettingState();
+ }
+
+ //和桌面小工具的同步
+ private void updateWidget() {
+ Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+ if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
+ intent.setClass(this, NoteWidgetProvider_2x.class);
+ } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
+ intent.setClass(this, NoteWidgetProvider_4x.class);
+ } else {
+ Log.e(TAG, "Unspported widget type");
+ return;
+ }
+
+ intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
+ mWorkingNote.getWidgetId()
+ });
+
+ sendBroadcast(intent);
+ setResult(RESULT_OK, intent);
+ }
+
+ public void onClick(View v) {
+ int id = v.getId();
+ if (id == R.id.btn_set_bg_color) {
+ mNoteBgColorSelector.setVisibility(View.VISIBLE);
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.VISIBLE);
+ } else if (sBgSelectorBtnsMap.containsKey(id)) {
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.GONE);
+ mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
+ mNoteBgColorSelector.setVisibility(View.GONE);
+ } else if (sFontSizeBtnsMap.containsKey(id)) {
+ findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
+ mFontSizeId = sFontSizeBtnsMap.get(id);
+ mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
+ findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ getWorkingText();
+ switchToListMode(mWorkingNote.getContent());
+ } else {
+ mNoteEditor.setTextAppearance(this,
+ TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ }
+ mFontSizeSelector.setVisibility(View.GONE);
+ }
+ }
+
+ @Override
+ public void onBackPressed() {
+ if(clearSettingState()) {
+ return;
+ }
+
+ saveNote();
+ super.onBackPressed();
+ }
+
+ private boolean clearSettingState() {
+ if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
+ mNoteBgColorSelector.setVisibility(View.GONE);
+ return true;
+ } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
+ mFontSizeSelector.setVisibility(View.GONE);
+ return true;
+ }
+ return false;
+ }
+
+ public void onBackgroundColorChanged() {
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.VISIBLE);
+ mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+ mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
+ }
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ if (isFinishing()) {
+ return true;
+ }
+ clearSettingState();
+ menu.clear();
+ if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
+ getMenuInflater().inflate(R.menu.call_note_edit, menu);
+ } else {
+ getMenuInflater().inflate(R.menu.note_edit, menu);
+ }
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
+ } else {
+ menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
+ }
+ if (mWorkingNote.hasClockAlert()) {
+ menu.findItem(R.id.menu_alert).setVisible(false);
+ } else {
+ menu.findItem(R.id.menu_delete_remind).setVisible(false);
+ }
+// //更换背景
+// if(mode==0){
+// menu.findItem(R.id.menu_hutao).setVisible(false);
+// }else if(mode==1){
+// menu.findItem(R.id.menu_keli).setVisible(false);
+// } else if (mode==2) {
+// menu.findItem(R.id.menu_moren).setVisible(false);
+// }
+
+ return true;
+ }
+
+ //删除标签，修改字体大小
+ //ToDo
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_new_note:
+ createNewNote();
+ break;
+ case R.id.menu_delete:
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(getString(R.string.alert_title_delete));
+ builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setMessage(getString(R.string.alert_message_delete_note));
+ builder.setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ deleteCurrentNote();
+ finish();
+ }
+ });
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.show();
+ break;
+ case R.id.menu_font_size:
+ mFontSizeSelector.setVisibility(View.VISIBLE);
+ findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ break;
+ case R.id.menu_list_mode:
+ mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
+ TextNote.MODE_CHECK_LIST : 0);
+ break;
+ case R.id.menu_share:
+ getWorkingText();
+ sendTo(this, mWorkingNote.getContent());
+ break;
+ case R.id.menu_send_to_desktop:
+ sendToDesktop();
+ break;
+ case R.id.menu_alert:
+ setReminder();
+ break;
+ case R.id.menu_delete_remind:
+ mWorkingNote.setAlertDate(0, false);
+ break;
+ case R.id.menu_select_image:
+ // 用户点击了选择图片菜单项
+ Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
+ loadImage.addCategory(Intent.CATEGORY_OPENABLE);
+ loadImage.setType("image/*");
+ startActivityForResult(loadImage, PHOTO_REQUEST);
+ break;
+ case R.id.menu_hutao:
+ mode=0;
+ getWindow().setBackgroundDrawableResource(R.drawable.hutao);
+ break;
+
+ case R.id.menu_keli:
+ mode=1;
+ getWindow().setBackgroundDrawableResource(R.drawable.keli);
+ break;
+
+ case R.id.menu_moren:
+ mode=2;
+ getWindow().setBackgroundDrawableResource(R.drawable.mi1);
+ break;
+
+ default:
+ break;
+
+ }
+ return true;
+ }
+
+ //TODO
+ //添加提醒
+ private void setReminder() {
+ DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+ d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
+ public void OnDateTimeSet(AlertDialog dialog, long date) {
+ mWorkingNote.setAlertDate(date , true);
+ }
+ });
+ d.show();
+ }
+
+ /**
+ * Share note to apps that support {@link Intent#ACTION_SEND} action
+ * and {@text/plain} type
+ */
+ //TODO
+ //分享
+ private void sendTo(Context context, String info) {
+ Intent intent = new Intent(Intent.ACTION_SEND);
+ intent.putExtra(Intent.EXTRA_TEXT, info);
+ intent.setType("text/plain");
+ context.startActivity(intent);
+ }
+
+ // 新建标签
+ //TODO
+ private void createNewNote() {
+ // Firstly, save current editing notes
+ saveNote();
+
+ // For safety, start a new NoteEditActivity
+ finish();
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+ startActivity(intent);
+ }
+
+ private void deleteCurrentNote() {
+ if (mWorkingNote.existInDatabase()) {
+ //假如当前运行的便签内存有数据
+ HashSet ids = new HashSet();
+ long id = mWorkingNote.getNoteId();
+ if (id != Notes.ID_ROOT_FOLDER) {
+ ids.add(id);
+ } else {
+ Log.d(TAG, "Wrong note id, should not happen");
+ }
+ if (!isSyncMode()) {
+ if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
+ Log.e(TAG, "Delete Note error");
+ }
+ } else {
+ if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
+ Log.e(TAG, "Move notes to trash folder error, should not happens");
+ }
+ }
+ }
+ mWorkingNote.markDeleted(true);
+ }
+
+ private boolean isSyncMode() {
+ return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
+ }
+
+ public void onClockAlertChanged(long date, boolean set) {
+ /**
+ * User could set clock to an unsaved note, so before setting the
+ * alert clock, we should save the note first
+ */
+ if (!mWorkingNote.existInDatabase()) {
+ saveNote();
+ }
+ if (mWorkingNote.getNoteId() > 0) {
+ Intent intent = new Intent(this, AlarmReceiver.class);
+ intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+ AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+ showAlertHeader();
+ if(!set) {
+ alarmManager.cancel(pendingIntent);
+ } else {
+ alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
+ }
+ } else {
+ /**
+ * There is the condition that user has input nothing (the note is
+ * not worthy saving), we have no note id, remind the user that he
+ * should input something
+ */
+ Log.e(TAG, "Clock alert setting error");
+ showToast(R.string.error_note_empty_for_clock);
+ }
+ }
+
+ public void onWidgetChanged() {
+ updateWidget();
+ }
+
+ /*
+ * 函数功能： 删除编辑文本框所触发的事件
+ * 函数实现：如下注释
+ */
+ public void onEditTextDelete(int index, String text) {
+ int childCount = mEditTextList.getChildCount();//没有编辑框的话直接返回
+ if (childCount == 1) {
+ return;
+ }
+
+ for (int i = index + 1; i < childCount; i++) {
+ ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
+ .setIndex(i - 1); //通过id把编辑框存在便签编辑框中
+ }
+
+ mEditTextList.removeViewAt(index); //删除特定位置的视图
+ NoteEditText edit = null;
+ if(index == 0) {
+ edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
+ R.id.et_edit_text);
+ } else {
+ edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
+ R.id.et_edit_text);
+ }//通过id把编辑框存在空的NoteEditText中
+ int length = edit.length();
+ edit.append(text);
+ edit.requestFocus();
+ edit.setSelection(length);
+ }
+
+ /*
+ * 函数功能：进入编辑文本框所触发的事件
+ * 函数实现：如下注释
+ */
+ public void onEditTextEnter(int index, String text) {
+ /**
+ * Should not happen, check for debug
+ */
+ if(index > mEditTextList.getChildCount()) {
+ Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
+ }
+
+ View view = getListItem(text, index);
+ mEditTextList.addView(view, index);
+ NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+ edit.requestFocus();
+ edit.setSelection(0);
+ for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
+ ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
+ .setIndex(i);
+ }
+ }
+ /*
+ * 函数功能：切换至列表模式
+ * 函数实现：如下注释
+ */
+ private void switchToListMode(String text) {
+ mEditTextList.removeAllViews();
+ String[] items = text.split("\n");
+ int index = 0;
+ for (String item : items) {
+ if(!TextUtils.isEmpty(item)) {
+ mEditTextList.addView(getListItem(item, index));
+ index++;
+ }
+ }
+ mEditTextList.addView(getListItem("", index));
+ mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
+
+ mNoteEditor.setVisibility(View.GONE);
+ mEditTextList.setVisibility(View.VISIBLE);
+ }
+
+ /*
+ * 函数功能：获取高亮效果的反馈情况
+ * 函数实现：如下注释
+ */
+ private Spannable getHighlightQueryResult(String fullText, String userQuery) {
+ SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
+ if (!TextUtils.isEmpty(userQuery)) {
+ mPattern = Pattern.compile(userQuery);
+ Matcher m = mPattern.matcher(fullText);
+ int start = 0;
+ while (m.find(start)) {
+ spannable.setSpan(
+ new BackgroundColorSpan(this.getResources().getColor(
+ R.color.user_query_highlight)), m.start(), m.end(),
+ Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ start = m.end();
+ }
+ }
+ return spannable;
+ }
+
+ //获取列表项
+ private View getListItem(String item, int index) {
+ View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
+ final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+ edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
+ cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+ } else {
+ edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
+ }
+ }
+ });
+
+ if (item.startsWith(TAG_CHECKED)) {
+ cb.setChecked(true);
+ edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+ item = item.substring(TAG_CHECKED.length(), item.length()).trim();
+ } else if (item.startsWith(TAG_UNCHECKED)) {
+ cb.setChecked(false);
+ edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
+ item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
+ }
+
+ edit.setOnTextViewChangeListener(this);
+ edit.setIndex(index);
+ edit.setText(getHighlightQueryResult(item, mUserQuery));
+ return view;
+ }
+
+ // 函数功能：便签内容发生改变所触发的事件
+ public void onTextChange(int index, boolean hasText) {
+ if (index >= mEditTextList.getChildCount()) {
+ Log.e(TAG, "Wrong index, should not happen");
+ return;
+ }
+ if(hasText) {
+ mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
+ } else {
+ mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
+ }
+ //如果内容不为空则将其子编辑框可见性置为可见，否则不可见
+ }
+
+ public void onCheckListModeChanged(int oldMode, int newMode) {
+ if (newMode == TextNote.MODE_CHECK_LIST) {
+ switchToListMode(mNoteEditor.getText().toString());
+ } else {
+ if (!getWorkingText()) {
+ mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
+ ""));
+ }
+ mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+ mEditTextList.setVisibility(View.GONE);
+ mNoteEditor.setVisibility(View.VISIBLE);
+ convertToImage(); //退出清单模式，应该将有图片的地方显示出来
+ }
+ }
+
+ //TODO
+ //分享，设置勾选选项表并返回是否勾选的标记
+ private boolean getWorkingText() {
+ boolean hasChecked = false;
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < mEditTextList.getChildCount(); i++) {
+ View view = mEditTextList.getChildAt(i);
+ NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+ if (!TextUtils.isEmpty(edit.getText())) {
+ if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
+ sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
+ hasChecked = true;
+ } else {
+ sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
+ }
+ }
+ }
+ mWorkingNote.setWorkingText(sb.toString());
+ } else {
+ mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+ }
+ return hasChecked;
+ }
+
+ //保存注释
+ private boolean saveNote() {
+ getWorkingText();
+ boolean saved = mWorkingNote.saveNote();
+ if (saved) {
+ /**
+ * There are two modes from List view to edit view, open one note,
+ * create/edit a node. Opening node requires to the original
+ * position in the list when back from edit view, while creating a
+ * new node requires to the top of the list. This code
+ * {@link #RESULT_OK} is used to identify the create/edit state
+ */
+ //如英文注释所说链接RESULT_OK是为了识别保存的2种情况：
+ // 一是创建后保存，二是修改后保存
+ setResult(RESULT_OK);
+ }
+ return saved;
+ }
+
+ //TODO
+ //发送到桌面
+ private void sendToDesktop() {
+ /**
+ * Before send message to home, we should make sure that current
+ * editing note is exists in databases. So, for new note, firstly
+ * save it
+ */
+ if (!mWorkingNote.existInDatabase()) {
+ saveNote();
+ }//若不存在数据也就是新的标签就保存起来先
+
+ if (mWorkingNote.getNoteId() > 0) {
+ Intent sender = new Intent();
+ //建立发送到桌面的连接器
+ Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
+ //链接是一个视图
+ shortcutIntent.setAction(Intent.ACTION_VIEW);
+ shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
+ sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+ sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
+ makeShortcutIconTitle(mWorkingNote.getContent()));
+ sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+ Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
+ ////将便签的相关信息都添加到要发送的文件里
+ sender.putExtra("duplicate", true);
+ //设置sneder的行为是发送
+ sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+ //显示到桌面
+ showToast(R.string.info_note_enter_desktop);
+ sendBroadcast(sender);
+ } else {
+ /**
+ * There is the condition that user has input nothing (the note is
+ * not worthy saving), we have no note id, remind the user that he
+ * should input something
+ */
+ Log.e(TAG, "Send to desktop error");
+ showToast(R.string.error_note_empty_for_send_to_desktop);
+ }
+ }
+
+ /*
+ * 函数功能：编辑小图标的标题
+ * 函数实现：如下注释
+ * 直接设置为content中的内容并返回，有勾选和未勾选2种
+ */
+ private String makeShortcutIconTitle(String content) {
+ content = content.replace(TAG_CHECKED, "");
+ content = content.replace(TAG_UNCHECKED, "");
+ return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
+ SHORTCUT_ICON_TITLE_MAX_LEN) : content;
+ }
+
+ private void showToast(int resId) {
+ showToast(resId, Toast.LENGTH_SHORT);
+ }
+
+ private void showToast(int resId, int duration) {
+ Toast.makeText(this, resId, duration).show();
+ }
+
+
+ //重写onActivityResult()来处理返回的数据
+ //直接采用简单的方法类返回数据
+ protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ super.onActivityResult(requestCode, resultCode, intent);
+ ContentResolver resolver = getContentResolver();
+ switch (requestCode) {
+ case PHOTO_REQUEST:
+ Uri originalUri = intent.getData(); //1.获得图片的真实路径
+ Bitmap bitmap = null;
+ try {
+ bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片
+ } catch (FileNotFoundException e) {
+ Log.d(TAG, "onActivityResult: get file_exception");
+ e.printStackTrace();
+ }
+
+ if(bitmap != null){
+ //3.根据Bitmap对象创建ImageSpan对象
+ Log.d(TAG, "onActivityResult: bitmap is not null");
+ ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+ String path = getPath(this,originalUri);
+ //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置
+ String img_fragment= "[local]" + path + "[/local]";
+ //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
+ SpannableString spannableString = new SpannableString(img_fragment);
+ spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ //5.将选择的图片追加到EditText中光标所在位置
+ NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view);
+ int index = e.getSelectionStart(); //获取光标所在位置
+ Log.d(TAG, "Index是: " + index);
+ Editable edit_text = e.getEditableText();
+ edit_text.insert(index, spannableString); //将图片插入到光标所在位置
+
+// // 添加以下代码来在图片插入后自动换行
+// edit_text.insert(index + spannableString.length(), "\n");// 在图片后添加一个换行符
+//
+// // 更新光标
+// e.setSelection(index + spannableString.length() + 1); // 将光标移动到换行符后面
+
+ mWorkingNote.mContent = e.getText().toString();
+
+// //6.把改动提交到数据库中,两个数据库表都要改的
+// ContentResolver contentResolver = getContentResolver();
+// ContentValues contentValues = new ContentValues();
+// final long id = mWorkingNote.getNoteId();
+// contentValues.put("snippet",mWorkingNote.mContent);
+// contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id});
+// ContentValues contentValues1 = new ContentValues();
+// contentValues1.put("content",mWorkingNote.mContent);
+// contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id});
+
+ }else{
+ Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+
+ //获取文件的real path
+ public String getPath(final Context context, final Uri uri) {
+
+ final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+ // DocumentProvider
+ if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+ // ExternalStorageProvider
+ if (isExternalStorageDocument(uri)) {
+ final String docId = DocumentsContract.getDocumentId(uri);
+ final String[] split = docId.split(":");
+ final String type = split[0];
+
+ if ("primary".equalsIgnoreCase(type)) {
+ return Environment.getExternalStorageDirectory() + "/" + split[1];
+ }
+ }
+// // DownloadsProvider
+ else if (isDownloadsDocument(uri)) {
+ final String id = DocumentsContract.getDocumentId(uri);
+ final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+ return getDataColumn(context, contentUri, null, null);
+ }
+ // MediaProvider
+ else
+ if (isMediaDocument(uri)) {
+ final String docId = DocumentsContract.getDocumentId(uri);
+ final String[] split = docId.split(":");
+ final String type = split[0];
+
+ Uri contentUri = null;
+ if ("image".equals(type)) {
+ contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+ }
+
+ final String selection = "_id=?";
+ final String[] selectionArgs = new String[]{split[1]};
+
+ return getDataColumn(context, contentUri, selection, selectionArgs);
+ }
+ }
+ // Media
+ else if ("content".equalsIgnoreCase(uri.getScheme())) {
+ return getDataColumn(context, uri, null, null);
+ }
+ // File
+ else if ("file".equalsIgnoreCase(uri.getScheme())) {
+ return uri.getPath();
+ }
+ return null;
+ }
+
+ //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。
+ public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
+
+ Cursor cursor = null;
+ final String column = "_data";
+ final String[] projection = {column};
+
+ try {
+ cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
+ if (cursor != null && cursor.moveToFirst()) {
+ final int column_index = cursor.getColumnIndexOrThrow(column);
+ return cursor.getString(column_index);
+ }
+ } finally {
+ if (cursor != null)
+ cursor.close();
+ }
+ return null;
+ }
+ //是否为外部存储文件
+ public boolean isExternalStorageDocument(Uri uri) {
+ return "com.android.externalstorage.documents".equals(uri.getAuthority());
+ }
+
+ //是否为下载文件
+ public boolean isDownloadsDocument(Uri uri) {
+ return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+ }
+ //是否为媒体文件
+ public boolean isMediaDocument(Uri uri) {
+ return "com.android.providers.media.documents".equals(uri.getAuthority());
+ }
+
+
+}
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 87%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..b3886d3 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -18,10 +18,12 @@ package net.micode.notes.ui;
import android.content.Context;
import android.graphics.Rect;
+import android.text.Editable;
import android.text.Layout;
import android.text.Selection;
import android.text.Spanned;
import android.text.TextUtils;
+import android.text.TextWatcher;
import android.text.style.URLSpan;
import android.util.AttributeSet;
import android.util.Log;
@@ -31,13 +33,14 @@ import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.MotionEvent;
import android.widget.EditText;
+import android.widget.TextView;
import net.micode.notes.R;
import java.util.HashMap;
import java.util.Map;
-public class NoteEditText extends EditText {
+public class NoteEditText extends android.support.v7.widget.AppCompatEditText {
private static final String TAG = "NoteEditText";
private int mIndex;
private int mSelectionStartBeforeDelete;
@@ -80,6 +83,8 @@ public class NoteEditText extends EditText {
public NoteEditText(Context context) {
super(context, null);
mIndex = 0;
+ init();
+
}
public void setIndex(int index) {
@@ -92,10 +97,12 @@ public class NoteEditText extends EditText {
public NoteEditText(Context context, AttributeSet attrs) {
super(context, attrs, android.R.attr.editTextStyle);
+ init();
}
public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
+ init();
// TODO Auto-generated constructor stub
}
@@ -214,4 +221,34 @@ public class NoteEditText extends EditText {
}
super.onCreateContextMenu(menu);
}
+
+ //显示字符数
+ private TextView mCharacterCountView;
+ public void setCharacterCountView(TextView textView) {
+ mCharacterCountView = textView;
+ }
+ private void init() {
+ addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ if (mCharacterCountView != null) {
+ String text = s.toString().replaceAll("\\s", "");
+ int characterCount = text.length();
+ mCharacterCountView.setText(String.valueOf(characterCount));
+ }
+ }
+ });
+ }
+
+
}
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 87%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..47508ae 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -31,6 +31,7 @@ import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -78,7 +79,9 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashSet;
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
+ //首页的背景图切换
+ private int mode=-1;
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
private static final int FOLDER_LIST_QUERY_TOKEN = 1;
@@ -135,10 +138,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private final static int REQUEST_CODE_OPEN_NODE = 102;
private final static int REQUEST_CODE_NEW_NODE = 103;
+ public static int secret_mode=0;
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.note_list);
+ getWindow().setBackgroundDrawableResource(R.drawable.mi1);
initResources();
/**
@@ -242,7 +249,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mMoveMenu = menu.findItem(R.id.move);
if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
|| DataUtils.getUserFolderCount(mContentResolver) == 0) {
- mMoveMenu.setVisible(false);
+ mMoveMenu.setVisible(true);
} else {
mMoveMenu.setVisible(true);
mMoveMenu.setOnMenuItemClickListener(this);
@@ -286,13 +293,24 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ //这个初始化界面不能修改
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
// TODO Auto-generated method stub
return false;
}
+// public boolean onPrepareAction(ActionMode mode, Menu menu) {
+// // TODO Auto-generated method stub
+// if(secret_mode==1){
+// menu.findItem(R.id.menu_secret).setVisible(false);
+// }else{
+// menu.findItem(R.id.menu_quit_secret).setVisible(false);
+// }
+// return true;
+// }
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
// TODO Auto-generated method stub
+
return false;
}
@@ -345,7 +363,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
return true;
}
}
-
private class NewNoteOnTouchListener implements OnTouchListener {
public boolean onTouch(View v, MotionEvent event) {
@@ -408,20 +425,43 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
};
+ //对当前的笔记是否可视化
private void startAsyncNotesListQuery() {
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
: NORMAL_SELECTION;
- 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");
+ if(secret_mode==0) {
+ 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");
+ }else{
+ String str1 = "";
+ String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组，只换掉SNIPPET
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.CREATED_DATE,
+ NoteColumns.HAS_ATTACHMENT,
+ NoteColumns.MODIFIED_DATE,
+ NoteColumns.NOTES_COUNT,
+ NoteColumns.PARENT_ID,
+// NoteColumns.SNIPPET,
+ str1,
+ NoteColumns.TYPE,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
+ };
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
+ String.valueOf(mCurrentFolderId)
+ }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
}
private final class BackgroundQueryHandler extends AsyncQueryHandler {
public BackgroundQueryHandler(ContentResolver contentResolver) {
super(contentResolver);
}
-
@Override
protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
switch (token) {
@@ -506,6 +546,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}.execute();
}
+ // TODO
+ // 删除文件夹
private void deleteFolder(long folderId) {
if (folderId == Notes.ID_ROOT_FOLDER) {
Log.e(TAG, "Wrong folder id, should not happen " + folderId);
@@ -540,6 +582,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
}
+ //TODO
+ //查看文件夹
private void openFolder(NoteItemData data) {
mCurrentFolderId = data.getId();
startAsyncNotesListQuery();
@@ -579,6 +623,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
+ // TODO
+ // 新建文件夹,修改文件夹名称
private void showCreateOrModifyFolderDialog(final boolean create) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
@@ -775,13 +821,36 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} else {
Log.e(TAG, "Wrong state:" + mState);
}
+// //更换背景
+// if(mode==0){
+// menu.findItem(R.id.menu_hutao).setVisible(false);
+// }else if(mode==1){
+// menu.findItem(R.id.menu_keli).setVisible(false);
+// }
return true;
}
+ //更改按键的功能设定
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case R.id.menu_new_folder: {
+ case R.id.menu_keli: {
+ mode=1;
+ getWindow().setBackgroundDrawableResource(R.drawable.keli);
+ break;
+ }
+ case R.id.menu_hutao:{
+ mode=0;
+ getWindow().setBackgroundDrawableResource(R.drawable.hutao);
+ break;
+ }
+ case R.id.menu_moren:{
+ mode=-1;
+ getWindow().setBackgroundDrawableResource(R.drawable.mi1);
+ break;
+ }
+ case R.id.menu_new_folder:{
showCreateOrModifyFolderDialog(true);
break;
}
@@ -812,18 +881,73 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
case R.id.menu_search:
onSearchRequested();
break;
+
+ case R.id.menu_secret: { //进入私密模式
+ AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+ dialog.setTitle("重要提醒");
+ dialog.setMessage("您确认进入私密模式吗？");
+ dialog.setCancelable(false);
+ dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ secret_mode = 1;
+ startAsyncNotesListQuery();
+// //更换背景图
+// getWindow().setBackgroundDrawableResource(R.drawable.mi1);
+ Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+ }
+ });
+ dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which){}
+ });
+ dialog.show();
+ startAsyncNotesListQuery();
+
+// Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
+ break;
+ }
+
+ case R.id.menu_quit_secret:{ //退出私密模式
+ secret_mode = 0;
+ AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);
+ dialog.setTitle("重要提醒");
+ dialog.setMessage("您确认退出私密模式吗？");
+ dialog.setCancelable(false);
+ dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ startAsyncNotesListQuery();
+ //更换背景图
+// getWindow().setBackgroundDrawableResource(R.drawable.mi1);
+ Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();
+ }
+ });
+ dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which){}
+ });
+ dialog.show();
+
+ break;
+ }
+
default:
break;
}
return true;
}
+ //TODO
+ //搜索
@Override
public boolean onSearchRequested() {
startSearch(null, false, null /* appData */, false);
return true;
}
+ // TODO
+ // 导出文本
private void exportNoteToText() {
final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
new AsyncTask() {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 79%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..239a754 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -30,7 +30,10 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-
+/*
+ * 功能：直译为便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
+ * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+ */
public class NotesListAdapter extends CursorAdapter {
private static final String TAG = "NotesListAdapter";
private Context mContext;
@@ -43,24 +46,40 @@ public class NotesListAdapter extends CursorAdapter {
public int widgetType;
};
+
+
public NotesListAdapter(Context context) {
super(context, null);
- mSelectedIndex = new HashMap();
+ mSelectedIndex = new HashMap(); //新建选项下标的hash表
mContext = context;
mNotesCount = 0;
}
+ /*
+ * 函数功能：新建一个视图来存储光标所指向的数据
+ * 函数实现：使用兄弟类NotesListItem新建一个项目选项
+ */
+
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return new NotesListItem(context);
}
+ /*
+ * 函数功能：将已经存在的视图和鼠标指向的数据进行捆绑
+ * 函数实现：如下注释
+ */
+
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof NotesListItem) {
+ //若view是NotesListItem的一个实例
+
NoteItemData itemData = new NoteItemData(context, cursor);
((NotesListItem) view).bind(context, itemData, mChoiceMode,
isSelectedItem(cursor.getPosition()));
+ //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
+
}
}
@@ -87,8 +106,14 @@ public class NotesListAdapter extends CursorAdapter {
}
}
}
+ //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
}
+ /*
+ * 函数功能：建立选择项的下标列表
+ * 函数实现：如下注释
+ */
+
public HashSet getSelectedItemIds() {
HashSet itemSet = new HashSet();
for (Integer position : mSelectedIndex.keySet()) {
@@ -104,6 +129,10 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
+ /*
+ * 函数功能：建立桌面Widget的选项表
+ * 函数实现：如下注释
+ */
public HashSet getSelectedWidget() {
HashSet itemSet = new HashSet();
@@ -128,8 +157,14 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
+ /*
+ * 函数功能：获取选项个数
+ * 函数实现：如下注释
+ */
+
public int getSelectedCount() {
Collection values = mSelectedIndex.values();
+ //首先获取选项下标的值
if (null == values) {
return 0;
}
@@ -143,11 +178,20 @@ public class NotesListAdapter extends CursorAdapter {
return count;
}
+ /*
+ * 函数功能：判断是否全部选中
+ * 函数实现：如下注释
+ */
+
public boolean isAllSelected() {
int checkedCount = getSelectedCount();
return (checkedCount != 0 && checkedCount == mNotesCount);
}
+ /*
+ * 函数功能：判断是否为选项表
+ * 函数实现：通过传递的下标来确定
+ */
public boolean isSelectedItem(final int position) {
if (null == mSelectedIndex.get(position)) {
return false;
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 96%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..bbf5411 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -69,7 +69,7 @@ public class NotesListItem extends LinearLayout {
mCallName.setText(data.getCallName());
mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
- if (data.hasAlert()) {
+ if (data.hasAlert()) {//图片来源的设置
mAlert.setImageResource(R.drawable.clock);
mAlert.setVisibility(View.VISIBLE);
} else {
@@ -94,11 +94,13 @@ public class NotesListItem extends LinearLayout {
}
}
}
+ ///设置内容，获取相关时间，从data里编辑的日期中获取
mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
setBackground(data);
}
+ //根据data的文件属性来设置背景
private void setBackground(NoteItemData data) {
int id = data.getBgColorId();
if (data.getType() == Notes.TYPE_NOTE) {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 88%
rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..41d3a9d 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -47,7 +47,10 @@ import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.gtask.remote.GTaskSyncService;
-
+/*
+ *该类功能：NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ */
public class NotesPreferenceActivity extends PreferenceActivity {
public static final String PREFERENCE_NAME = "notes_preferences";
@@ -78,6 +81,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
addPreferencesFromResource(R.xml.preferences);
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
+ //根据同步账户关键码来初始化分组
mReceiver = new GTaskReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
@@ -88,13 +92,19 @@ public class NotesPreferenceActivity extends PreferenceActivity {
getListView().addHeaderView(header, null, true);
}
+ /*
+ * 函数功能：activity交互功能的实现，用于接受用户的输入
+ * 函数实现：如下注释
+ */
@Override
protected void onResume() {
+ //先执行父类 的交互实现
super.onResume();
// need to set sync account automatically if user has added a new
// account
if (mHasAddedAccount) {
+ //若用户新加了账户则自动设置同步账户
Account[] accounts = getGoogleAccounts();
if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
for (Account accountNew : accounts) {
@@ -116,6 +126,11 @@ public class NotesPreferenceActivity extends PreferenceActivity {
refreshUI();
}
+ /*
+ * 函数功能：销毁一个activity
+ * 函数实现：如下注释
+ */
+
@Override
protected void onDestroy() {
if (mReceiver != null) {
@@ -124,6 +139,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
super.onDestroy();
}
+ /*
+ * 函数功能：重新设置账户信息
+ * 函数实现：如下注释
+ */
private void loadAccountPreference() {
mAccountCategory.removeAll();
@@ -154,6 +173,11 @@ public class NotesPreferenceActivity extends PreferenceActivity {
mAccountCategory.addPreference(accountPref);
}
+
+ /*
+ *函数功能：设置按键的状态和最后同步的时间
+ *函数实现：如下注释
+ */
private void loadSyncButton() {
Button syncButton = (Button) findViewById(R.id.preference_sync_button);
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
@@ -198,6 +222,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
loadSyncButton();
}
+ /*
+ * 函数功能：显示账户选择的对话框并进行账户的设置
+ * 函数实现：如下注释
+ */
private void showSelectAccountAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
@@ -207,10 +235,13 @@ public class NotesPreferenceActivity extends PreferenceActivity {
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
+ //设置标题以及子标题的内容
dialogBuilder.setCustomTitle(titleView);
dialogBuilder.setPositiveButton(null, null);
+ //设置对话框的自定义标题，建立一个YES的按钮
Account[] accounts = getGoogleAccounts();
+ //获取同步账户信息
String defAccount = getSyncAccountName(this);
mOriAccounts = accounts;
@@ -254,6 +285,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
});
}
+ /*
+ * 函数功能：显示账户选择对话框和相关账户操作
+ * 函数实现：如下注释
+ */
private void showChangeAccountConfirmAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
@@ -283,6 +318,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
dialogBuilder.show();
}
+ /*
+ * 函数功能：设置同步账户
+ * 函数实现：如下注释：
+ */
private Account[] getGoogleAccounts() {
AccountManager accountManager = AccountManager.get(this);
return accountManager.getAccountsByType("com.google");
@@ -317,6 +356,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
Toast.LENGTH_SHORT).show();
}
}
+ /*
+ * 函数功能：删除同步账户
+ * 函数实现：如下注释：
+ */
private void removeSyncAccount() {
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
@@ -340,12 +383,20 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}).start();
}
+ /*
+ * 函数功能：获取同步账户名称
+ * 函数实现：通过共享的首选项里的信息直接获取
+ */
public static String getSyncAccountName(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
}
+ /*
+ * 函数功能：设置最终同步的时间
+ * 函数实现：如下注释
+ */
public static void setLastSyncTime(Context context, long time) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
@@ -354,18 +405,27 @@ public class NotesPreferenceActivity extends PreferenceActivity {
editor.commit();
}
+ /*
+ * 函数功能：获取最终同步时间
+ * 函数实现：通过共享的首选项里的信息直接获取
+ */
public static long getLastSyncTime(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
}
+ /*
+ * 函数功能：接受同步信息
+ * 函数实现：继承BroadcastReceiver
+ */
private class GTaskReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
refreshUI();
if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
+ //获取随广播而来的Intent中的同步服务的数据
TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
syncStatus.setText(intent
.getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
@@ -373,6 +433,11 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
}
+ /*
+ * 函数功能：处理菜单的选项
+ * 函数实现：如下注释
+ * 参数:MenuItem菜单选项
+ */
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
diff --git a/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/SplashActivity.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/SplashActivity.java
new file mode 100644
index 0000000..38185f9
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/java/net/micode/notes/ui/SplashActivity.java
@@ -0,0 +1,51 @@
+package net.micode.notes.ui;
+
+import android.annotation.SuppressLint;
+
+import android.content.Intent;
+
+import android.support.v7.app.ActionBar;
+
+import android.support.v7.app.AppCompatActivity;
+
+import android.os.Build;
+
+import android.os.Bundle;
+
+import android.os.Handler;
+
+import android.view.MotionEvent;
+
+import android.view.View;
+
+import android.view.WindowInsets;
+
+import net.micode.notes.R;
+
+public class SplashActivity extends AppCompatActivity {
+ Handler mHandler=new Handler();
+
+
+
+ @Override
+
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState); //加载启动界面
+ setContentView(R.layout.activity_splash); //加载启动图片
+
+
+// 当计时结束时，跳转至NotesListActivity
+
+ mHandler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ Intent intent=new Intent();
+ intent.setClass(SplashActivity.this, NotesListActivity.class);
+ startActivity(intent);
+ finish(); //销毁欢迎页
+ }
+ }, 2000); // 2秒后跳转
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/NewNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to src/NewNotes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
diff --git a/src/Notes-master/app/src/main/res/color/primary_text_dark.xml b/src/NewNotes-master/app/src/main/res/color/primary_text_dark.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/color/primary_text_dark.xml
rename to src/NewNotes-master/app/src/main/res/color/primary_text_dark.xml
diff --git a/src/Notes-master/app/src/main/res/color/secondary_text_dark.xml b/src/NewNotes-master/app/src/main/res/color/secondary_text_dark.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/color/secondary_text_dark.xml
rename to src/NewNotes-master/app/src/main/res/color/secondary_text_dark.xml
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/call_record.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/clock.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/clock.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/clock.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/delete.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/delete.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/delete.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/font_large.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/font_small.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/font_super.png
diff --git a/src/NewNotes-master/app/src/main/res/drawable-hdpi/hutao.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/hutao.png
new file mode 100644
index 0000000..2074ac2
Binary files /dev/null and b/src/NewNotes-master/app/src/main/res/drawable-hdpi/hutao.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/src/NewNotes-master/app/src/main/res/drawable-hdpi/keli.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/keli.png
new file mode 100644
index 0000000..2d00533
Binary files /dev/null and b/src/NewNotes-master/app/src/main/res/drawable-hdpi/keli.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_background.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/src/NewNotes-master/app/src/main/res/drawable-hdpi/mi.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/mi.png
new file mode 100644
index 0000000..77bd522
Binary files /dev/null and b/src/NewNotes-master/app/src/main/res/drawable-hdpi/mi.png differ
diff --git a/src/NewNotes-master/app/src/main/res/drawable-hdpi/mi1.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/mi1.png
new file mode 100644
index 0000000..b310fcc
Binary files /dev/null and b/src/NewNotes-master/app/src/main/res/drawable-hdpi/mi1.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/notification.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/notification.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/notification.png
diff --git a/src/NewNotes-master/app/src/main/res/drawable-hdpi/op_start.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/op_start.png
new file mode 100644
index 0000000..22c88cc
Binary files /dev/null and b/src/NewNotes-master/app/src/main/res/drawable-hdpi/op_start.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/search_result.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/search_result.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/search_result.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/selected.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/selected.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/selected.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to src/NewNotes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/src/Notes-master/app/src/main/res/drawable/new_note.xml b/src/NewNotes-master/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/drawable/new_note.xml
rename to src/NewNotes-master/app/src/main/res/drawable/new_note.xml
diff --git a/src/NewNotes-master/app/src/main/res/layout/account_dialog_title.xml b/src/NewNotes-master/app/src/main/res/layout/account_dialog_title.xml
new file mode 100644
index 0000000..3deb7da
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/account_dialog_title.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/acticity_word.xml b/src/NewNotes-master/app/src/main/res/layout/acticity_word.xml
new file mode 100644
index 0000000..669d985
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/acticity_word.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
diff --git a/src/NewNotes-master/app/src/main/res/layout/activity_splash.xml b/src/NewNotes-master/app/src/main/res/layout/activity_splash.xml
new file mode 100644
index 0000000..fdc2805
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/add_account_text.xml b/src/NewNotes-master/app/src/main/res/layout/add_account_text.xml
new file mode 100644
index 0000000..c799178
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/add_account_text.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/datetime_picker.xml b/src/NewNotes-master/app/src/main/res/layout/datetime_picker.xml
new file mode 100644
index 0000000..f10d592
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/datetime_picker.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/dialog_edit_text.xml b/src/NewNotes-master/app/src/main/res/layout/dialog_edit_text.xml
new file mode 100644
index 0000000..361b39a
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/dialog_edit_text.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/folder_list_item.xml b/src/NewNotes-master/app/src/main/res/layout/folder_list_item.xml
new file mode 100644
index 0000000..77e8148
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/folder_list_item.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/note_edit.xml b/src/NewNotes-master/app/src/main/res/layout/note_edit.xml
new file mode 100644
index 0000000..70b3dd1
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/note_edit.xml
@@ -0,0 +1,436 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NewNotes-master/app/src/main/res/layout/note_edit_list_item.xml b/src/NewNotes-master/app/src/main/res/layout/note_edit_list_item.xml
new file mode 100644
index 0000000..a885f9c
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/note_edit_list_item.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NewNotes-master/app/src/main/res/layout/note_item.xml b/src/NewNotes-master/app/src/main/res/layout/note_item.xml
new file mode 100644
index 0000000..d541f6a
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/note_item.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NewNotes-master/app/src/main/res/layout/note_list.xml b/src/NewNotes-master/app/src/main/res/layout/note_list.xml
new file mode 100644
index 0000000..d156a0e
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/note_list.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NewNotes-master/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/NewNotes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
new file mode 100644
index 0000000..3fa271d
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/note_list_footer.xml b/src/NewNotes-master/app/src/main/res/layout/note_list_footer.xml
new file mode 100644
index 0000000..5ca7b22
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/note_list_footer.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/settings_header.xml b/src/NewNotes-master/app/src/main/res/layout/settings_header.xml
new file mode 100644
index 0000000..5eb8c50
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/settings_header.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/layout/widget_2x.xml b/src/NewNotes-master/app/src/main/res/layout/widget_2x.xml
new file mode 100644
index 0000000..55970ce
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/widget_2x.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
diff --git a/src/NewNotes-master/app/src/main/res/layout/widget_4x.xml b/src/NewNotes-master/app/src/main/res/layout/widget_4x.xml
new file mode 100644
index 0000000..dc9bb51
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/layout/widget_4x.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master/app/src/main/res/menu/call_note_edit.xml b/src/NewNotes-master/app/src/main/res/menu/call_note_edit.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/menu/call_note_edit.xml
rename to src/NewNotes-master/app/src/main/res/menu/call_note_edit.xml
diff --git a/src/Notes-master/app/src/main/res/menu/call_record_folder.xml b/src/NewNotes-master/app/src/main/res/menu/call_record_folder.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/menu/call_record_folder.xml
rename to src/NewNotes-master/app/src/main/res/menu/call_record_folder.xml
diff --git a/src/NewNotes-master/app/src/main/res/menu/note_edit.xml b/src/NewNotes-master/app/src/main/res/menu/note_edit.xml
new file mode 100644
index 0000000..dccad78
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/menu/note_edit.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/menu/note_list.xml b/src/NewNotes-master/app/src/main/res/menu/note_list.xml
new file mode 100644
index 0000000..19fe044
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/menu/note_list.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
diff --git a/src/Notes-master/app/src/main/res/menu/note_list_dropdown.xml b/src/NewNotes-master/app/src/main/res/menu/note_list_dropdown.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/menu/note_list_dropdown.xml
rename to src/NewNotes-master/app/src/main/res/menu/note_list_dropdown.xml
diff --git a/src/Notes-master/app/src/main/res/menu/note_list_options.xml b/src/NewNotes-master/app/src/main/res/menu/note_list_options.xml
similarity index 86%
rename from src/Notes-master/app/src/main/res/menu/note_list_options.xml
rename to src/NewNotes-master/app/src/main/res/menu/note_list_options.xml
index daac008..7cc4436 100644
--- a/src/Notes-master/app/src/main/res/menu/note_list_options.xml
+++ b/src/NewNotes-master/app/src/main/res/menu/note_list_options.xml
@@ -15,17 +15,17 @@
limitations under the License.
-->
-
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/menu/sub_folder.xml b/src/NewNotes-master/app/src/main/res/menu/sub_folder.xml
similarity index 80%
rename from src/Notes-master/app/src/main/res/menu/sub_folder.xml
rename to src/NewNotes-master/app/src/main/res/menu/sub_folder.xml
index b00de26..301a537 100644
--- a/src/Notes-master/app/src/main/res/menu/sub_folder.xml
+++ b/src/NewNotes-master/app/src/main/res/menu/sub_folder.xml
@@ -21,4 +21,12 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/raw-zh-rCN/introduction b/src/NewNotes-master/app/src/main/res/raw-zh-rCN/introduction
similarity index 100%
rename from src/Notes-master/app/src/main/res/raw-zh-rCN/introduction
rename to src/NewNotes-master/app/src/main/res/raw-zh-rCN/introduction
diff --git a/src/Notes-master/app/src/main/res/raw/introduction b/src/NewNotes-master/app/src/main/res/raw/introduction
similarity index 100%
rename from src/Notes-master/app/src/main/res/raw/introduction
rename to src/NewNotes-master/app/src/main/res/raw/introduction
diff --git a/src/NewNotes-master/app/src/main/res/values-land/dimens.xml b/src/NewNotes-master/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 0000000..a8b8a6d
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,3 @@
+
+ 48dp
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/values-night/themes.xml b/src/NewNotes-master/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..d9b793d
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/values-w1240dp/dimens.xml b/src/NewNotes-master/app/src/main/res/values-w1240dp/dimens.xml
new file mode 100644
index 0000000..dd7d3fb
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values-w1240dp/dimens.xml
@@ -0,0 +1,3 @@
+
+ 200dp
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/values-w600dp/dimens.xml b/src/NewNotes-master/app/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 0000000..a8b8a6d
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,3 @@
+
+ 48dp
+
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml b/src/NewNotes-master/app/src/main/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
rename to src/NewNotes-master/app/src/main/res/values-zh-rCN/arrays.xml
diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/NewNotes-master/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
rename to src/NewNotes-master/app/src/main/res/values-zh-rCN/strings.xml
diff --git a/src/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml b/src/NewNotes-master/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml
rename to src/NewNotes-master/app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml b/src/NewNotes-master/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
rename to src/NewNotes-master/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/src/Notes-master/app/src/main/res/values/arrays.xml b/src/NewNotes-master/app/src/main/res/values/arrays.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/values/arrays.xml
rename to src/NewNotes-master/app/src/main/res/values/arrays.xml
diff --git a/src/NewNotes-master/app/src/main/res/values/attrs.xml b/src/NewNotes-master/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..e52391d
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/values/colors.xml b/src/NewNotes-master/app/src/main/res/values/colors.xml
similarity index 75%
rename from src/Notes-master/app/src/main/res/values/colors.xml
rename to src/NewNotes-master/app/src/main/res/values/colors.xml
index 123ffbf..2496c0c 100644
--- a/src/Notes-master/app/src/main/res/values/colors.xml
+++ b/src/NewNotes-master/app/src/main/res/values/colors.xml
@@ -17,4 +17,9 @@
#335b5b5b
+ #FF039BE5
+ #FF01579B
+ #FF40C4FF
+ #FF00B0FF
+ #66000000
diff --git a/src/NewNotes-master/app/src/main/res/values/dimens.xml b/src/NewNotes-master/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..f21709e
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values/dimens.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ 33sp
+ 26sp
+ 20sp
+ 17sp
+ 14sp
+
+ 16dp
+ 16dp
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/values/strings.xml b/src/NewNotes-master/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f3356ca
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values/strings.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+ Notes
+ Notes 2x2
+ Notes 4x4
+ No associated note found, click to create associated note.
+ Privacy mode，can not see note content
+ ...
+ 添加笔记
+ 删除时间提醒成功
+ 设置时间提醒
+ Expired
+ yyyyMMdd
+ MMMd kk:mm
+ 知道了
+ 看一下
+ Call
+ Send email
+ Browse web
+ Open map
+
+
+ /MIUI/notes/
+ notes_%s.txt
+
+ (%d)
+
+
+ 背景切换:胡桃
+ 背景切换:可莉
+ 新建文件夹
+ 导出文本
+ 同步
+ 取消同步
+ 设置
+ 搜索
+ 删除
+ 移动到文件夹
+ %d 选中
+ 未选择任何内容，操作无效
+ 全部选中
+ 取消全部选中
+ 字体大小
+ 小
+ 中
+ 大
+ 超级大
+ 进入选择列表
+ 离开选择列表
+ 查看文件夹
+ 删除文件夹
+ 改变文件夹名称
+ 文件夹%1$s 已存在, 请重命名
+ 分享
+ 发送桌面
+ 定时提醒我
+ 删除定时提醒
+ 选择文件夹
+ 根目录
+ 笔记添加到桌面
+ 确认删除文件夹及其笔记？
+ 删除选中的笔记
+ 确定删除选中的 %d 笔记?
+ 确认删除笔记?
+ 已经移动选中的 %1$d 笔记到 %2$s 文件夹
+
+ SD card busy, not available now
+ Export failed, please check SD card
+ The note is not exist
+ Sorry, can not set clock on empty note
+ Sorry, can not send and empty note to home
+ Export successful
+ Export fail
+ Export text file (%1$s) to SD (%2$s) directory
+
+ Syncing notes...
+ Sync is successful
+ Sync is failed
+ Sync is canceled
+ Sync is successful with account %1$s
+ Sync failed, please check network and account settings
+ Sync failed, internal error occurs
+ Sync is canceled
+ Logging into %1$s...
+ Getting remote note list...
+ Synchronize local notes with Google Task...
+
+ Settings
+ Sync account
+ Sync notes with google task
+ Last sync time %1$s
+ yyyy-MM-dd hh:mm:ss
+ Add account
+ Change sync account
+ Remove sync account
+ Cancel
+ Sync immediately
+ Cancel syncing
+ Current account %1$s
+ All sync related information will be deleted, which may result in duplicated items sometime
+ Sync notes
+ Please select a google account. Local notes will be synced with google task.
+ Cannot change the account because sync is in progress
+ %1$s has been set as the sync account
+ New note background color random
+
+ 删除
+ Call notes
+ Input name
+
+ Searching Notes
+ Search notes
+ Text in your notes
+ Notes
+ 设置
+ 取消
+
+ %1$s result for \"%2$s\"
+
+ %1$s results for \"%2$s\"
+
+
+ FullscreenActivity
+ Dummy Button
+ 小米便签！启动！
+ LoginActivity
+ Email
+ Password
+ Sign in or register
+ Sign in
+ "Welcome !"
+ Not a valid username
+ Password must be >5 characters
+ "Login failed"
+ 取消
+ 欢迎进入登陆界面
+ 注册
+ 默认背景
+
+ 私密模式
+ 退出私密模式
+
+
+
diff --git a/src/Notes-master/app/src/main/res/values/styles.xml b/src/NewNotes-master/app/src/main/res/values/styles.xml
similarity index 77%
rename from src/Notes-master/app/src/main/res/values/styles.xml
rename to src/NewNotes-master/app/src/main/res/values/styles.xml
index d750e65..7d2a5b0 100644
--- a/src/Notes-master/app/src/main/res/values/styles.xml
+++ b/src/NewNotes-master/app/src/main/res/values/styles.xml
@@ -16,21 +16,25 @@
-->
+
+
+
+
@@ -66,4 +70,13 @@
gone
+
+
+
+
\ No newline at end of file
diff --git a/src/NewNotes-master/app/src/main/res/values/themes.xml b/src/NewNotes-master/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..6f8ed18
--- /dev/null
+++ b/src/NewNotes-master/app/src/main/res/values/themes.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/xml/preferences.xml b/src/NewNotes-master/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/xml/preferences.xml
rename to src/NewNotes-master/app/src/main/res/xml/preferences.xml
diff --git a/src/Notes-master/app/src/main/res/xml/searchable.xml b/src/NewNotes-master/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/xml/searchable.xml
rename to src/NewNotes-master/app/src/main/res/xml/searchable.xml
diff --git a/src/Notes-master/app/src/main/res/xml/widget_2x_info.xml b/src/NewNotes-master/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/xml/widget_2x_info.xml
rename to src/NewNotes-master/app/src/main/res/xml/widget_2x_info.xml
diff --git a/src/Notes-master/app/src/main/res/xml/widget_4x_info.xml b/src/NewNotes-master/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from src/Notes-master/app/src/main/res/xml/widget_4x_info.xml
rename to src/NewNotes-master/app/src/main/res/xml/widget_4x_info.xml
diff --git a/src/NewNotes-master/build.gradle b/src/NewNotes-master/build.gradle
new file mode 100644
index 0000000..b164989
--- /dev/null
+++ b/src/NewNotes-master/build.gradle
@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ google()
+ maven{ url 'https://maven.aliyun.com/nexus/content/groups/public/'}
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:7.0.2'
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ maven{ url 'https://maven.aliyun.com/nexus/content/groups/public/'}
+ jcenter()
+ }
+}
diff --git a/src/Notes-master/gradle/wrapper/gradle-wrapper.jar b/src/NewNotes-master/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/Notes-master/gradle/wrapper/gradle-wrapper.jar
rename to src/NewNotes-master/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/Notes-master/gradle/wrapper/gradle-wrapper.properties b/src/NewNotes-master/gradle/wrapper/gradle-wrapper.properties
similarity index 80%
rename from src/Notes-master/gradle/wrapper/gradle-wrapper.properties
rename to src/NewNotes-master/gradle/wrapper/gradle-wrapper.properties
index 7e9d088..420eb91 100644
--- a/src/Notes-master/gradle/wrapper/gradle-wrapper.properties
+++ b/src/NewNotes-master/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 19 13:13:38 CST 2024
+#Wed Apr 24 23:24:28 CST 2024
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/Notes-master/gradlew b/src/NewNotes-master/gradlew
similarity index 100%
rename from src/Notes-master/gradlew
rename to src/NewNotes-master/gradlew
diff --git a/src/Notes-master/gradlew.bat b/src/NewNotes-master/gradlew.bat
similarity index 100%
rename from src/Notes-master/gradlew.bat
rename to src/NewNotes-master/gradlew.bat
diff --git a/src/NewNotes-master/import-summary.txt b/src/NewNotes-master/import-summary.txt
new file mode 100644
index 0000000..dfb4db4
--- /dev/null
+++ b/src/NewNotes-master/import-summary.txt
@@ -0,0 +1,43 @@
+ECLIPSE ANDROID PROJECT IMPORT SUMMARY
+======================================
+
+Ignored Files:
+--------------
+The following files were *not* copied into the new Gradle project; you
+should evaluate whether these are still needed in your project and if
+so manually move them:
+
+* .gitignore
+* .idea\
+* .idea\.gitignore
+* .idea\misc.xml
+* .idea\modules.xml
+* .idea\vcs.xml
+* .idea\workspace.xml
+* NOTICE
+* Notes.iml
+* README
+
+Moved Files:
+------------
+Android Gradle projects use a different directory structure than ADT
+Eclipse projects. Here's how the projects were restructured:
+
+* AndroidManifest.xml => app\src\main\AndroidManifest.xml
+* res\ => app\src\main\res\
+* src\ => app\src\main\java\
+
+Next Steps:
+-----------
+You can now build the project. The Gradle project needs network
+connectivity to download dependencies.
+
+Bugs:
+-----
+If for some reason your project does not build, and you determine that
+it is due to a bug or limitation of the Eclipse to Gradle importer,
+please file a bug at http://b.android.com with category
+Component-Tools.
+
+(This import summary is for your information only, and can be deleted
+after import once you are satisfied with the results.)
diff --git a/src/NewNotes-master/local.properties b/src/NewNotes-master/local.properties
new file mode 100644
index 0000000..919bfa5
--- /dev/null
+++ b/src/NewNotes-master/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Apr 25 23:02:47 CST 2024
+sdk.dir=D\:\\Android Studio\\SDK
diff --git a/src/Notes-master/settings.gradle b/src/NewNotes-master/settings.gradle
similarity index 100%
rename from src/Notes-master/settings.gradle
rename to src/NewNotes-master/settings.gradle
diff --git a/src/Notes-master/.gradle/7.5/checksums/checksums.lock b/src/Notes-master/.gradle/7.5/checksums/checksums.lock
deleted file mode 100644
index a551205..0000000
Binary files a/src/Notes-master/.gradle/7.5/checksums/checksums.lock and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
deleted file mode 100644
index 66cf85a..0000000
Binary files a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
deleted file mode 100644
index fdaa914..0000000
Binary files a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
deleted file mode 100644
index 09850e3..0000000
Binary files a/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
deleted file mode 100644
index dc39910..0000000
Binary files a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
deleted file mode 100644
index af3899d..0000000
Binary files a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
deleted file mode 100644
index d0f84d5..0000000
Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
deleted file mode 100644
index 41246a8..0000000
Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index 55ad920..0000000
Binary files a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin and /dev/null differ
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index d096b88..0000000
Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index e0e40e3..0000000
--- a/src/Notes-master/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tue Mar 19 13:15:40 CST 2024
-gradle.version=7.5
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 4b3dff6..0000000
Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ
diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe
deleted file mode 100644
index 4ff0830..0000000
Binary files a/src/Notes-master/.gradle/file-system.probe and /dev/null differ
diff --git a/src/Notes-master/.idea/compiler.xml b/src/Notes-master/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/src/Notes-master/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml
deleted file mode 100644
index 7070ee6..0000000
--- a/src/Notes-master/.idea/misc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build.gradle b/src/Notes-master/app/build.gradle
deleted file mode 100644
index d8a44c5..0000000
--- a/src/Notes-master/app/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdk 34
- buildToolsVersion "34.0.0"
-
- defaultConfig {
- applicationId "net.micode.notes"
- minSdk 14
- targetSdk 34
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
- }
- }
- compileOptions {
- targetCompatibility JavaVersion.VERSION_1_8
- }
- packagingOptions{
- exclude 'META-INF/DEPENDENCIES'
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'D:\\Android Studio\\Notes-master\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: ['commons-codec-1.11.jar','httpclient-cache-4.5.14.jar','httpclient-osgi-4.5.14.jar'])
-}
-
-
-
-
-
-
diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
deleted file mode 100644
index 17416de..0000000
Binary files a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
deleted file mode 100644
index 46dacc6..0000000
--- a/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-#- File Locator -
-listingFile=../../apk/debug/output-metadata.json
diff --git a/src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties
deleted file mode 100644
index 1d16f01..0000000
--- a/src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-appMetadataVersion=1.1
-androidGradlePluginVersion=7.4.1
diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
deleted file mode 100644
index a54964f..0000000
Binary files a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_aca9d2cd166513404b6573b21d232a602e9d3fec69f081dfa229060b07d00875_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
deleted file mode 100644
index 94b3668..0000000
Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
deleted file mode 100644
index f8bfe35..0000000
Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/0_commons-logging-1.2.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/0_commons-logging-1.2.jar
deleted file mode 100644
index c9a90e9..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/0_commons-logging-1.2.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/1_fluent-hc-4.5.14.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/1_fluent-hc-4.5.14.jar
deleted file mode 100644
index 96d25a1..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/1_fluent-hc-4.5.14.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpclient-4.5.14.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpclient-4.5.14.jar
deleted file mode 100644
index 618a216..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpclient-4.5.14.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/3_httpclient-win-4.5.14.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/3_httpclient-win-4.5.14.jar
deleted file mode 100644
index 18ee442..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/3_httpclient-win-4.5.14.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/4_httpcore-4.4.16.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/4_httpcore-4.4.16.jar
deleted file mode 100644
index 8a167df..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/4_httpcore-4.4.16.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/5_httpmime-4.5.14.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/5_httpmime-4.5.14.jar
deleted file mode 100644
index 5503c7d..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/5_httpmime-4.5.14.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/6_jna-4.5.2.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/6_jna-4.5.2.jar
deleted file mode 100644
index 19d3940..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/6_jna-4.5.2.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/7_jna-platform-4.5.2.jar b/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/7_jna-platform-4.5.2.jar
deleted file mode 100644
index 8e7fce0..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_file_lib_dex_archives/debug/7_jna-platform-4.5.2.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
deleted file mode 100644
index 7c581d1..0000000
Binary files a/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
deleted file mode 100644
index 6783539..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GjQSsJ9RC+tcpdHj3WngpwUcbXQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GjQSsJ9RC+tcpdHj3WngpwUcbXQ=
deleted file mode 100644
index 93a3b9f..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GjQSsJ9RC+tcpdHj3WngpwUcbXQ= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I9u6UHseoU3mgJ2hNKgiqDlDL+I= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I9u6UHseoU3mgJ2hNKgiqDlDL+I=
deleted file mode 100644
index 66c75aa..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I9u6UHseoU3mgJ2hNKgiqDlDL+I= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W4FJ1keDYkqKSGZxzi2F3rtsMXw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W4FJ1keDYkqKSGZxzi2F3rtsMXw=
deleted file mode 100644
index aa34419..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W4FJ1keDYkqKSGZxzi2F3rtsMXw= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aCUJAVFIQDP7zruJIttJ2TUASUo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aCUJAVFIQDP7zruJIttJ2TUASUo=
deleted file mode 100644
index e89f593..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aCUJAVFIQDP7zruJIttJ2TUASUo= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cp93+GfjN8rKv_NqczD0Yw59Chk= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cp93+GfjN8rKv_NqczD0Yw59Chk=
deleted file mode 100644
index 331e95c..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cp93+GfjN8rKv_NqczD0Yw59Chk= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOHFX3PS1014q68XSKX1DXQ++bM= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOHFX3PS1014q68XSKX1DXQ++bM=
deleted file mode 100644
index aed581e..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOHFX3PS1014q68XSKX1DXQ++bM= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mpwbjUL3tLZ6y9FriNQs1TonOhQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mpwbjUL3tLZ6y9FriNQs1TonOhQ=
deleted file mode 100644
index 78e2058..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mpwbjUL3tLZ6y9FriNQs1TonOhQ= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qpM9RPp6vRgNGmjevKBryifHpyQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qpM9RPp6vRgNGmjevKBryifHpyQ=
deleted file mode 100644
index 2bb7c07..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qpM9RPp6vRgNGmjevKBryifHpyQ= and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
deleted file mode 100644
index 9a57df9..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ /dev/null
@@ -1,96 +0,0 @@
-#Tue Mar 19 13:30:52 CST 2024
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index d65e0cc..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- 短信
- 邮件
-
-
- %1$s 条符合“%2$s”的搜索结果
-
- 确认删除文件夹及所包含的便签吗？
- 确认要删除该条便签吗?
- 确认要删除所选的 %d 条便签吗?
- 删除
- 便签
- 便签2x2
- 便签4x4
- 删除
- 通话便签
- 取消
- 设置
- 成功删除提醒
- 不能为空便签设置闹钟提醒
- 不能将空便签发送到桌面
- 要查看的便签不存在
- 导出文本时发生错误，请检查SD卡
- SD卡被占用，不能操作
- 同步已取消
- 同步失败，发生内部错误
- 同步失败，请检查网络和帐号设置
- 导出失败
- 文件夹 %1$s 已存在，请重新命名
- yyyyMMdd
- MM月dd日 kk:mm
- 已将文本文件(%1$s)输出至SD卡(%2$s)目录
- 已将所选 %1$d 条便签移到 %2$s 文件夹
- 请输入名称
- 已添加到桌面
- 提醒我
- 新建文件夹
- 删除
- 取消全选
- 导出文本
- 修改文件夹名称
- 刪除文件夹
- 查看文件夹
- 大
- 正常
- 文字大小
- 小
- 超大
- 进入清单模式
- 移动到文件夹
- 上一级文件夹
- 退出清单模式
- 删除提醒
- 搜索
- 全选
- 没有选中项，操作无效
- 选中了 %d 项
- 发送到桌面
- 设置
- 分享
- 同步
- 取消同步
- 选择文件夹
- 已过期
- 发送邮件
- 打开地图
- 呼叫电话
- 浏览网页
- 查看
- 知道了
- 新建便签
- ...
- 与google task同步便签记录
- 同步账号
- 添加账号
- 新建便签背景颜色随机
- 取消同步
- 立即同步
- 当前帐号 %1$s
- 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复
- 请选择google帐号，便签将与该帐号的google task内容同步。
- 同步便签
- 上次同步于 %1$s
- 取消
- 更换账号
- 删除账号
- 设置
- 正在同步中，不能修改同步帐号
- 同步帐号已设置为%1$s
- 便签
- 搜索便签
- 正在搜索便签
- 便签中的文字
- 创建提醒
- 导出成功
- 与%1$s同步成功
- 正在获取服务器便签列表...
- 登录%1$s...
- 正在同步本地便签...
- 同步已取消
- 同步失败
- 同步成功
- 同步便签...
- 没有关联内容，点击新建便签。
- 访客模式下，便签内容不可见
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 226b5bc..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- 短信
- 郵件
-
-
- %1$s 條符合”%2$s“的搜尋結果
-
- 確認刪除檔夾及所包含的便簽嗎？
- 确认要删除該條便籤嗎?
- 确认要刪除所選的 %d 條便籤嗎?
- 刪除
- 便簽
- 便簽2x2
- 便簽4x4
- 刪除
- 通話便籤
- 取消
- 設置
- 成功刪除提醒
- 不能爲空便籤設置鬧鐘提醒
- 不能將空便籤發送到桌面
- 要查看的便籤不存在
- 導出TXT時發生錯誤，請檢查SD卡
- SD卡被佔用，不能操作
- 同步已取消
- 同步失敗，發生內部錯誤
- 同步失敗，請檢查網絡和帳號設置
- 導出失敗
- 文件夾 %1$s 已存在，請重新命名
- yyyyMMdd
- MM月dd日 kk:mm
- 已將文本文件(%1$s)導出至SD(%2$s)目錄
- 已將所選 %1$d 便籤移到 %2$s 文件夾
- 請輸入名稱
- 已添加到桌面
- 提醒我
- 新建文件夾
- 刪除
- 取消全選
- 導出文本
- 修改文件夾名稱
- 刪除文件夾
- 查看文件夾
- 大
- 正常
- 文字大小
- 小
- 超大
- 進入清單模式
- 移動到文件夾
- 上一級文件夾
- 退出清單模式
- 刪除提醒
- 搜尋
- 全選
- 沒有選中項，操作無效
- 選中了 %d 項
- 發送到桌面
- 設置
- 分享
- 同步
- 取消同步
- 選擇文件夾
- 已過期
- 發送郵件
- 打開地圖
- 呼叫電話
- 浏覽網頁
- 查看
- 知道了
- 新建便簽
- ...
- 与google task同步便簽記錄
- 同步賬號
- 添加賬號
- 新建便籤背景顏色隨機
- 取消同步
- 立即同步
- 當前帳號 %1$s
- 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復
- 請選擇google帳號，便簽將與該帳號的google task內容同步。
- 同步便簽
- 上次同步于 %1$s
- 取消
- 更換賬號
- 刪除賬號
- 設置
- 正在同步中，不能修改同步帳號
- 同步帳號已設置為%1$s
- 便籤
- 搜索便籤
- 正在搜索便籤
- 便籤中的文字
- 創建提醒
- 導出成功
- 與%1$s同步成功
- 正在獲取服務器便籤列表...
- 登陸%1$s...
- 正在同步本地便籤...
- 同步已取消
- 同步失敗
- 同步成功
- 同步便簽...
- 沒有關聯內容，點擊新建便簽。
- 訪客模式下，便籤內容不可見
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
deleted file mode 100644
index e49b0c3..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
- -%s
- --%s
- --%s
- --%s
-
-
- Messaging
- Email
-
- #335b5b5b
- 26sp
- 20sp
- 17sp
- 14sp
- 33sp
-
- %1$s result for \"%2$s\"
-
- %1$s results for \"%2$s\"
-
- Confirm to delete folder and its notes?
- Confirm to delete this note?
- Confirm to delete the selected %d notes?
- Delete selected notes
- Notes
- Notes 2x2
- Notes 4x4
- Delete
- Call notes
- cancel
- set
- Delete reminder successfully
- Sorry, can not set clock on empty note
- Sorry, can not send and empty note to home
- The note is not exist
- Export failed, please check SD card
- SD card busy, not available now
- Sync is canceled
- Sync failed, internal error occurs
- Sync failed, please check network and account settings
- Export fail
- notes_%s.txt
- /MIUI/notes/
- The folder %1$s exist, please rename
- yyyyMMdd
- MMMd kk:mm
- Export text file (%1$s) to SD (%2$s) directory
- (%d)
- Have moved selected %1$d notes to %2$s folder
- Input name
- Note added to home
- Remind me
- New Folder
- Delete
- Deselect all
- Export text
- Change folder name
- Delete folder
- View folder
- Large
- Medium
- Font size
- Small
- Super
- Enter check list
- Move to folder
- Parent folder
- Leave check list
- Delete reminder
- Search
- Select all
- Nothing selected, the operation is invalid
- %d selected
- Send to home
- Settings
- Share
- Sync
- Cancel syncing
- Select folder
- Expired
- Send email
- Open map
- Call
- Browse web
- Take a look
- Got it
- Add note
- ...
- Sync notes with google task
- Sync account
- Add account
- New note background color random
- Cancel syncing
- Sync immediately
- Current account %1$s
- All sync related information will be deleted, which may result in duplicated items sometime
- Please select a google account. Local notes will be synced with google task.
- Sync notes
- Last sync time %1$s
- yyyy-MM-dd hh:mm:ss
- Cancel
- Change sync account
- Remove sync account
- Settings
- Cannot change the account because sync is in progress
- %1$s has been set as the sync account
- Notes
- Search notes
- Searching Notes
- Text in your notes
- Set reminder
- Export successful
- Sync is successful with account %1$s
- Getting remote note list...
- Logging into %1$s...
- Synchronize local notes with Google Task...
- Sync is canceled
- Sync is failed
- Sync is successful
- Syncing notes...
- No associated note found, click to create associated note.
- Privacy mode，can not see note content
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
deleted file mode 100644
index 4ddff15..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- -%s
- --%s
- --%s
- --%s
-
- Messaging
- Email
- #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
-
- %1$s results for \"%2$s\"
-
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
- %1$s 条符合“%2$s”的搜索结果
-
- 短信
- 郵件
- 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
- %1$s 條符合”%2$s“的搜尋結果
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
deleted file mode 100644
index a7a1bd0..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted file mode 100644
index 9904d2f..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted file mode 100644
index d4fe28c..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
deleted file mode 100644
index d0ba2c8..0000000
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Mar 19 14:50:42 CST 2024
-base.0=D\:\\Android Studio\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-renamed.0=classes.dex
-path.0=classes.dex
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
deleted file mode 100644
index 42d1eaf..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
deleted file mode 100644
index 7735be2..0000000
Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
deleted file mode 100644
index f98637b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
deleted file mode 100644
index 6e28b50..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
deleted file mode 100644
index 534af6e..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
deleted file mode 100644
index 4be9a30..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
deleted file mode 100644
index 0d9547b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
deleted file mode 100644
index 37c051d..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
deleted file mode 100644
index a78b61a..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
deleted file mode 100644
index bdc56b1..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
deleted file mode 100644
index 56d65f1..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
deleted file mode 100644
index 1f3ea0b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
deleted file mode 100644
index 976265d..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
deleted file mode 100644
index 2319eaf..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
deleted file mode 100644
index d2dcfb5..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
deleted file mode 100644
index c61d69f..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
deleted file mode 100644
index 26c68fb..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
deleted file mode 100644
index d4e7deb..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
deleted file mode 100644
index 69ac9b5..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
deleted file mode 100644
index 3c7e5b6..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
deleted file mode 100644
index 06827bd..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
deleted file mode 100644
index 2c17a69..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
deleted file mode 100644
index fd895e5..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
deleted file mode 100644
index 2bf7752..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
deleted file mode 100644
index 2910488..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
deleted file mode 100644
index f105e8c..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
deleted file mode 100644
index cecf07f..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
deleted file mode 100644
index 5d5ada0..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
deleted file mode 100644
index 30318fc..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
deleted file mode 100644
index bbbea2e..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
deleted file mode 100644
index 46734e7..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
deleted file mode 100644
index e9f5b68..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
deleted file mode 100644
index bfb671c..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
deleted file mode 100644
index ed4ac8e..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
deleted file mode 100644
index fc1d9a2..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
deleted file mode 100644
index d4500ff..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
deleted file mode 100644
index f1053bc..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
deleted file mode 100644
index 34b5c02..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
deleted file mode 100644
index 1714fc2..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
deleted file mode 100644
index 595f36d..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
deleted file mode 100644
index 7ded6f4..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
deleted file mode 100644
index 79598f6..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
deleted file mode 100644
index 124eb6a..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
deleted file mode 100644
index e8e0e45..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
deleted file mode 100644
index c3ee8d8..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
deleted file mode 100644
index 4812c99..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
deleted file mode 100644
index 0754ffc..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
deleted file mode 100644
index dc60fe0..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
deleted file mode 100644
index 6597282..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
deleted file mode 100644
index ff95cab..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
deleted file mode 100644
index 75a9a17..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
deleted file mode 100644
index fa573a1..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
deleted file mode 100644
index 81d6513..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
deleted file mode 100644
index 66c9e6f..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
deleted file mode 100644
index 86cabc1..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
deleted file mode 100644
index 5012ef9..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
deleted file mode 100644
index 354ae8e..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
deleted file mode 100644
index 4064ac0..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
deleted file mode 100644
index 19383ea..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
deleted file mode 100644
index 29d4cf9..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
deleted file mode 100644
index 432dd4e..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
deleted file mode 100644
index ad7cce4..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
deleted file mode 100644
index 6e0f050..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
deleted file mode 100644
index 1a3310a..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
deleted file mode 100644
index 93cd34b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
deleted file mode 100644
index fea6568..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
deleted file mode 100644
index 1588b99..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
deleted file mode 100644
index d4e78a1..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
deleted file mode 100644
index e7ac3f6..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
deleted file mode 100644
index 11e437f..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
deleted file mode 100644
index df2d946..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
deleted file mode 100644
index dbd12f5..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
deleted file mode 100644
index 4981765..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
deleted file mode 100644
index 64f15ff..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
deleted file mode 100644
index 817bf17..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
deleted file mode 100644
index 77d2608..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
deleted file mode 100644
index b979434..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
deleted file mode 100644
index e8eaf4b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
deleted file mode 100644
index b243892..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
deleted file mode 100644
index 06036f1..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
deleted file mode 100644
index 08ab9fa..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
deleted file mode 100644
index ff543cd..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
deleted file mode 100644
index d42da3c..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
deleted file mode 100644
index 5d8717b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
deleted file mode 100644
index b58eac3..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
deleted file mode 100644
index 9ec847b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
deleted file mode 100644
index 7598ed0..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
deleted file mode 100644
index 573ba34..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
deleted file mode 100644
index a1c7178..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
deleted file mode 100644
index c01fcae..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
deleted file mode 100644
index d7027b9..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
deleted file mode 100644
index eb4eff7..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
deleted file mode 100644
index 245633b..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
deleted file mode 100644
index bcc1f6d..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
deleted file mode 100644
index 5053337..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
deleted file mode 100644
index f6e1ed8..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
deleted file mode 100644
index fabc84f..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
deleted file mode 100644
index e33d1c0..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
deleted file mode 100644
index e315716..0000000
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted file mode 100644
index c9925c3..0000000
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-1
-2
-17
-21
-22 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-23 android:minSdkVersion="14"
-23-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
-24 android:targetSdkVersion="34" />
-24-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-25
-26
-26-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
-27
-27-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
-28
-28-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
-29
-29-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
-30
-30-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
-31
-31-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
-32
-32-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
-33
-33-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
-34
-34-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
-35
-36 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:35:5-154:19
-37 android:debuggable="true"
-38 android:icon="@drawable/icon_app"
-38-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
-39 android:label="@string/app_name"
-39-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
-40 android:testOnly="true" >
-41 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:38:9-52:20
-42 android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:40:13-49
-43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:41:13-74
-44 android:exported="true"
-44-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:39:13-36
-45 android:label="@string/app_name"
-45-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:42:13-45
-46 android:launchMode="singleTop"
-46-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:43:13-43
-47 android:theme="@style/NoteTheme"
-47-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:44:13-45
-48 android:uiOptions="splitActionBarWhenNarrow"
-48-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:45:13-57
-49 android:windowSoftInputMode="adjustPan" >
-49-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:46:13-52
-50
-50-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:48:13-51:29
-51
-51-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:49:17-69
-51-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:49:25-66
-52
-53
-53-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:50:17-77
-53-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:50:27-74
-54
-55
-56 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:54:9-84:20
-57 android:name="net.micode.notes.ui.NoteEditActivity"
-57-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:56:13-48
-58 android:configChanges="keyboardHidden|orientation|screenSize"
-58-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:57:13-74
-59 android:exported="true"
-59-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:55:13-36
-60 android:launchMode="singleTop"
-60-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:58:13-43
-61 android:theme="@style/NoteTheme" >
-61-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:59:13-45
-62
-62-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:61:13-67:29
-63 android:exported="true"
-64
-64-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:63:17-69
-64-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:63:25-66
-65
-66
-66-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:17-76
-66-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:27-73
-67
-68
-68-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:17-78
-68-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:23-75
-69
-69-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:17-78
-69-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:23-75
-70
-71
-71-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:69:13-74:29
-72
-72-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:70:17-79
-72-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:70:25-76
-73
-74
-74-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:17-76
-74-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:27-73
-75
-76
-76-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:17-78
-76-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:23-75
-77
-77-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:17-78
-77-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:23-75
-78
-79
-79-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:76:13-79:29
-80
-80-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:77:17-71
-80-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:77:25-68
-81
-82
-82-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:17-76
-82-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:27-73
-83
-84
-85 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:81:13-83:54
-86 android:name="android.app.searchable"
-86-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:82:17-54
-87 android:resource="@xml/searchable" />
-87-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:83:17-51
-88
-89
-90 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:86:9-89:43
-91 android:name="net.micode.notes.data.NotesProvider"
-91-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:87:13-63
-92 android:authorities="micode_notes"
-92-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:88:13-47
-93 android:multiprocess="true" />
-93-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:89:13-40
-94
-95 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:91:9-104:20
-96 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-96-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:93:13-57
-97 android:exported="true"
-97-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:92:13-36
-98 android:label="@string/app_widget2x2" >
-98-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:94:13-50
-99
-99-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:95:13-99:29
-100
-100-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:96:17-84
-100-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:96:25-81
-101
-101-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:97:17-85
-101-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:97:25-82
-102
-102-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:98:17-85
-102-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:98:25-82
-103
-104
-105 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:101:13-103:58
-106 android:name="android.appwidget.provider"
-106-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:102:17-58
-107 android:resource="@xml/widget_2x_info" />
-107-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:103:17-55
-108
-109 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:105:9-119:20
-110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-110-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:107:13-57
-111 android:exported="true"
-111-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:106:13-36
-112 android:label="@string/app_widget4x4" >
-112-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:108:13-50
-113
-113-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:95:13-99:29
-114
-114-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:96:17-84
-114-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:96:25-81
-115
-115-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:97:17-85
-115-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:97:25-82
-116
-116-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:98:17-85
-116-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:98:25-82
-117
-118
-119 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:101:13-103:58
-120 android:name="android.appwidget.provider"
-120-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:102:17-58
-121 android:resource="@xml/widget_4x_info" />
-121-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:103:17-55
-122
-123 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:121:9-125:20
-124 android:name="net.micode.notes.ui.AlarmInitReceiver"
-124-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:121:19-55
-125 android:exported="true" >
-125-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:121:56-79
-126
-126-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:122:13-124:29
-127
-127-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:123:17-79
-127-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:123:25-76
-128
-129
-130 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:127:9-130:20
-131 android:name="net.micode.notes.ui.AlarmReceiver"
-131-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:128:13-61
-132 android:process=":remote" >
-132-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:129:13-38
-133
-134
-135 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20
-136 android:name="net.micode.notes.ui.AlarmAlertActivity"
-136-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:133:13-50
-137 android:label="@string/app_name"
-137-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:134:13-45
-138 android:launchMode="singleInstance"
-138-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:135:13-48
-139 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-139-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:136:13-75
-140
-141 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:139:9-144:20
-142 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-142-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:140:13-71
-143 android:label="@string/preferences_title"
-143-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:141:13-54
-144 android:launchMode="singleTop"
-144-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:142:13-43
-145 android:theme="@android:style/Theme.Holo.Light" >
-145-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:143:13-60
-146
-147
-148 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:146:9-149:19
-149 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-149-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:147:13-74
-150 android:exported="false" >
-150-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:148:13-37
-151
-152
-153 D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:151:9-153:52
-154 android:name="android.app.default_searchable"
-154-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:152:13-58
-155 android:value=".ui.NoteEditActivity" />
-155-->D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:153:13-49
-156
-157
-158
diff --git a/src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar
deleted file mode 100644
index e835c88..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
deleted file mode 100644
index e23284b..0000000
--- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- android:exported="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
deleted file mode 100644
index e23284b..0000000
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- android:exported="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
deleted file mode 100644
index 802be34..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
deleted file mode 100644
index 2d9ddb4..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
deleted file mode 100644
index a9576bb..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
deleted file mode 100644
index 74c78c0..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
deleted file mode 100644
index ce52bc1..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
deleted file mode 100644
index 8a98c38..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
deleted file mode 100644
index f82dd6d..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
deleted file mode 100644
index 683b6f1..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
deleted file mode 100644
index 3f89243..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
deleted file mode 100644
index 4f7fa61..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
deleted file mode 100644
index 224f699..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
deleted file mode 100644
index d29584e..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
deleted file mode 100644
index 6a55c1f..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
deleted file mode 100644
index a3558dd..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
deleted file mode 100644
index 812fbce..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
deleted file mode 100644
index a0b2963..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
deleted file mode 100644
index 8b4b3a5..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
deleted file mode 100644
index 5fdf154..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
deleted file mode 100644
index afee10f..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
deleted file mode 100644
index b3d34f5..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
deleted file mode 100644
index 951dd2f..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
deleted file mode 100644
index 48aa960..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
deleted file mode 100644
index 504fc9c..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
deleted file mode 100644
index c2c61cc..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
deleted file mode 100644
index c138bc9..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
deleted file mode 100644
index 6e3c761..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
deleted file mode 100644
index 60513de..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
deleted file mode 100644
index 4e4f099..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
deleted file mode 100644
index 17cb018..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat
deleted file mode 100644
index 608c6fd..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
deleted file mode 100644
index 035ddcd..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
deleted file mode 100644
index 1043ced..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat
deleted file mode 100644
index ea0ebfc..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
deleted file mode 100644
index e36a338..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
deleted file mode 100644
index c4dc076..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
deleted file mode 100644
index b960844..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
deleted file mode 100644
index 1605ca0..0000000
Binary files a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
deleted file mode 100644
index 13fdc5c..0000000
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
- "map": [
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "817"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
- "from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
- }
- }
- ]
- },
- {
- "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
- "map": [
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
- },
- "to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
- "from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
- },
- "to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
- },
- "to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
- }
- }
- ]
- },
- {
- "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
- "map": [
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "817"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
- "from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
deleted file mode 100644
index 491664b..0000000
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
- "map": [
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "817"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
- "from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
deleted file mode 100644
index 5c7759a..0000000
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
- "map": [
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "817"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
- "from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
- },
- "to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
deleted file mode 100644
index 43c1ff1..0000000
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "logs": [
- {
- "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
- "map": [
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
- },
- "to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
- "from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
- },
- "to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
- }
- },
- {
- "source": "D:\\Android Studio\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
- },
- "to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
- }
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
deleted file mode 100644
index 2a106a9..0000000
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ /dev/null
@@ -1,382 +0,0 @@
-[
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_item.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
- "source": "net.micode.notes.app-main-7:/raw/introduction"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat",
- "source": "net.micode.notes.app-main-7:/drawable/new_note.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
- "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
- "source": "net.micode.notes.app-main-7:/xml/preferences.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
- "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
- "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat",
- "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
- "source": "net.micode.notes.app-main-7:/xml/searchable.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
- "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
- }
-]
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
deleted file mode 100644
index e23284b..0000000
--- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- android:exported="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
deleted file mode 100644
index b705a17..0000000
Binary files a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar
deleted file mode 100644
index fa87605..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
deleted file mode 100644
index ebf79ba..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
deleted file mode 100644
index 1f9ff81..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
deleted file mode 100644
index a2b0525..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
deleted file mode 100644
index 2fbf54b..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
deleted file mode 100644
index bec0b42..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
deleted file mode 100644
index 7302df1..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
deleted file mode 100644
index 55c07e3..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
deleted file mode 100644
index 0138acd..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
deleted file mode 100644
index c514f8d..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
deleted file mode 100644
index 33a1e8e..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
deleted file mode 100644
index 43fbb95..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
deleted file mode 100644
index c804edb..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
deleted file mode 100644
index 7a975d2..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
deleted file mode 100644
index 8fa92ab..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
deleted file mode 100644
index 7484169..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
deleted file mode 100644
index aa009a0..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
deleted file mode 100644
index 84d2dc7..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
deleted file mode 100644
index 6b5778b..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
deleted file mode 100644
index 95f1787..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
deleted file mode 100644
index 0edc3e3..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
deleted file mode 100644
index 3f534f4..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
deleted file mode 100644
index 66440b5..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
deleted file mode 100644
index db641dc..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
deleted file mode 100644
index 7d8a2cc..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
deleted file mode 100644
index f34ea10..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
deleted file mode 100644
index 6f5252f..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
deleted file mode 100644
index d8d0af5..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
deleted file mode 100644
index 36627fa..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
deleted file mode 100644
index 7193315..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
deleted file mode 100644
index 86f7f9f..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
deleted file mode 100644
index ef2fe6c..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
deleted file mode 100644
index a49e587..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
deleted file mode 100644
index 296ff56..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
deleted file mode 100644
index 602aad6..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
deleted file mode 100644
index 93f17cb..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
deleted file mode 100644
index 54adcf9..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
deleted file mode 100644
index c6e8fd8..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
deleted file mode 100644
index c38244b..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
deleted file mode 100644
index 288c6fd..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
deleted file mode 100644
index c129c9e..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
deleted file mode 100644
index ac6117e..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
deleted file mode 100644
index 7201f1d..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
deleted file mode 100644
index 1fb0182..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
deleted file mode 100644
index 1cbdbb2..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
deleted file mode 100644
index f2219ba..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
deleted file mode 100644
index c64b75d..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
deleted file mode 100644
index d76f231..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
deleted file mode 100644
index 0d3d400..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
deleted file mode 100644
index 33ac2d5..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
deleted file mode 100644
index 5c48404..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
deleted file mode 100644
index 4146280..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
deleted file mode 100644
index 6f0d01c..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
deleted file mode 100644
index 312fbad..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
deleted file mode 100644
index 5b91144..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
deleted file mode 100644
index feb5c80..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
deleted file mode 100644
index 6b44eab..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
deleted file mode 100644
index 59d7247..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
deleted file mode 100644
index 115709e..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
deleted file mode 100644
index 8c202a1..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
deleted file mode 100644
index fb8b80e..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
deleted file mode 100644
index 76dc737..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
deleted file mode 100644
index 99d12e8..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
deleted file mode 100644
index 97ed6fa..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
deleted file mode 100644
index 8d7e1d8..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
deleted file mode 100644
index 600d8fb..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
deleted file mode 100644
index 4c8920b..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
deleted file mode 100644
index 9dee3c8..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
deleted file mode 100644
index ea4f037..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
deleted file mode 100644
index 768eac9..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
deleted file mode 100644
index 4a109e9..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
deleted file mode 100644
index c3344a9..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
deleted file mode 100644
index dd72238..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
deleted file mode 100644
index ab39c99..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
deleted file mode 100644
index f8c2de3..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
deleted file mode 100644
index 3884261..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
deleted file mode 100644
index b125b7f..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
deleted file mode 100644
index ea4d3bb..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
deleted file mode 100644
index 303cd9e..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
deleted file mode 100644
index 55eeca3..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
deleted file mode 100644
index 4ff53c2..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
deleted file mode 100644
index 2559347..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
deleted file mode 100644
index 1b88930..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
deleted file mode 100644
index aae067f..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
deleted file mode 100644
index 2c28295..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
deleted file mode 100644
index 61db915..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
deleted file mode 100644
index c8c3677..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
deleted file mode 100644
index affae58..0000000
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and /dev/null differ
diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
deleted file mode 100644
index 00d6e91..0000000
--- a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-int array format_for_exported_note 0x7f010000
-int array menu_share_ways 0x7f010001
-int color primary_text_dark 0x7f020000
-int color secondary_text_dark 0x7f020001
-int color user_query_highlight 0x7f020002
-int dimen text_font_size_large 0x7f030000
-int dimen text_font_size_medium 0x7f030001
-int dimen text_font_size_normal 0x7f030002
-int dimen text_font_size_small 0x7f030003
-int dimen text_font_size_super 0x7f030004
-int drawable bg_btn_set_color 0x7f040000
-int drawable bg_color_btn_mask 0x7f040001
-int drawable call_record 0x7f040002
-int drawable clock 0x7f040003
-int drawable delete 0x7f040004
-int drawable dropdown_icon 0x7f040005
-int drawable edit_blue 0x7f040006
-int drawable edit_green 0x7f040007
-int drawable edit_red 0x7f040008
-int drawable edit_title_blue 0x7f040009
-int drawable edit_title_green 0x7f04000a
-int drawable edit_title_red 0x7f04000b
-int drawable edit_title_white 0x7f04000c
-int drawable edit_title_yellow 0x7f04000d
-int drawable edit_white 0x7f04000e
-int drawable edit_yellow 0x7f04000f
-int drawable font_large 0x7f040010
-int drawable font_normal 0x7f040011
-int drawable font_size_selector_bg 0x7f040012
-int drawable font_small 0x7f040013
-int drawable font_super 0x7f040014
-int drawable icon_app 0x7f040015
-int drawable list_background 0x7f040016
-int drawable list_blue_down 0x7f040017
-int drawable list_blue_middle 0x7f040018
-int drawable list_blue_single 0x7f040019
-int drawable list_blue_up 0x7f04001a
-int drawable list_folder 0x7f04001b
-int drawable list_footer_bg 0x7f04001c
-int drawable list_green_down 0x7f04001d
-int drawable list_green_middle 0x7f04001e
-int drawable list_green_single 0x7f04001f
-int drawable list_green_up 0x7f040020
-int drawable list_red_down 0x7f040021
-int drawable list_red_middle 0x7f040022
-int drawable list_red_single 0x7f040023
-int drawable list_red_up 0x7f040024
-int drawable list_white_down 0x7f040025
-int drawable list_white_middle 0x7f040026
-int drawable list_white_single 0x7f040027
-int drawable list_white_up 0x7f040028
-int drawable list_yellow_down 0x7f040029
-int drawable list_yellow_middle 0x7f04002a
-int drawable list_yellow_single 0x7f04002b
-int drawable list_yellow_up 0x7f04002c
-int drawable menu_delete 0x7f04002d
-int drawable menu_move 0x7f04002e
-int drawable new_note 0x7f04002f
-int drawable new_note_normal 0x7f040030
-int drawable new_note_pressed 0x7f040031
-int drawable note_edit_color_selector_panel 0x7f040032
-int drawable notification 0x7f040033
-int drawable search_result 0x7f040034
-int drawable selected 0x7f040035
-int drawable title_alert 0x7f040036
-int drawable title_bar_bg 0x7f040037
-int drawable widget_2x_blue 0x7f040038
-int drawable widget_2x_green 0x7f040039
-int drawable widget_2x_red 0x7f04003a
-int drawable widget_2x_white 0x7f04003b
-int drawable widget_2x_yellow 0x7f04003c
-int drawable widget_4x_blue 0x7f04003d
-int drawable widget_4x_green 0x7f04003e
-int drawable widget_4x_red 0x7f04003f
-int drawable widget_4x_white 0x7f040040
-int drawable widget_4x_yellow 0x7f040041
-int id account_dialog_subtitle 0x7f050000
-int id account_dialog_title 0x7f050001
-int id action_select_all 0x7f050002
-int id amPm 0x7f050003
-int id btn_new_note 0x7f050004
-int id btn_set_bg_color 0x7f050005
-int id cb_edit_item 0x7f050006
-int id date 0x7f050007
-int id delete 0x7f050008
-int id et_edit_text 0x7f050009
-int id et_foler_name 0x7f05000a
-int id font_size_selector 0x7f05000b
-int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-int id menu_search 0x7f050028
-int id menu_send_to_desktop 0x7f050029
-int id menu_setting 0x7f05002a
-int id menu_share 0x7f05002b
-int id menu_sync 0x7f05002c
-int id minute 0x7f05002d
-int id move 0x7f05002e
-int id navigation_bar 0x7f05002f
-int id note_bg_color_selector 0x7f050030
-int id note_edit_list 0x7f050031
-int id note_edit_view 0x7f050032
-int id note_item 0x7f050033
-int id note_title 0x7f050034
-int id notes_list 0x7f050035
-int id prefenerece_sync_status_textview 0x7f050036
-int id preference_sync_button 0x7f050037
-int id selection_menu 0x7f050038
-int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
-int id tv_folder_name 0x7f05003b
-int id tv_modified_date 0x7f05003c
-int id tv_name 0x7f05003d
-int id tv_time 0x7f05003e
-int id tv_title 0x7f05003f
-int id tv_title_bar 0x7f050040
-int id widget_bg_image 0x7f050041
-int id widget_text 0x7f050042
-int layout account_dialog_title 0x7f060000
-int layout add_account_text 0x7f060001
-int layout datetime_picker 0x7f060002
-int layout dialog_edit_text 0x7f060003
-int layout folder_list_item 0x7f060004
-int layout note_edit 0x7f060005
-int layout note_edit_list_item 0x7f060006
-int layout note_item 0x7f060007
-int layout note_list 0x7f060008
-int layout note_list_dropdown_menu 0x7f060009
-int layout note_list_footer 0x7f06000a
-int layout settings_header 0x7f06000b
-int layout widget_2x 0x7f06000c
-int layout widget_4x 0x7f06000d
-int menu call_note_edit 0x7f070000
-int menu call_record_folder 0x7f070001
-int menu note_edit 0x7f070002
-int menu note_list 0x7f070003
-int menu note_list_dropdown 0x7f070004
-int menu note_list_options 0x7f070005
-int menu sub_folder 0x7f070006
-int plurals search_results_title 0x7f080000
-int raw introduction 0x7f090000
-int string alert_message_delete_folder 0x7f0a0000
-int string alert_message_delete_note 0x7f0a0001
-int string alert_message_delete_notes 0x7f0a0002
-int string alert_title_delete 0x7f0a0003
-int string app_name 0x7f0a0004
-int string app_widget2x2 0x7f0a0005
-int string app_widget4x4 0x7f0a0006
-int string button_delete 0x7f0a0007
-int string call_record_folder_name 0x7f0a0008
-int string datetime_dialog_cancel 0x7f0a0009
-int string datetime_dialog_ok 0x7f0a000a
-int string delete_remind_time_message 0x7f0a000b
-int string error_note_empty_for_clock 0x7f0a000c
-int string error_note_empty_for_send_to_desktop 0x7f0a000d
-int string error_note_not_exist 0x7f0a000e
-int string error_sdcard_export 0x7f0a000f
-int string error_sdcard_unmounted 0x7f0a0010
-int string error_sync_cancelled 0x7f0a0011
-int string error_sync_internal 0x7f0a0012
-int string error_sync_network 0x7f0a0013
-int string failed_sdcard_export 0x7f0a0014
-int string file_name_txt_format 0x7f0a0015
-int string file_path 0x7f0a0016
-int string folder_exist 0x7f0a0017
-int string format_date_ymd 0x7f0a0018
-int string format_datetime_mdhm 0x7f0a0019
-int string format_exported_file_location 0x7f0a001a
-int string format_folder_files_count 0x7f0a001b
-int string format_move_notes_to_folder 0x7f0a001c
-int string hint_foler_name 0x7f0a001d
-int string info_note_enter_desktop 0x7f0a001e
-int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_list_mode 0x7f0a002c
-int string menu_move 0x7f0a002d
-int string menu_move_parent_folder 0x7f0a002e
-int string menu_normal_mode 0x7f0a002f
-int string menu_remove_remind 0x7f0a0030
-int string menu_search 0x7f0a0031
-int string menu_select_all 0x7f0a0032
-int string menu_select_none 0x7f0a0033
-int string menu_select_title 0x7f0a0034
-int string menu_send_to_desktop 0x7f0a0035
-int string menu_setting 0x7f0a0036
-int string menu_share 0x7f0a0037
-int string menu_sync 0x7f0a0038
-int string menu_sync_cancel 0x7f0a0039
-int string menu_title_select_folder 0x7f0a003a
-int string note_alert_expired 0x7f0a003b
-int string note_link_email 0x7f0a003c
-int string note_link_other 0x7f0a003d
-int string note_link_tel 0x7f0a003e
-int string note_link_web 0x7f0a003f
-int string notealert_enter 0x7f0a0040
-int string notealert_ok 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
-int string search 0x7f0a0056
-int string search_hint 0x7f0a0057
-int string search_label 0x7f0a0058
-int string search_setting_description 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
-int string success_sync_account 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
-int string ticker_fail 0x7f0a0061
-int string ticker_success 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
-int style HighlightTextAppearancePrimary 0x7f0b0000
-int style HighlightTextAppearanceSecondary 0x7f0b0001
-int style NoteActionBarStyle 0x7f0b0002
-int style NoteTheme 0x7f0b0003
-int style TextAppearanceLarge 0x7f0b0004
-int style TextAppearanceMedium 0x7f0b0005
-int style TextAppearanceNormal 0x7f0b0006
-int style TextAppearancePrimaryItem 0x7f0b0007
-int style TextAppearanceSecondaryItem 0x7f0b0008
-int style TextAppearanceSuper 0x7f0b0009
-int style TextAppearanceUnderMenuIcon 0x7f0b000a
-int xml preferences 0x7f0c0000
-int xml searchable 0x7f0c0001
-int xml widget_2x_info 0x7f0c0002
-int xml widget_4x_info 0x7f0c0003
diff --git a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
deleted file mode 100644
index 9702040..0000000
--- a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-net.micode.notes.app-pngs-0 D:\Android Studio\Notes-master\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 D:\Android Studio\Notes-master\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 D:\Android Studio\Notes-master\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 D:\Android Studio\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 D:\Android Studio\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 D:\Android Studio\Notes-master\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 D:\Android Studio\Notes-master\app\src\debug\res
-net.micode.notes.app-main-7 D:\Android Studio\Notes-master\app\src\main\res
diff --git a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
deleted file mode 100644
index 4461006..0000000
--- a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:xml/preferences = 0x7f0c0000
-net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
-net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
-net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:string/ticker_success = 0x7f0a0062
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:string/search_label = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
-net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/success_sdcard_export = 0x7f0a005b
-net.micode.notes:string/notelist_string_info = 0x7f0a0043
-net.micode.notes:string/notelist_menu_new = 0x7f0a0042
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:string/notealert_enter = 0x7f0a0040
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/note_link_email = 0x7f0a003c
-net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_sync = 0x7f0a0038
-net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:string/menu_move = 0x7f0a002d
-net.micode.notes:string/menu_list_mode = 0x7f0a002c
-net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:drawable/list_green_up = 0x7f040020
-net.micode.notes:string/call_record_folder_name = 0x7f0a0008
-net.micode.notes:drawable/new_note_normal = 0x7f040030
-net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
-net.micode.notes:raw/introduction = 0x7f090000
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
-net.micode.notes:dimen/text_font_size_super = 0x7f030004
-net.micode.notes:drawable/selected = 0x7f040035
-net.micode.notes:plurals/search_results_title = 0x7f080000
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:menu/note_edit = 0x7f070002
-net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:layout/settings_header = 0x7f06000b
-net.micode.notes:layout/note_list = 0x7f060008
-net.micode.notes:drawable/list_white_single = 0x7f040027
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:layout/datetime_picker = 0x7f060002
-net.micode.notes:id/btn_new_note = 0x7f050004
-net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:id/widget_text = 0x7f050042
-net.micode.notes:id/tv_title_bar = 0x7f050040
-net.micode.notes:drawable/widget_2x_blue = 0x7f040038
-net.micode.notes:id/tv_time = 0x7f05003e
-net.micode.notes:id/tv_name = 0x7f05003d
-net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
-net.micode.notes:drawable/title_alert = 0x7f040036
-net.micode.notes:id/note_title = 0x7f050034
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:string/app_widget4x4 = 0x7f0a0006
-net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:id/minute = 0x7f05002d
-net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:id/menu_share = 0x7f05002b
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:drawable/list_green_down = 0x7f04001d
-net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:string/menu_folder_view = 0x7f0a0026
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/ticker_fail = 0x7f0a0061
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:drawable/edit_blue = 0x7f040006
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_alert = 0x7f0a001f
-net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
-net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:drawable/search_result = 0x7f040034
-net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
-net.micode.notes:id/tv_alert_date = 0x7f05003a
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:drawable/notification = 0x7f040033
-net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:string/menu_font_large = 0x7f0a0027
-net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/widget_bg_image = 0x7f050041
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:drawable/widget_4x_white = 0x7f040040
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:id/et_foler_name = 0x7f05000a
-net.micode.notes:drawable/edit_green = 0x7f040007
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:drawable/widget_4x_green = 0x7f04003e
-net.micode.notes:style/NoteTheme = 0x7f0b0003
-net.micode.notes:id/hour = 0x7f05000c
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:id/delete = 0x7f050008
-net.micode.notes:drawable/widget_2x_green = 0x7f040039
-net.micode.notes:drawable/title_bar_bg = 0x7f040037
-net.micode.notes:drawable/menu_delete = 0x7f04002d
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:drawable/list_green_single = 0x7f04001f
-net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
-net.micode.notes:id/tv_modified_date = 0x7f05003c
-net.micode.notes:drawable/list_blue_middle = 0x7f040018
-net.micode.notes:id/iv_small_select = 0x7f05001a
-net.micode.notes:menu/note_list_options = 0x7f070005
-net.micode.notes:xml/searchable = 0x7f0c0001
-net.micode.notes:string/menu_folder_delete = 0x7f0a0025
-net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:id/date = 0x7f050007
-net.micode.notes:drawable/list_yellow_single = 0x7f04002b
-net.micode.notes:drawable/list_red_up = 0x7f040024
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:id/tv_folder_name = 0x7f05003b
-net.micode.notes:drawable/list_yellow_down = 0x7f040029
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
-net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:drawable/list_white_up = 0x7f040028
-net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
-net.micode.notes:layout/dialog_edit_text = 0x7f060003
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
-net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:drawable/list_white_middle = 0x7f040026
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:drawable/list_footer_bg = 0x7f04001c
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
-net.micode.notes:drawable/edit_title_green = 0x7f04000a
-net.micode.notes:drawable/icon_app = 0x7f040015
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:drawable/widget_4x_red = 0x7f04003f
-net.micode.notes:id/menu_delete_remind = 0x7f050022
-net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:drawable/list_red_middle = 0x7f040022
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
-net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
-net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/tv_title = 0x7f05003f
-net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:drawable/list_blue_up = 0x7f04001a
-net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:drawable/list_blue_single = 0x7f040019
-net.micode.notes:drawable/font_large = 0x7f040010
-net.micode.notes:drawable/delete = 0x7f040004
-net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:id/note_item = 0x7f050033
-net.micode.notes:drawable/edit_title_white = 0x7f04000c
-net.micode.notes:id/note_edit_list = 0x7f050031
-net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:string/menu_delete = 0x7f0a0021
-net.micode.notes:drawable/list_folder = 0x7f04001b
-net.micode.notes:drawable/call_record = 0x7f040002
-net.micode.notes:string/search_hint = 0x7f0a0057
-net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:dimen/text_font_size_small = 0x7f030003
-net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:drawable/list_green_middle = 0x7f04001e
-net.micode.notes:drawable/list_background = 0x7f040016
-net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:string/menu_setting = 0x7f0a0036
-net.micode.notes:dimen/text_font_size_medium = 0x7f030001
-net.micode.notes:layout/note_edit_list_item = 0x7f060006
-net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/src/Notes-master/app/build/intermediates/variant_model/debug/variant_model.json b/src/Notes-master/app/build/intermediates/variant_model/debug/variant_model.json
deleted file mode 100644
index fbfb74a..0000000
Binary files a/src/Notes-master/app/build/intermediates/variant_model/debug/variant_model.json and /dev/null differ
diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk
deleted file mode 100644
index 0b036c0..0000000
Binary files a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ
diff --git a/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json
deleted file mode 100644
index b2231b9..0000000
--- a/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": 3,
- "artifactType": {
- "type": "APK",
- "kind": "Directory"
- },
- "applicationId": "net.micode.notes",
- "variantName": "debug",
- "elements": [
- {
- "type": "SINGLE",
- "filters": [],
- "attributes": [],
- "versionCode": 1,
- "versionName": "0.1",
- "outputFile": "app-debug.apk"
- }
- ],
- "elementType": "File"
-}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
deleted file mode 100644
index 881a917..0000000
--- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,245 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:1-155:12
- package
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- android:versionName
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- xmlns:android
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
- android:versionCode
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
- android:targetSdkVersion
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- android:minSdkVersion
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
- INJECTED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
-uses-permission#android.permission.INTERNET
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
-application
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:35:5-154:19
- android:label
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
- android:icon
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:38:9-52:20
- android:label
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:42:13-45
- android:launchMode
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:43:13-43
- android:windowSoftInputMode
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:46:13-52
- android:exported
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:39:13-36
- android:uiOptions
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:45:13-57
- android:configChanges
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:41:13-74
- android:theme
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:44:13-45
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:40:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:48:13-51:29
-action#android.intent.action.MAIN
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:49:17-69
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:49:25-66
-category#android.intent.category.LAUNCHER
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:50:17-77
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:50:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:54:9-84:20
- android:launchMode
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:58:13-43
- android:exported
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:55:13-36
- android:configChanges
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:57:13-74
- android:theme
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:59:13-45
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:56:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:61:13-67:29
-action#android.intent.action.VIEW
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:63:17-69
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:63:25-66
-category#android.intent.category.DEFAULT
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:17-76
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:64:27-73
-data
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:17-78
- android:mimeType
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:65:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:69:13-74:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:70:17-79
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:70:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:76:13-79:29
-action#android.intent.action.SEARCH
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:77:17-71
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:77:25-68
-meta-data#android.app.searchable
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:81:13-83:54
- android:resource
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:83:17-51
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:82:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:86:9-89:43
- android:authorities
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:88:13-47
- android:multiprocess
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:89:13-40
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:87:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:91:9-104:20
- android:label
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:94:13-50
- android:exported
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:92:13-36
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:93:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:95:13-99:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:96:17-84
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:96:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:97:17-85
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:97:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:98:17-85
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:98:25-82
-meta-data#android.appwidget.provider
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:101:13-103:58
- android:resource
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:103:17-55
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:102:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:105:9-119:20
- android:label
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:108:13-50
- android:exported
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:106:13-36
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:107:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:121:9-125:20
- android:exported
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:121:56-79
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:121:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:122:13-124:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:123:17-79
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:123:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:127:9-130:20
- android:process
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:129:13-38
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:128:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20
- android:label
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:134:13-45
- android:launchMode
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:135:13-48
- android:theme
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:136:13-75
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:133:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:139:9-144:20
- android:label
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:141:13-54
- android:launchMode
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:142:13-43
- android:theme
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:143:13-60
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:140:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:146:9-149:19
- android:exported
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:148:13-37
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:147:13-74
-meta-data#android.app.default_searchable
-ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:151:9-153:52
- android:value
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:153:13-49
- android:name
- ADDED from D:\Android Studio\Notes-master\app\src\main\AndroidManifest.xml:152:13-58
diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
deleted file mode 100644
index 11c625e..0000000
Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ
diff --git a/src/Notes-master/app/src/main/AndroidManifest.xml b/src/Notes-master/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 42a6778..0000000
--- a/src/Notes-master/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- android:exported="true"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
deleted file mode 100644
index 63950e0..0000000
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-
-import org.json.JSONObject;
-
-public abstract class Node {
- public static final int SYNC_ACTION_NONE = 0;
-
- public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
- public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
- public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
- public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
- public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
- public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
- public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
- public static final int SYNC_ACTION_ERROR = 8;
-
- private String mGid;
-
- private String mName;
-
- private long mLastModified;
-
- private boolean mDeleted;
-
- public Node() {
- mGid = null;
- mName = "";
- mLastModified = 0;
- mDeleted = false;
- }
-
- public abstract JSONObject getCreateAction(int actionId);
-
- public abstract JSONObject getUpdateAction(int actionId);
-
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- public abstract void setContentByLocalJSON(JSONObject js);
-
- public abstract JSONObject getLocalJSONFromContent();
-
- public abstract int getSyncAction(Cursor c);
-
- public void setGid(String gid) {
- this.mGid = gid;
- }
-
- public void setName(String name) {
- this.mName = name;
- }
-
- public void setLastModified(long lastModified) {
- this.mLastModified = lastModified;
- }
-
- public void setDeleted(boolean deleted) {
- this.mDeleted = deleted;
- }
-
- public String getGid() {
- return this.mGid;
- }
-
- public String getName() {
- return this.mName;
- }
-
- public long getLastModified() {
- return this.mLastModified;
- }
-
- public boolean getDeleted() {
- return this.mDeleted;
- }
-
-}
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
deleted file mode 100644
index 96a9ff8..0000000
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ /dev/null
@@ -1,873 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlarmManager;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.text.style.BackgroundColorSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
-import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
-import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class NoteEditActivity extends Activity implements OnClickListener,
- NoteSettingChangedListener, OnTextViewChangeListener {
- private class HeadViewHolder {
- public TextView tvModified;
-
- public ImageView ivAlertIcon;
-
- public TextView tvAlertDate;
-
- public ImageView ibSetBgColor;
- }
-
- private static final Map sBgSelectorBtnsMap = new HashMap();
- 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);
- }
-
- private static final Map sBgSelectorSelectionMap = new HashMap();
- 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);
- }
-
- private static final Map sFontSizeBtnsMap = new HashMap();
- static {
- sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
- sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
- sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
- sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
- }
-
- private static final Map sFontSelectorSelectionMap = new HashMap();
- static {
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
- }
-
- private static final String TAG = "NoteEditActivity";
-
- private HeadViewHolder mNoteHeaderHolder;
-
- private View mHeadViewPanel;
-
- private View mNoteBgColorSelector;
-
- private View mFontSizeSelector;
-
- private EditText mNoteEditor;
-
- private View mNoteEditorPanel;
-
- private WorkingNote mWorkingNote;
-
- private SharedPreferences mSharedPrefs;
- private int mFontSizeId;
-
- private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
-
- private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
-
- public static final String TAG_CHECKED = String.valueOf('\u221A');
- public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
-
- private LinearLayout mEditTextList;
-
- private String mUserQuery;
- private Pattern mPattern;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- this.setContentView(R.layout.note_edit);
-
- if (savedInstanceState == null && !initActivityState(getIntent())) {
- finish();
- return;
- }
- initResources();
- }
-
- /**
- * Current activity may be killed when the memory is low. Once it is killed, for another time
- * user load this activity, we should restore the former state
- */
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
- if (!initActivityState(intent)) {
- finish();
- return;
- }
- Log.d(TAG, "Restoring from killed activity");
- }
- }
-
- private boolean initActivityState(Intent intent) {
- /**
- * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
- * then jump to the NotesListActivity
- */
- mWorkingNote = null;
- if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
- long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
- mUserQuery = "";
-
- /**
- * Starting from the searched result
- */
- if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
- noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
- mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
- }
-
- if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
- Intent jump = new Intent(this, NotesListActivity.class);
- startActivity(jump);
- showToast(R.string.error_note_not_exist);
- finish();
- return false;
- } else {
- mWorkingNote = WorkingNote.load(this, noteId);
- if (mWorkingNote == null) {
- Log.e(TAG, "load note failed with note id" + noteId);
- finish();
- return false;
- }
- }
- getWindow().setSoftInputMode(
- WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
- | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
- } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
- // New note
- long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
- int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
- AppWidgetManager.INVALID_APPWIDGET_ID);
- int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
- Notes.TYPE_WIDGET_INVALIDE);
- int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
- ResourceParser.getDefaultBgId(this));
-
- // Parse call-record note
- String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
- long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
- if (callDate != 0 && phoneNumber != null) {
- if (TextUtils.isEmpty(phoneNumber)) {
- Log.w(TAG, "The call record number is null");
- }
- long noteId = 0;
- if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
- phoneNumber, callDate)) > 0) {
- mWorkingNote = WorkingNote.load(this, noteId);
- if (mWorkingNote == null) {
- Log.e(TAG, "load call note failed with note id" + noteId);
- finish();
- return false;
- }
- } else {
- mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
- widgetType, bgResId);
- mWorkingNote.convertToCallNote(phoneNumber, callDate);
- }
- } else {
- mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
- bgResId);
- }
-
- getWindow().setSoftInputMode(
- WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
- | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
- } else {
- Log.e(TAG, "Intent not specified action, should not support");
- finish();
- return false;
- }
- mWorkingNote.setOnSettingStatusChangedListener(this);
- return true;
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- initNoteScreen();
- }
-
- private void initNoteScreen() {
- mNoteEditor.setTextAppearance(this, TextAppearanceResources
- .getTexAppearanceResource(mFontSizeId));
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
- mNoteEditor.setSelection(mNoteEditor.getText().length());
- }
- for (Integer id : sBgSelectorSelectionMap.keySet()) {
- findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
- }
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
-
- mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
- mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
- | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
- | DateUtils.FORMAT_SHOW_YEAR));
-
- /**
- * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
- * is not ready
- */
- showAlertHeader();
- }
-
- private void showAlertHeader() {
- if (mWorkingNote.hasClockAlert()) {
- long time = System.currentTimeMillis();
- if (time > mWorkingNote.getAlertDate()) {
- mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- } else {
- mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
- mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
- }
- mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
- mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
- } else {
- mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
- mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
- };
- }
-
- @Override
- protected void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- initActivityState(intent);
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- /**
- * For new note without note id, we should firstly save it to
- * generate a id. If the editing note is not worth saving, there
- * is no id which is equivalent to create new note
- */
- if (!mWorkingNote.existInDatabase()) {
- saveNote();
- }
- outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
- Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
- }
-
- @Override
- public boolean dispatchTouchEvent(MotionEvent ev) {
- if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
- && !inRangeOfView(mNoteBgColorSelector, ev)) {
- mNoteBgColorSelector.setVisibility(View.GONE);
- return true;
- }
-
- if (mFontSizeSelector.getVisibility() == View.VISIBLE
- && !inRangeOfView(mFontSizeSelector, ev)) {
- mFontSizeSelector.setVisibility(View.GONE);
- return true;
- }
- return super.dispatchTouchEvent(ev);
- }
-
- private boolean inRangeOfView(View view, MotionEvent ev) {
- int []location = new int[2];
- view.getLocationOnScreen(location);
- int x = location[0];
- int y = location[1];
- if (ev.getX() < x
- || ev.getX() > (x + view.getWidth())
- || ev.getY() < y
- || ev.getY() > (y + view.getHeight())) {
- return false;
- }
- return true;
- }
-
- private void initResources() {
- mHeadViewPanel = findViewById(R.id.note_title);
- mNoteHeaderHolder = new HeadViewHolder();
- mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
- mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
- mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
- mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
- mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
- mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
- mNoteEditorPanel = findViewById(R.id.sv_note_edit);
- mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
- for (int id : sBgSelectorBtnsMap.keySet()) {
- ImageView iv = (ImageView) findViewById(id);
- iv.setOnClickListener(this);
- }
-
- mFontSizeSelector = findViewById(R.id.font_size_selector);
- for (int id : sFontSizeBtnsMap.keySet()) {
- View view = findViewById(id);
- view.setOnClickListener(this);
- };
- mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
- /**
- * HACKME: Fix bug of store the resource id in shared preference.
- * The id may larger than the length of resources, in this case,
- * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
- */
- if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
- mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
- }
- mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- if(saveNote()) {
- Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
- }
- clearSettingState();
- }
-
- private void updateWidget() {
- Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
- if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
- intent.setClass(this, NoteWidgetProvider_2x.class);
- } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
- intent.setClass(this, NoteWidgetProvider_4x.class);
- } else {
- Log.e(TAG, "Unspported widget type");
- return;
- }
-
- intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
- });
-
- sendBroadcast(intent);
- setResult(RESULT_OK, intent);
- }
-
- public void onClick(View v) {
- int id = v.getId();
- if (id == R.id.btn_set_bg_color) {
- mNoteBgColorSelector.setVisibility(View.VISIBLE);
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- - View.VISIBLE);
- } else if (sBgSelectorBtnsMap.containsKey(id)) {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.GONE);
- mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
- mNoteBgColorSelector.setVisibility(View.GONE);
- } else if (sFontSizeBtnsMap.containsKey(id)) {
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
- mFontSizeId = sFontSizeBtnsMap.get(id);
- mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- getWorkingText();
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setTextAppearance(this,
- TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
- }
- mFontSizeSelector.setVisibility(View.GONE);
- }
- }
-
- @Override
- public void onBackPressed() {
- if(clearSettingState()) {
- return;
- }
-
- saveNote();
- super.onBackPressed();
- }
-
- private boolean clearSettingState() {
- if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
- mNoteBgColorSelector.setVisibility(View.GONE);
- return true;
- } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
- mFontSizeSelector.setVisibility(View.GONE);
- return true;
- }
- return false;
- }
-
- public void onBackgroundColorChanged() {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- if (isFinishing()) {
- return true;
- }
- clearSettingState();
- menu.clear();
- if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
- getMenuInflater().inflate(R.menu.call_note_edit, menu);
- } else {
- getMenuInflater().inflate(R.menu.note_edit, menu);
- }
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
- } else {
- menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
- }
- if (mWorkingNote.hasClockAlert()) {
- menu.findItem(R.id.menu_alert).setVisible(false);
- } else {
- menu.findItem(R.id.menu_delete_remind).setVisible(false);
- }
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_new_note:
- createNewNote();
- break;
- case R.id.menu_delete:
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(getString(R.string.alert_title_delete));
- builder.setIcon(android.R.drawable.ic_dialog_alert);
- builder.setMessage(getString(R.string.alert_message_delete_note));
- builder.setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- deleteCurrentNote();
- finish();
- }
- });
- builder.setNegativeButton(android.R.string.cancel, null);
- builder.show();
- break;
- case R.id.menu_font_size:
- mFontSizeSelector.setVisibility(View.VISIBLE);
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
- break;
- case R.id.menu_list_mode:
- mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
- TextNote.MODE_CHECK_LIST : 0);
- break;
- case R.id.menu_share:
- getWorkingText();
- sendTo(this, mWorkingNote.getContent());
- break;
- case R.id.menu_send_to_desktop:
- sendToDesktop();
- break;
- case R.id.menu_alert:
- setReminder();
- break;
- case R.id.menu_delete_remind:
- mWorkingNote.setAlertDate(0, false);
- break;
- default:
- break;
- }
- return true;
- }
-
- private void setReminder() {
- DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
- d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
- public void OnDateTimeSet(AlertDialog dialog, long date) {
- mWorkingNote.setAlertDate(date , true);
- }
- });
- d.show();
- }
-
- /**
- * Share note to apps that support {@link Intent#ACTION_SEND} action
- * and {@text/plain} type
- */
- private void sendTo(Context context, String info) {
- Intent intent = new Intent(Intent.ACTION_SEND);
- intent.putExtra(Intent.EXTRA_TEXT, info);
- intent.setType("text/plain");
- context.startActivity(intent);
- }
-
- private void createNewNote() {
- // Firstly, save current editing notes
- saveNote();
-
- // For safety, start a new NoteEditActivity
- finish();
- Intent intent = new Intent(this, NoteEditActivity.class);
- intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
- intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
- startActivity(intent);
- }
-
- private void deleteCurrentNote() {
- if (mWorkingNote.existInDatabase()) {
- HashSet ids = new HashSet();
- long id = mWorkingNote.getNoteId();
- if (id != Notes.ID_ROOT_FOLDER) {
- ids.add(id);
- } else {
- Log.d(TAG, "Wrong note id, should not happen");
- }
- if (!isSyncMode()) {
- if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
- Log.e(TAG, "Delete Note error");
- }
- } else {
- if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
- Log.e(TAG, "Move notes to trash folder error, should not happens");
- }
- }
- }
- mWorkingNote.markDeleted(true);
- }
-
- private boolean isSyncMode() {
- return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
- }
-
- public void onClockAlertChanged(long date, boolean set) {
- /**
- * User could set clock to an unsaved note, so before setting the
- * alert clock, we should save the note first
- */
- if (!mWorkingNote.existInDatabase()) {
- saveNote();
- }
- if (mWorkingNote.getNoteId() > 0) {
- Intent intent = new Intent(this, AlarmReceiver.class);
- intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
- PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
- AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
- showAlertHeader();
- if(!set) {
- alarmManager.cancel(pendingIntent);
- } else {
- alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
- }
- } else {
- /**
- * There is the condition that user has input nothing (the note is
- * not worthy saving), we have no note id, remind the user that he
- * should input something
- */
- Log.e(TAG, "Clock alert setting error");
- showToast(R.string.error_note_empty_for_clock);
- }
- }
-
- public void onWidgetChanged() {
- updateWidget();
- }
-
- public void onEditTextDelete(int index, String text) {
- int childCount = mEditTextList.getChildCount();
- if (childCount == 1) {
- return;
- }
-
- for (int i = index + 1; i < childCount; i++) {
- ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
- .setIndex(i - 1);
- }
-
- mEditTextList.removeViewAt(index);
- NoteEditText edit = null;
- if(index == 0) {
- edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
- R.id.et_edit_text);
- } else {
- edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
- R.id.et_edit_text);
- }
- int length = edit.length();
- edit.append(text);
- edit.requestFocus();
- edit.setSelection(length);
- }
-
- public void onEditTextEnter(int index, String text) {
- /**
- * Should not happen, check for debug
- */
- if(index > mEditTextList.getChildCount()) {
- Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
- }
-
- View view = getListItem(text, index);
- mEditTextList.addView(view, index);
- NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- edit.requestFocus();
- edit.setSelection(0);
- for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
- ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
- .setIndex(i);
- }
- }
-
- private void switchToListMode(String text) {
- mEditTextList.removeAllViews();
- String[] items = text.split("\n");
- int index = 0;
- for (String item : items) {
- if(!TextUtils.isEmpty(item)) {
- mEditTextList.addView(getListItem(item, index));
- index++;
- }
- }
- mEditTextList.addView(getListItem("", index));
- mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
-
- mNoteEditor.setVisibility(View.GONE);
- mEditTextList.setVisibility(View.VISIBLE);
- }
-
- private Spannable getHighlightQueryResult(String fullText, String userQuery) {
- SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
- if (!TextUtils.isEmpty(userQuery)) {
- mPattern = Pattern.compile(userQuery);
- Matcher m = mPattern.matcher(fullText);
- int start = 0;
- while (m.find(start)) {
- spannable.setSpan(
- new BackgroundColorSpan(this.getResources().getColor(
- R.color.user_query_highlight)), m.start(), m.end(),
- Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- start = m.end();
- }
- }
- return spannable;
- }
-
- private View getListItem(String item, int index) {
- View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
- final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
- CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
- cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (isChecked) {
- edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
- } else {
- edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
- }
- }
- });
-
- if (item.startsWith(TAG_CHECKED)) {
- cb.setChecked(true);
- edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
- item = item.substring(TAG_CHECKED.length(), item.length()).trim();
- } else if (item.startsWith(TAG_UNCHECKED)) {
- cb.setChecked(false);
- edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
- item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
- }
-
- edit.setOnTextViewChangeListener(this);
- edit.setIndex(index);
- edit.setText(getHighlightQueryResult(item, mUserQuery));
- return view;
- }
-
- public void onTextChange(int index, boolean hasText) {
- if (index >= mEditTextList.getChildCount()) {
- Log.e(TAG, "Wrong index, should not happen");
- return;
- }
- if(hasText) {
- mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
- } else {
- mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
- }
- }
-
- public void onCheckListModeChanged(int oldMode, int newMode) {
- if (newMode == TextNote.MODE_CHECK_LIST) {
- switchToListMode(mNoteEditor.getText().toString());
- } else {
- if (!getWorkingText()) {
- mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
- ""));
- }
- mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
- mEditTextList.setVisibility(View.GONE);
- mNoteEditor.setVisibility(View.VISIBLE);
- }
- }
-
- private boolean getWorkingText() {
- boolean hasChecked = false;
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < mEditTextList.getChildCount(); i++) {
- View view = mEditTextList.getChildAt(i);
- NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- if (!TextUtils.isEmpty(edit.getText())) {
- if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
- sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
- hasChecked = true;
- } else {
- sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
- }
- }
- }
- mWorkingNote.setWorkingText(sb.toString());
- } else {
- mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
- }
- return hasChecked;
- }
-
- private boolean saveNote() {
- getWorkingText();
- boolean saved = mWorkingNote.saveNote();
- if (saved) {
- /**
- * There are two modes from List view to edit view, open one note,
- * create/edit a node. Opening node requires to the original
- * position in the list when back from edit view, while creating a
- * new node requires to the top of the list. This code
- * {@link #RESULT_OK} is used to identify the create/edit state
- */
- setResult(RESULT_OK);
- }
- return saved;
- }
-
- private void sendToDesktop() {
- /**
- * Before send message to home, we should make sure that current
- * editing note is exists in databases. So, for new note, firstly
- * save it
- */
- if (!mWorkingNote.existInDatabase()) {
- saveNote();
- }
-
- if (mWorkingNote.getNoteId() > 0) {
- Intent sender = new Intent();
- Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
- shortcutIntent.setAction(Intent.ACTION_VIEW);
- shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
- sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
- sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
- makeShortcutIconTitle(mWorkingNote.getContent()));
- sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
- Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
- sender.putExtra("duplicate", true);
- sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
- showToast(R.string.info_note_enter_desktop);
- sendBroadcast(sender);
- } else {
- /**
- * There is the condition that user has input nothing (the note is
- * not worthy saving), we have no note id, remind the user that he
- * should input something
- */
- Log.e(TAG, "Send to desktop error");
- showToast(R.string.error_note_empty_for_send_to_desktop);
- }
- }
-
- private String makeShortcutIconTitle(String content) {
- content = content.replace(TAG_CHECKED, "");
- content = content.replace(TAG_UNCHECKED, "");
- return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
- SHORTCUT_ICON_TITLE_MAX_LEN) : content;
- }
-
- private void showToast(int resId) {
- showToast(resId, Toast.LENGTH_SHORT);
- }
-
- private void showToast(int resId, int duration) {
- Toast.makeText(this, resId, duration).show();
- }
-}
diff --git a/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml
deleted file mode 100644
index 7717112..0000000
--- a/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/layout/note_edit.xml b/src/Notes-master/app/src/main/res/layout/note_edit.xml
deleted file mode 100644
index 10b2aa7..0000000
--- a/src/Notes-master/app/src/main/res/layout/note_edit.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Notes-master/app/src/main/res/layout/note_list.xml b/src/Notes-master/app/src/main/res/layout/note_list.xml
deleted file mode 100644
index 6b25d38..0000000
--- a/src/Notes-master/app/src/main/res/layout/note_list.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Notes-master/app/src/main/res/menu/note_edit.xml b/src/Notes-master/app/src/main/res/menu/note_edit.xml
deleted file mode 100644
index 35cacd1..0000000
--- a/src/Notes-master/app/src/main/res/menu/note_edit.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/menu/note_list.xml b/src/Notes-master/app/src/main/res/menu/note_list.xml
deleted file mode 100644
index 42ea736..0000000
--- a/src/Notes-master/app/src/main/res/menu/note_list.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
diff --git a/src/Notes-master/app/src/main/res/values/dimens.xml b/src/Notes-master/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 194e84f..0000000
--- a/src/Notes-master/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- 33sp
- 26sp
- 20sp
- 17sp
- 14sp
-
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/values/strings.xml b/src/Notes-master/app/src/main/res/values/strings.xml
deleted file mode 100644
index 55df868..0000000
--- a/src/Notes-master/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
- Notes
- Notes 2x2
- Notes 4x4
- No associated note found, click to create associated note.
- Privacy mode，can not see note content
- ...
- Add note
- Delete reminder successfully
- Set reminder
- Expired
- yyyyMMdd
- MMMd kk:mm
- Got it
- Take a look
- Call
- Send email
- Browse web
- Open map
-
- /MIUI/notes/
- notes_%s.txt
-
- (%d)
- New Folder
- Export text
- Sync
- Cancel syncing
- Settings
- Search
- Delete
- Move to folder
- %d selected
- Nothing selected, the operation is invalid
- Select all
- Deselect all
- Font size
- Small
- Medium
- Large
- Super
- Enter check list
- Leave check list
- View folder
- Delete folder
- Change folder name
- The folder %1$s exist, please rename
- Share
- Send to home
- Remind me
- Delete reminder
- Select folder
- Parent folder
- Note added to home
- Confirm to delete folder and its notes?
- Delete selected notes
- Confirm to delete the selected %d notes?
- Confirm to delete this note?
- Have moved selected %1$d notes to %2$s folder
-
- SD card busy, not available now
- Export failed, please check SD card
- The note is not exist
- Sorry, can not set clock on empty note
- Sorry, can not send and empty note to home
- Export successful
- Export fail
- Export text file (%1$s) to SD (%2$s) directory
-
- Syncing notes...
- Sync is successful
- Sync is failed
- Sync is canceled
- Sync is successful with account %1$s
- Sync failed, please check network and account settings
- Sync failed, internal error occurs
- Sync is canceled
- Logging into %1$s...
- Getting remote note list...
- Synchronize local notes with Google Task...
-
- Settings
- Sync account
- Sync notes with google task
- Last sync time %1$s
- yyyy-MM-dd hh:mm:ss
- Add account
- Change sync account
- Remove sync account
- Cancel
- Sync immediately
- Cancel syncing
- Current account %1$s
- All sync related information will be deleted, which may result in duplicated items sometime
- Sync notes
- Please select a google account. Local notes will be synced with google task.
- Cannot change the account because sync is in progress
- %1$s has been set as the sync account
- New note background color random
-
- Delete
- Call notes
- Input name
-
- Searching Notes
- Search notes
- Text in your notes
- Notes
- set
- cancel
-
- %1$s result for \"%2$s\"
-
- %1$s results for \"%2$s\"
-
-
-
diff --git a/src/Notes-master/build.gradle b/src/Notes-master/build.gradle
deleted file mode 100644
index 7fd57d9..0000000
--- a/src/Notes-master/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- jcenter()
- google()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:7.4.1'
- }
-}
-
-allprojects {
- repositories {
- jcenter()
- google()
- }
-}
diff --git a/src/Notes-master/httpcomponents-client-4.5.14-bin/LICENSE.txt b/src/Notes-master/httpcomponents-client-4.5.14-bin/LICENSE.txt
deleted file mode 100644
index 32f01ed..0000000
--- a/src/Notes-master/httpcomponents-client-4.5.14-bin/LICENSE.txt
+++ /dev/null
@@ -1,558 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
-=========================================================================
-
-This project includes Public Suffix List copied from
-
-licensed under the terms of the Mozilla Public License, v. 2.0
-
-Full license text:
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
- means each individual or legal entity that creates, contributes to
- the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
- means the combination of the Contributions of others (if any) used
- by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
- means Source Code Form to which the initial Contributor has attached
- the notice in Exhibit A, the Executable Form of such Source Code
- Form, and Modifications of such Source Code Form, in each case
- including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- (a) that the initial Contributor has attached the notice described
- in Exhibit B to the Covered Software; or
-
- (b) that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the
- terms of a Secondary License.
-
-1.6. "Executable Form"
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
- a separate file or files, that is not Covered Software.
-
-1.8. "License"
- means this document.
-
-1.9. "Licensable"
- means having the right to grant, to the maximum extent possible,
- whether at the time of the initial grant or subsequently, any and
- all of the rights conveyed by this License.
-
-1.10. "Modifications"
- means any of the following:
-
- (a) any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered
- Software; or
-
- (b) any new file in Source Code Form that contains any Covered
- Software.
-
-1.11. "Patent Claims" of a Contributor
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the
- License, by the making, using, selling, offering for sale, having
- made, import, or transfer of either its Contributions or its
- Contributor Version.
-
-1.12. "Secondary License"
- means either the GNU General Public License, Version 2.0, the GNU
- Lesser General Public License, Version 2.1, the GNU Affero General
- Public License, Version 3.0, or any later versions of those
- licenses.
-
-1.13. "Source Code Form"
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that
- controls, is controlled by, or is under common control with You. For
- purposes of this definition, "control" means (a) the power, direct
- or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than
- fifty percent (50%) of the outstanding shares or beneficial
- ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
- for sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
- or
-
-(b) for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
- Form, as described in Section 3.1, and You must inform recipients of
- the Executable Form how they can obtain a copy of such Source Code
- Form by reasonable means in a timely manner, at a charge no more
- than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter
- the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-* *
-* 6. Disclaimer of Warranty *
-* ------------------------- *
-* *
-* Covered Software is provided under this License on an "as is" *
-* basis, without warranty of any kind, either expressed, implied, or *
-* statutory, including, without limitation, warranties that the *
-* Covered Software is free of defects, merchantable, fit for a *
-* particular purpose or non-infringing. The entire risk as to the *
-* quality and performance of the Covered Software is with You. *
-* Should any Covered Software prove defective in any respect, You *
-* (not any Contributor) assume the cost of any necessary servicing, *
-* repair, or correction. This disclaimer of warranty constitutes an *
-* essential part of this License. No use of any Covered Software is *
-* authorized under this License except under this disclaimer. *
-* *
-************************************************************************
-
-************************************************************************
-* *
-* 7. Limitation of Liability *
-* -------------------------- *
-* *
-* Under no circumstances and under no legal theory, whether tort *
-* (including negligence), contract, or otherwise, shall any *
-* Contributor, or anyone who distributes Covered Software as *
-* permitted above, be liable to You for any direct, indirect, *
-* special, incidental, or consequential damages of any character *
-* including, without limitation, damages for lost profits, loss of *
-* goodwill, work stoppage, computer failure or malfunction, or any *
-* and all other commercial damages or losses, even if such party *
-* shall have been informed of the possibility of such damages. This *
-* limitation of liability shall not apply to liability for death or *
-* personal injury resulting from such party's negligence to the *
-* extent applicable law prohibits such limitation. Some *
-* jurisdictions do not allow the exclusion or limitation of *
-* incidental or consequential damages, so this exclusion and *
-* limitation may not apply to You. *
-* *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
- This Source Code Form is "Incompatible With Secondary Licenses", as
- defined by the Mozilla Public License, v. 2.0.
diff --git a/src/Notes-master/httpcomponents-client-4.5.14-bin/NOTICE.txt b/src/Notes-master/httpcomponents-client-4.5.14-bin/NOTICE.txt
deleted file mode 100644
index 10a2916..0000000
--- a/src/Notes-master/httpcomponents-client-4.5.14-bin/NOTICE.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache HttpComponents Client
-Copyright 1999-2021 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/src/Notes-master/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt b/src/Notes-master/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt
deleted file mode 100644
index c1f0a0f..0000000
--- a/src/Notes-master/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt
+++ /dev/null
@@ -1,2613 +0,0 @@
-Release 4.5.14
--------------------
-
-This is a maintenance release that fixes several minor bugs reported discovered since
-the 4.5.13 release.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-2206: Corrected resource de-allocation by fluent response objects.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2174: URIBuilder to return a new empty list instead of unmodifiable
- Collections#emptyList.
- Contributed by Oleg Kalnichevski
-
-* Don't retry requests in case of NoRouteToHostException.
- Contributed by Jaikiran Pai
-
-* HTTPCLIENT-2144: RequestBuilder fails to correctly copy charset of requests with
- form url-encoded body.
- Contributed by Oleg Kalnichevski
-
-* PR #269: 4.5.x use array fill and more.
- - Use Arrays.fill().
- - Remove redundant modifiers.
- - Use Collections.addAll() and Collection.addAll() APIs instead of loops.
- - Remove redundant returns.
- - No need to explicitly declare an array when calling a vararg method.
- - Remote extra semicolons (;).
- - Use a 'L' instead of 'l' to make long literals more readable.
- Contributed by Gary Gregory
-
-* PublicSuffixListParser.parseByType(Reader) allocates but does not use a 256 char
- StringBuilder.
- Contributed by Gary Gregory
-
-
-
-Release 4.5.13
--------------------
-
-This is a maintenance release that fixes incorrect handling of malformed authority component
-in request URIs.
-
-
-Changelog:
--------------------
-
-* Incorrect handling of malformed authority component by URIUtils#extractHost.
- Contributed by Oleg Kalnichevski
-
-* Avoid updating Content-Length header in a 304 response.
- Contributed by Dirk Henselin
-
-* Bug fix: BasicExpiresHandler is annotated as immutable but is not (#239)
- Contributed by Gary Gregory
-
-* HTTPCLIENT-2076: Fixed NPE in LaxExpiresHandler (#222).
- Contributed by heejeongkim
-
-
-Release 4.5.12
--------------------
-
-This is a maintenance release that fixes a regression introduced by the previous release
-that caused rejection of certificates with non-standard domains.
-
-Changelog:
--------------------
-
-* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (308) to DefaultRedirectStrategy
- Contributed by Michael Osipov
-
-* HTTPCLIENT-2052: Fixed redirection of entity enclosing requests with non-repeatable entities
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2047: Fixed regression in DefaultHostnameVerifier causing rejection of certificates
- with non-standard domains.
- Contributed by Oleg Kalnichevski
-
-* Bug fix: Fixed handling of private domains by PublicSuffixMatcher
- Contributed by Oleg Kalnichevski
-
-
-Release 4.5.11
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.10
-and upgrades HttpCore dependency to version 4.4.13.
-
-
-Changelog:
--------------------
-
-* Improved domain name normalization by DefaultHostnameVerifier.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2033: Connection managers to immediately shut down all leased connection upon shutdown.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2020: DefaultBackoffStrategy to support TOO_MANY_REQUESTS (429).
- Contributed by Michael Osipov
-
-* HTTPCLIENT-2030: Fixed PublicSuffixMatcher#getDomainRoot behavior with invalid hostnames.
- Contributed by Niels Basjes
-
-* HTTPCLIENT-2029: URIBuilder to support parsing of non-UTF8 URIs.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2026: Fixed URIBuilder#isOpaque() logic.
- Contributed by Oleg Kalnichevski
-
-* Updated text in pool stats description
- Contributed by chao chang
-
-* HTTPCLIENT-2023: Allow nested arrays and all primitive types in DefaultHttpCacheEntrySerializer.
- Contributed by Olof Larsson
-
-* Fixed fallback PublicSuffixMatcher instance.
- Contributed by Ryan Schmitt
-
-* Added family property #145.
- Contributed by behrangsa
-
-
-Release 4.5.10
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.9
-and upgrades HttpCore dependency to version 4.4.12.
-
-
-Changelog:
--------------------
-
-* Refactor DefaultRedirectStrategy for subclassing.
- Contributed by Gary Gregory
-
-* Improved handling of request cancellation.
- Contributed by Oleg Kalnichevski
-
-* Fixed concurrent use of threading unsafe HttpUriRequest messages.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1997: Return the last domain segment instead of normalized domain name
- from PublicSuffixMatcher#getDomainRoot in case there is no match.
- Contributed by jeromedemangel
-
-* Preserve original encoding of the URI path component if the URI is valid.
- Contributed by Oleg Kalnichevski
-
-
-Release 4.5.9
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.8.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-1991: incorrect handling of non-standard DNS entries by PublicSuffixMatcher
- Contributed by Oleg Kalnichevski
-
-* Fix bug in URIBuilder#isPathEmpty method to verify if encodedPath is an empty string
- Contributed by Varun Nandi
-
-* HTTPCLIENT-1984: Add normalize URI to RequestConfig copy constructor
- Contributed by Matt Nelson
-
-* HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer
- Contributed by Artem Smotrakov
-
-
-
-Release 4.5.8
--------------------
-
-This is a maintenance release that makes request URI normalization configurable on per request basis
-and also ports several improvements in URI handling from HttpCore master.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-1969: Filter out weak cipher suites.
- Contributed by Artem Smotrakov
-
-* HTTPCLIENT-1968: Preserve escaped PATHSAFE characters when normalizing URI path segments.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: URIBuilder to split path component into path segments when digesting a URI
- (ported from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* Improved cache key generation (ported from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: added utility methods to parse and format URI path segments (ported
- from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: Make normalization of URI paths optional.
- Contributed by Tamas Cservenak
-
-* Some well known proxies respond with Content-Length=0, when returning 304. For robustness, always use the
- cached entity's content length, as modern browsers do.
- Contributed by Author: Jayson Raymond
-
-
-
-Release 4.5.7
--------------------
-
-This is a maintenance release that corrects Automatic-Module-Name definitions added in the previous
-release and fixes a number of minor defects discovered since 4.5.6.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* Upgraded HttpCore to version 4.4.11
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1960: URIBuilder incorrect handling of multiple leading slashes in path component
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1958: PoolingHttpClientConnectionManager to throw ExecutionException in case of a lease operation
- cancellation instead of InterruptedException.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1952: Allow default User Agent to be disabled.
- Contributed by Michael Osipov
-
-* HTTPCLIENT-1956: CONNECT overwrites the main request object in the HTTP context when requests are executed
- via a proxy tunnel.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1940: deprecated SSLSocketFactory made to rethrow SocketTimeoutException as
- ConnectTimeoutException for consistency with non-deprecated code.
- Contributed by Oleg Kalnichevski
-
-* Fixed regression in BasicCookieStore serialization.
- Contributed by Author: Mark Mielke
-
-* HTTPCLIENT-1929: Corrected Automatic-Module-Name entries for HttpClient Fluent, HttpClient Windows
- and HttpClient Cache.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1927: URLEncodedUtils#parse breaks at double quotes when parsing unquoted values.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1939: Update Apache Commons Codec from 1.10 to 1.11
- Contributed by Gary Gregory
-
-
-Release 4.5.6
--------------------
-
-This is a maintenance release that adds Automatic-Module-Name to the manifest for compatibility
-with Java 9 Platform Module System and fixes a number of issues discovered since 4.5.5
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1882=: reset authentication state on I/O or runtime error for connection based
- authentication schemes (such as NTLM)
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1924]: HttpClient to shut down the connection manager if a fatal error occurs
- in the course of a request execution.
- Contributed by Oleg Kalnichevski
-
-* Add Automatic-Module-Name in manifest so Java9 modular applications can depend on this library
- Contributed by Varun Nandi
-
-* [HTTPCLIENT-1923]: fixed incorrect connection close on shutdown + fixed corresponding test
- Contributed by Aleksei Arsenev
-
-* [HTTPCLIENT-1906]: certificates containing alternative subject names other than DNS and IP
- (such as RFC822) get rejected as invalid
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1904]: check cookie domain for null
- Contributed by Hans-Peter Keck
-
-* [HTTPCLIENT-1900]: proxy protocol processor does not post-process CONNECT response messages
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1911]: Failing tests on Fedora 28 due to weak encryption algorithms in test
- keystore.
- Contributed by Gary Gregory and Michael Simacek
-
-
-Release 4.5.5
--------------------
-
-HttpClient 4.5.5 (GA) is a maintenance release that fixes a regression introduced
-by the previous release causing a NPE in SystemDefaultCredentialsProvider.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1690] Avoid merging Content-Encoding headers coming with 304 status to cache entry.
- Contributed by Sudheera Palihakkara
-
-* [HTTPCLIENT-1888] Regression in SystemDefaultCredentialsProvider#getCredentials causing NPE.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1886] Update HttpClient 4.5.x from HttpCore 4.4.7 to 4.4.9
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1889] org.apache.http.client.utils.URLEncodedUtils.parse()
- should return a new ArrayList when there are no query parameters.
- Contributed by Gary Gregory
-
-
-Release 4.5.4
--------------------
-
-HttpClient 4.5.4 (GA) is a maintenance release that fixes a number of defects found since 4.5.3.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1883] SystemDefaultCredentialsProvider to use https.proxy* system properties
- for origins with port 443.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1881] Allow truncated NTLM packets to work with this client.
- Contributed by Karl Wright
-
-* [HTTPCLIENT-1855] Disabled caching of DIGEST auth scheme instances due to unreliability of nonce counter
- when the auth cache is shared by multiple sessions.
- Contributed by Oleg Kalnichevski
-
-* BasicCookieStore uses a ReentrantReadWriteLock to avoid synchronization on #getCookies/#toString
- while maintaining thread safety.
- Contributed by Carter Kozak
-
-* [HTTPCLIENT-1865] DefaultServiceUnavailableRetryStrategy does not respect HttpEntity#isRepeatable.
- Contributed by Tomas Celaya
-
-* [HTTPCLIENT-1859] Encode Content-Disposition name and filename elements appropriately.
- Contributed by Karl Wright
-
-* Avoid fetching the cached entity twice on cache hit.
- Contributed by Leandro Nunes
-
-* [HTTPCLIENT-1835] #evictExpiredConnections no longer causes the #evictIdleConnections behaviour
- to be implicitly enabled.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1831= URIBuilder should not prepend a leading slash to relative URIs.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1833] Fix Windows Negotiate-NTLM handling of proxies.
- Contributed by Roman Stoffel
-
-* [HTTPCLIENT-1817] Add a "Trust All" TrustStrategy implementation.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1816] Update Apache Commons Codec 1.9 to 1.10.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1836] DefaultHostnameVerifier#getSubjectAltNames(X509Certificate) throws java.lang.ClassCastException.
- Contributed by Gary Gregory , Ilian Iliev
-
-* [HTTPCLIENT-1845]: Extract InputStreamFactory classes out of GzipDecompressingEntity and
- DeflateDecompressingEntity for reuse and to create less garbage.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1847] Update Ehcache from 2.6.9 to 2.6.11.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1848] Update spymemcached from 2.11.4 to 2.12.3.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1849] Update JNA from 4.1.0 to 4.4.0.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1850] Update SLF4J from 1.7.6 to 1.7.25.
- Contributed by Gary Gregory
-
-
-Release 4.5.3
--------------------
-
-HttpClient 4.5.3 (GA) is a maintenance release that fixes a number of defects found since 4.5.2.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1803] Improved handling of malformed paths by URIBuilder.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1802] Do not attempt to match SSL host to subject CN if subject alternative name of any type are given.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1788] RFC 6265 policy must not reject cookies with paths that are no prefix of the uri path.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1792] SSLConnectionSocketFactory to throw SSLPeerUnverifiedException with a better error message
- when hostname verification fails.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1779] [OSGi] support NTLM proxy authentication.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1773] [OSGi] HttpProxyConfigurationActivator does not unregister HttpClientBuilderFactory.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1771] improve OSGi webconsole display for org.apache.http.proxyconfigurator.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1770] OSGi metatype for org.apache.http.proxyconfigurator missing factoryPid.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1767] Null pointer dereference in EofSensorInputStream and ResponseEntityProxy.
- Contributed by Peter Ansell
-
-* Support changing system default ProxySelector.
- Contributed by Robin Stevens
-
-* All services registered in the OSGi service registry provide the whole bundle header dictionary as vendor
- property value.
- Contributed by Christoph Fiehe
-
-* [HTTPCLIENT-1750] OSGi support for CachingHttpClientBuilder.
- Contributed by Justin Edelson
-
-* [HTTPCLIENT-1749] OSGi client builder to use weak references to track HttpClient instances.
- Contributed by Justin Edelson
-
-* [HTTPCLIENT-1747] apply RequestConfig defaults when using HttpParams values in backward compatibility mode.
- Contributed by Oleg Kalnichevski
-
-* Override LaxRedirectStrategy's INSTANCE field.
- Contributed by Eric Wu
-
-* [HTTPCLIENT-1736] do not request cred delegation by default when using Kerberos auth.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1744] normalize hostname and certificate CN when matching to CN.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1732] SystemDefaultCredentialsProvider to take http.proxyHost and http.proxyPort system
- properties into account.
- Contributed by Oleg Kalnichevski
-
-* Revert "HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating auth token".
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1727] AbstractHttpClient#createClientConnectionManager does not account for context class loader.
- Contributed by Charles Allen
-
-* [HTTPCLIENT-1726:] Copy the SNI fix from SSLConnectionSocketFactory to the deprecated SSLSocketFactory class.
- Contributed by David Black
-
-
-Release 4.5.2
--------------------
-
-HttpClient 4.5.2 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.1.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1710, HTTPCLIENT-1718, HTTPCLEINT-1719] OSGi container compatibility improvements.
- Contributed by 212427891
-
-* [HTTPCLIENT-1717] Make fluent API Content#Content(byte[], ContentType) public.
- Contributed by Cash Costello
-
-* [HTTPCLIENT-1715] NTLMEngineImpl#Type1Message not thread safe but declared as a constant.
- Contributed by Olivier Lafontaine , Gary Gregory
-
-* [HTTPCLIENT-1714] Add HttpClientBuilder#setDnsResolver(DnsResolver).
- Contributed by Alexis Thaveau
-
-* [HTTPCLIENT-1712] SPNego schemes to take service scheme into account when generating auth token.
- Contributed by Georg Romstorfer
-
-* [HTTPCLIENT-1700] Netscape draft, browser compatibility, RFC 2109, RFC 2965 and default cookie
- specs to ignore cookies with empty name for consistency with RFC 6265 specs.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1704] IgnoreSpec#match to always return false.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1550] Fixed 'deflate' zlib header check.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1698] Fixed matching of IPv6 addresses by DefaultHostnameVerifier
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1695] RFC 6265 compliant cookie spec to ignore cookies with empty name / missing
- value.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1216] Removed ThreadLocal subclass from DateUtils.
- Contributed by Jochen Kemnade
-
-* [HTTPCLIENT-1685] PublicSuffixDomainFilter to ignore local hosts and local domains.
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.5.1
--------------------
-
-HttpClient 4.5.1 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1680] redirect of a POST request causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1673] org.apache.http.entity.mime.content.* missing from OSGi exports.
- Contributed by Benson Margulies
-
-* [HTTPCLIENT-1668] Fluent request incorrectly handles connect timeout setting.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1667] RequestBuilder does not take charset into account when creating
- UrlEncodedFormEntity.
- Contributed by Sergey Smith
-
-* [HTTPCLIENT-1655] HttpClient sends RST instead of FIN ACK sequence when using non-persistant
- connections.
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.5
--------------------
-
-HttpClient 4.5 (GA) is a minor feature release that includes several incremental enhancements
-to the exisitng functionality such as support for private domains in the Mozilla Public Suffix List.
-
-Changelog:
--------------------
-
-* Reduced default validate after inactivity setting from 5 sec to 2 sec
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1649] Fixed serialization of auth schemes
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1645]: Fluent requests to inherit config parameters of the executor.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1640]: RFC6265 lax cookie policy fails to parse 'max-age' attribute.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1633]: RFC6265CookieSpecProvider compatibility level setting has no effect.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1613]: Support for private domains in Mozilla Public Suffix List.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1651]: Add ability to disable content compression on a request basis
- Contributed by Michael Osipov
-
-* [HTTPCLIENT-1654]: Deprecate/remove RequestConfig#decompressionEnabled in favor of #contentCompressionEnabled
- Contributed by Michael Osipov
-
-
-
-Release 4.4.1
--------------------
-
-HttpClient 4.4.1 (GA) is a maintenance release that fixes a number of defects in new functionality
-introduced in version 4.4.
-
-Users of HttpClient 4.4 are encouraged to upgrade.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* Marked RFC 2109, RFC 2965, Netscape draft cookie specs as obsolete
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1633] RFC6265CookieSpecProvider compatibility level setting has no effect.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1628]: Auth cache can fail when domain name contains uppercase characters.
- Contributed by Dennis Ju
-
-* [HTTPCLIENT-1609] Stale connection check in PoolingHttpClientConnectionManager has no effect.
- Internal connection pool does not correctly implement connection validation.
- Contributed by Charles Lip
-
-
-
-Release 4.4 Final
--------------------
-
-This is the first stable (GA) release of HttpClient 4.4. Notable features and enhancements included
-in 4.4 series are:
-
-* Support for the latest HTTP state management specification (RFC 6265). Please note that the old
-cookie policy is still used by default for compatibility reasons. RFC 6265 compliant cookie
-policies need to be explicitly configured by the user. Please also note that as of next feature
-release support for Netscape draft, RFC 2109 and RFC 2965 cookie policies will be deprecated
-and disabled by default. It is recommended to use RFC 6265 compliant policies for new applications
-unless compatibility with RFC 2109 and RFC 2965 is required and to migrate existing applications
-to the default cookie policy.
-
-* Enhanced, redesigned and rewritten default SSL hostname verifier with improved RFC 2818
-compliance
-
-* Default SSL hostname verifier and default cookie policy now validate certificate identity
-and cookie domain of origin against the public suffix list maintained by Mozilla.org
-
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Authentication cache thread-safety: authentication cache used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-* Native Windows Negotiate and NTLM via SSPI through JNA: when running on Windows OS HttpClient
-configured to use native NTLM or SPNEGO authentication schemes can make use of platform specific
-functionality via JNA and current user credentials. This functionality is still considered
-experimental, known to have compatibility issues and subject to change without prior notice.
-Use at your discretion.
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-
-Changelog:
--------------------
-
-* Support for the latest HTTP state management specification (RFC 6265).
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1515] Caching of responses to HEAD requests
- Contributed by Tyrone Cutajar and
- Francois-Xavier Bonnet
-
-* [HTTPCLIENT-1560] Native Windows auth improvements
- Contributed by Michael Osipov
-
-* Update Apache Commons Logging version from 1.1.3 to 1.2.
- Contributed by Gary Gregory
-
-* Update Apache Commons Codec version from 1.6 to 1.9.
- Contributed by Gary Gregory
-
-* Update Ehcache version from 2.2.0 to 2.6.9.
- Contributed by Gary Gregory
-
-* Update Ehcache version from 2.2.0 to 2.6.9.
- Contributed by Gary Gregory
-
-* Update Spymemcached version from 2.6 to 2.11.4.
- Contributed by Gary Gregory
-
-* Update SLF4J version from 1.5.11 to 1.7.7.
- Contributed by Gary Gregory
-
-
-
-
-
-Release 4.4 BETA1
--------------------
-
-This is the first BETA release of HttpClient 4.4. Notable features and enhancements included
-in 4.4 series are:
-
-* Enhanced redesigned and rewritten default SSL hostname verifier with improved RFC 2818
-compliance
-
-* Default SSL hostname verifier and default cookie policy now validate certificate identity
-and cookie domain of origin against the public suffix list maintained by Mozilla.org
-
-
-* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use
-native NTLM or SPNEGO authentication schemes can make use of platform specific functionality
-via JNA and current user system credentials
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming".
- Contributed by Willem Jiang
-
-* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native
- Negotiate/NTLM auth schemes.
- Contributed by Ka-Lok Fung
-
-* Improved compliance with RFC 2818: default hostname verifier to ignore the common name of the
- certificate subject if alternative subject names (dNSName or iPAddress) are present.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1540] Support delegated credentials (ISC_REQ_DELEGATE) by Native windows
- native Negotiate/NTLM auth schemes.
- Contributed by Ka-Lok Fung
-
-
-
-Release 4.4 ALPHA1
--------------------
-
-This is the first ALPHA release of HttpClient 4.4. Notable features and enhancements included
-in the 4.4 branch are:
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use
-native NTLM or SPNEGO authentication schemes can make use of platform specific functionality
-via JNA and current user system credentials
-
-* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Please note that new features included in this release are still considered experimental and
-their API may change in the future 4.4 alpha and beta releases.
-
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1493] Indiscriminate connection checking has been deprecated in favor of conditional
- connection state validation. Persistent connections are to be re-validated only after a defined
- period inactivity prior to being leased to the consumer.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1519] Use the original HttpHost instance passed as a parameter to
- HttpClient#execute when generating 'Host' request header.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1491] Enable provision of Service Principal Name in Windows native
- auth scheme.
- Contributed by Malcolm Smith
-
-* [HTTPCLIENT-1403] Pluggable content decoders.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1461] fixed performance degradation in gzip encoded content processing
- introduced by HTTPCLIENT-1432.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by
- SystemDefaultCredentialsProvider.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1454] Make connection operator APIs public.
- Contributed by Tamas Cservenak
-
-* Update JUnit to version 4.11 from 4.9
- Contributed by Gary Gregory
-
-
-
-Release 4.3.4
--------------------
-
-HttpClient 4.3.4 (GA) is a maintenance release that improves performance in high concurrency
-scenarios. This version replaces dynamic proxies with custom proxy classes and eliminates thread
-contention in java.reflect.Proxy.newInstance() when leasing connections from the connection pool
-and processing response messages.
-
-
-Changelog:
--------------------
-
-* Replaced dynamic proxies with custom proxy classes to reduce thread contention.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1484] GzipCompressingEntity should not close the underlying output stream
- if the entity has not been fully written out due to an exception.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1474] Fixed broken entity enclosing requests in HC Fluent.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1470] CachingExec(ClientExecChain, HttpCache, CacheConfig, AsynchronousValidator)
- throws NPE if config is null
-
-
-
-
-Release 4.3.3
--------------------
-
-HttpClient 4.3.3 (GA) is a bug fix release that fixes a regression introduced by the previous
-release causing a significant performance degradation in compressed content processing.
-
-Users of HttpClient 4.3 are encouraged to upgrade.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1453] Thread safety regression in PoolingHttpClientConnectionManager
- #closeExpiredConnections that can lead to ConcurrentModificationException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1461] fixed performance degradation in compressed content processing
- introduced by HTTPCLIENT-1432.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by
- SystemDefaultCredentialsProvider.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-
-Release 4.3.2
--------------------
-
-HttpClient 4.3.2 (GA) is a maintenance release that delivers a number of improvements
-as well as bug fixes for issues reported since 4.3.1 release. SNI support for
-Oracle JRE 1.7+ is being among the most notable improvements.
-
-Users of HttpClient 4.3 are encouraged to upgrade.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1447] Clients created with HttpClients.createMinimal do not work with absolute URIs
- Contributed by Joseph Walton
-
-* [HTTPCLIENT-1446] NTLM proxy + BASIC target auth fails with 'Unexpected state:
- MSG_TYPE3_GENERATED'.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1443] HttpCache uses the physical host instead of the virtual host as a cache key.
- Contributed by Francois-Xavier Bonnet
-
-* [HTTPCLIENT-1442] Authentication header set by the user gets removed in case
- of proxy authentication (affects plan HTTP requests only).
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1441] Caching AsynchronousValidationRequest leaks connections.
- Contributed by Dominic Tootell
-
-* [HTTPCLIENT-1440] 'file' scheme in redirect location URI causes NPE.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1437] Made Executor#execute thread safe.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1119] SNI support (Oracle Java 1.7+ only).
- Contributed by Bruno Harbulot
-
-* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1432] Lazy decompressing of HttpEntity#getContent() to avoid EOFException
- in case of an empty response with 'Content-Encoding: gzip' header.
- Contributed by Yihua Huang
-
-* [HTTPCLIENT-1431] (Regression) deprecated connection manager cannot be used with
- a custom LayeredSchemeSocketFactory.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1425] Fixed socket closed exception thrown by caching HttpClient when the origin
- server sends a long chunked response.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1417] Fixed NPE in BrowserCompatSpec#formatCookies caused by version 1
- cookies with null cookie value.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1416] Fixed NPE in CachingHttpClientBuilder#build().
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.3.1
--------------------
-
-HttpClient 4.3.1 (GA) is a bug fix release that addresses a number of issues reported since
-release 4.3.
-
-Users of HttpClient 4.3 are strongly encouraged to upgrade.
-
-Changelog
--------------------
-
-* [HTTPCLIENT-1410] Browser compatible hostname verifier no longer rejects
- *.co., *.gov., *.info., etc as invalid.
- Contributed by Oleg Kalnichevski
-
-* Ensure X509HostnameVerifier is never null.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1405] CONNECT HTTP/1.1 requests lack mandatory 'Host' header.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1402] Cache default User-Agent value.
- Contributed by yuexiaojun
-
-* [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle plugin metadata.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1399] Fixed NPE in RequestBuilder.
- Contributed by Oleg Kalnichevski
-
-
-
-
-Release 4.3 Final
--------------------
-
-This is the first stable (GA) release of HttpClient 4.3. The most notable enhancements included
-in this release are:
-
-* Support for Java 7 try-with-resources for resource management (connection release.)
-
-* Added fluent Builder classes for HttpEntity, HttpRequest, HttpClient and SSLContext instances.
-
-* Deprecation of preference and configuration API based on HttpParams interface in favor of
-constructor injection and plain configuration objects.
-
-* Reliance on object immutability instead of access synchronization for thread safety.
-Several old classes whose instances can be shared by multiple request exchanges have
-been replaced by immutable equivalents.
-
-* DefaultHttpClient, DecompressingHttpClient, CachingHttpClient and similar classes are
-deprecated in favor of builder classes that produce immutable HttpClient instances.
-
-* HttpClient builders now dynamically construct a request execution pipeline tailored
-specifically to the user configuration by physically excluding unnecessary protocol components.
-
-* There is now an option to construct a minimal HttpClient implementation that can only execute
-basic HTTP message exchanges without redirects, authentication, state management or proxy support.
-This feature might be of particular use in web crawler development.
-
-* There is now option to avoid strict URI syntax for request URIs by executing HTTP requests
-with an explicitly specified target host. HttpClient will no longer attempt to parse the request
-URI if it does not need to extract the target host from it.
-
-This release also includes all fixes from the stable 4.2.x release branch.
-
-
-Changelog
--------------------
-* [HTTPCLIENT-1371] Weak ETag Validation is Useful On PUT With If-Match
- Contributed by James Leigh
-
-* [HTTPCLIENT-1394] Support for Native windows Negotiate/NTLM via JNA
- Contributed by Ryan McKinley
-
-* [HTTPCLIENT-1384] Expose CacheInvalidator interface.
- Contributed by Nicolas Richeton
-
-* [HTTPCLIENT-1385] Fixed path normalization in CacheKeyGenerator
- Contributed by James Leigh
-
-* [HTTPCLIENT-1370] Response to non-GET requests should never be cached with the default
- ResponseCachingPolicy
- Contributed by James Leigh
-
-* [HTTPCLIENT-1373] OPTIONS and TRACE should not invalidate cache
- Contributed by James Leigh
-
-* [HTTPCLIENT-1383] HttpClient enters an infinite loop during NTLM authentication if the opposite
- endpoint keeps responding with a type 2 NTLM response after type 3 MTLM message has already been
- sent by the client.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1372] Refactor HttpMultipart, and add RFC6532 mode, so that headers in post
- are no longer constrained to ASCII values.
- Contributed by Karl Wright
-
-* [HTTPCLIENT-1377] User principal for non-NTLM authentication is incorrectly generated when using
- user credentials are specified as NTCredentials
- Contributed by Gary Gregory
-
-
-
-Release 4.3 BETA2
--------------------
-
-This is the second BETA release of HttpClient 4.3. The most notable features and improvements
-in the 4.3 branch are: Support for Java 7 try-with-resources for resource management (connection
-release); fluent Builder classes for HttpEntity, HttpRequest and HttpClient instances, deprecation
-of preference and configuration API based on HttpParams interface in favor of constructor injection
-and plain configuration objects, reliance on object immutability instead of access synchronization
-for thread safety.
-
-This release also includes all fixes from the stable 4.2.x release branch.
-
-Changelog
--------------------
-
-
-* [HTTPCLIENT-1366] org.apache.http.client.utils.URLEncodedUtils should parse the semicolon as a query parameter separator.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1365] NPE when ManagedHttpClientConnectionFactory.create(ConnectionConfig) is called with null.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1362] Better error messages for connect timed out and connection refused
- exceptions.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1360] separate out DeflateInputStream as an independent class,
- so it can be used by others.
- Contributed by Karl Wright
-
-* [HTTPCLIENT-1359] repeated requests using the same context fail if they redirect.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1354] do not quote algorithm parameter in DIGEST auth response.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1351] Added utility method to resolve final location from original request,
- target host and a list of redirects.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1344] Userinfo credentials in URI should not default to preemptive BASIC
- authentication.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1345] Useinfo credentials ignored in redirect location header.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1294] HttpClient to rewrite host name of the redirect location URI in order
- to avoid circular redirect exception due to host name case mismatch.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1264] Add support for multiple levels of browser compatibility
- to BrowserCompatSpec and BrowserCompatSpecFactory. Include constructor
- argument for IE medium-security compatibility.
- Contributed by Karl Wright (kwright at apache.org)
-
-* [HTTPCLIENT-1349] SSLSocketFactory incorrectly identifies key passed with keystore as
- the keystore password.
- Contributed by David Graff
-
-* [HTTPCLIENT-1346] Ensure propagation of SSL handshake exceptions.
- Contributed by Pasi Eronen
-
-* [HTTPCLIENT-1343] SSLSocketFactory optional parameters for supported SSL protocols and cipher
- suites.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1238] Contribute Bundle Activator And Central Proxy Configuration.
- Contributed by Simone Tripodi
-
-* [HTTPCLIENT-1299] (regression) cache incorrectly disposes of the underlying cache resource
- when storing variant entry.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1342] Redirects with underscore character in the location hostname cause
- "java.lang.IllegalArgumentException: Host name may not be null".
- Contributed by Oleg Kalnichevski