diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/GPL_Project.iml b/.idea/GPL_Project.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/GPL_Project.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..a849a79 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..190329d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 4968b0c..1da9a0d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # project1 +11111 diff --git a/doc/标注/210340054_金佳艺/SqlNote.java b/doc/标注/210340054_金佳艺/SqlNote.java new file mode 100644 index 0000000..4480051 --- /dev/null +++ b/doc/标注/210340054_金佳艺/SqlNote.java @@ -0,0 +1,562 @@ + * 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 WAR/* +RANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +//sqlNote代码注释 +/* sqlNote：用于支持软件最底层的数据库的相关操作，note是data的子父集。 + 用来实现数据库中管理便签的数据， + 方法包括提取便签内容、从数据库中获取便签数据、设置便签内容、向数据库提交便签。 + */ +package net.micode.notes.gtask.data; + +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.gtask.exception.ActionFailureException; +import net.micode.notes.tool.GTaskStringUtils; +import net.micode.notes.tool.ResourceParser; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; + + +public class SqlNote { + /* + * 功能描述：得到类的简写名称存入字符串TAG中 + * 实现过程：调用getSimpleName ()函数 + */ + private static final String TAG = SqlNote.class.getSimpleName(); + //定义一个标识便于后面数据的输入输出 + private static final int INVALID_ID = -99999; + + public static final String[] PROJECTION_NOTE = new String[] { + 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, NoteColumns.TYPE, + NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, + NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, + NoteColumns.VERSION + }; +//设置17个列的编号 + public static final int ID_COLUMN = 0; + + public static final int ALERTED_DATE_COLUMN = 1; + + public static final int BG_COLOR_ID_COLUMN = 2; + + public static final int CREATED_DATE_COLUMN = 3; + + public static final int HAS_ATTACHMENT_COLUMN = 4; + + public static final int MODIFIED_DATE_COLUMN = 5; + + public static final int NOTES_COUNT_COLUMN = 6; + + public static final int PARENT_ID_COLUMN = 7; + + public static final int SNIPPET_COLUMN = 8; + + public static final int TYPE_COLUMN = 9; + + public static final int WIDGET_ID_COLUMN = 10; + + public static final int WIDGET_TYPE_COLUMN = 11; + + public static final int SYNC_ID_COLUMN = 12; + + public static final int LOCAL_MODIFIED_COLUMN = 13; + + public static final int ORIGIN_PARENT_ID_COLUMN = 14; + + public static final int GTASK_ID_COLUMN = 15; + + public static final int VERSION_COLUMN = 16; +//定义了17个内部变量。12个可以从content中获得，5个需要初始化为0或new + private Context mContext; + + private ContentResolver mContentResolver; //定义了一个私有全局变量 + + private boolean mIsCreate; //后续选择生成 + + private long mId; + + private long mAlertDate; + + private int mBgColorId; + + private long mCreatedDate; + + private int mHasAttachment; + + private long mModifiedDate; + + private long mParentId; + + private String mSnippet; + + private int mType; + + private int mWidgetId; + + private int mWidgetType; + + private long mOriginParent; + + private long mVersion; + + private ContentValues mDiffNoteValues; + + private ArrayList mDataList; + + /* + * 功能描述：构造函数 + * 参数注解： mIsCreate用于标示构造方式 + */ + //构造函数只有context，对所有的变量进行初始化 + public SqlNote(Context context) { //构造函数进行初始化 + mContext = context; + mContentResolver = context.getContentResolver(); //获取对象或直接查询数据 + mIsCreate = true; //当前数据的创建 + mId = INVALID_ID; //初始值定义 + mAlertDate = 0; + mBgColorId = ResourceParser.getDefaultBgId(context); + mCreatedDate = System.currentTimeMillis();//调用系统函数获取创建时间 + mHasAttachment = 0; + mModifiedDate = System.currentTimeMillis();//最后一次修改时间初始化为创建时间 + mParentId = 0; + mSnippet = ""; + mType = Notes.TYPE_NOTE; + mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; + mWidgetType = Notes.TYPE_WIDGET_INVALIDE; + mOriginParent = 0; + mVersion = 0; + mDiffNoteValues = new ContentValues(); //创建内容 + mDataList = new ArrayList(); + } + + /* + * 功能描述：构造函数 + * 参数注解： mIsCreate用于标示构造方式 + */ + //构造函数有context和一个数据库的cursor，多数变量通过cursor指向的一条记录直接进行初始化 + + public SqlNote(Context context, Cursor c) { + mContext = context; + mContentResolver = context.getContentResolver(); //获取程序之间的数据共享 + mIsCreate = false; //记录当前数据创建方式 + loadFromCursor(c); //从光标处载入数据 + mDataList = new ArrayList(); + if (mType == Notes.TYPE_NOTE) + loadDataContent(); + mDiffNoteValues = new ContentValues(); + } + + /* + * 功能描述：构造函数 + * 参数注解： mIsCreate用于标示构造方式 + */ + + public SqlNote(Context context, long id) { + mContext = context; + mContentResolver = context.getContentResolver(); + mIsCreate = false; + loadFromCursor(id); + mDataList = new ArrayList(); + if (mType == Notes.TYPE_NOTE) + loadDataContent(); + mDiffNoteValues = new ContentValues(); + + } + + /* + *功能描述：通过id从光标处加载数据 + */ + private void loadFromCursor(long id) { + Cursor c = null; + try { + c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", + new String[] { + String.valueOf(id) + }, null);//通过id获取对应的ContentResolver中的cursor + if (c != null) { + c.moveToNext(); + loadFromCursor(c); + //加载数据进行初始化 + //使函数SqlNote(Context context, long id)与SqlNote(Context context, long id)的实现方式基本相同 + } else { + Log.w(TAG, "loadFromCursor: cursor = null"); + } + } finally { + if (c != null) + c.close(); + } + } + + //功能描述：通过游标从光标处加载数据 + private void loadFromCursor(Cursor c) { + //直接从一条记录中的获得以下变量的初始值 + mId = c.getLong(ID_COLUMN); + mAlertDate = c.getLong(ALERTED_DATE_COLUMN); + mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); + mCreatedDate = c.getLong(CREATED_DATE_COLUMN); + mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); + mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); + mParentId = c.getLong(PARENT_ID_COLUMN); + mSnippet = c.getString(SNIPPET_COLUMN); + mType = c.getInt(TYPE_COLUMN); + mWidgetId = c.getInt(WIDGET_ID_COLUMN); + mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); + mVersion = c.getLong(VERSION_COLUMN); + } + + //功能描述：通过content机制获取共享数据并加载到数据库当前游标处 + private void loadDataContent() { + Cursor c = null; + mDataList.clear(); + try { + c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, + "(note_id=?)", new String[] { + String.valueOf(mId) + }, null); + if (c != null) { + if (c.getCount() == 0) { + Log.w(TAG, "it seems that the note has not data"); + return; + } + while (c.moveToNext()) { + SqlData data = new SqlData(mContext, c); + mDataList.add(data); + } + } else { + Log.w(TAG, "loadDataContent: cursor = null"); + } + } finally { + if (c != null) + c.close(); + } + } + + //功能描述：通过设置content机制用于共享的数据信息 + public boolean setContent(JSONObject js) { + try { + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); //创建一个JSONObject对象 + if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { + Log.w(TAG, "cannot set system folder"); + } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + // for folder we can only update the snnipet and type + //对于文件夹，只能更新snnipet并键入 + String snippet = note.has(NoteColumns.SNIPPET) ? note + .getString(NoteColumns.SNIPPET) : ""; //如果共享数据存在摘要，需要将其赋给声明的snippct变量，否则变量为空 + if (mIsCreate || !mSnippet.equals(snippet)) { + mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); + } //如果SQLNote采用的是第一种构造方式，或snippet为空，则将snippet键值存入contenttvalue中 + mSnippet = snippet; + + int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) + : Notes.TYPE_NOTE; + if (mIsCreate || mType != type) { + mDiffNoteValues.put(NoteColumns.TYPE, type); + } //判断类型是否匹配 + mType = type; + } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; + if (mIsCreate || mId != id) { + mDiffNoteValues.put(NoteColumns.ID, id); + } //判断id是否匹配 + mId = id; + + long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note + .getLong(NoteColumns.ALERTED_DATE) : 0; + if (mIsCreate || mAlertDate != alertDate) { + mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); + } //如果仅通过上下文对Note进行数据库修改，或该标记日与原标记日不同 + mAlertDate = alertDate; + + int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note + .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); + if (mIsCreate || mBgColorId != bgColorId) { + mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); + } //判断背景颜色是否一致 + mBgColorId = bgColorId; + + long createDate = note.has(NoteColumns.CREATED_DATE) ? note + .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); + if (mIsCreate || mCreatedDate != createDate) { + mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); + } //判断日期是否一致 + mCreatedDate = createDate; + + int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note + .getInt(NoteColumns.HAS_ATTACHMENT) : 0; //修改附件 + if (mIsCreate || mHasAttachment != hasAttachment) { + mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); + } //判断附件是否一致 + mHasAttachment = hasAttachment; + + long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note + .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); //修改日期 + if (mIsCreate || mModifiedDate != modifiedDate) { + mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); + } //判断修改的日期是否一致 + mModifiedDate = modifiedDate; + + long parentId = note.has(NoteColumns.PARENT_ID) ? note + .getLong(NoteColumns.PARENT_ID) : 0; + if (mIsCreate || mParentId != parentId) { + mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); + } + mParentId = parentId; + + String snippet = note.has(NoteColumns.SNIPPET) ? note + .getString(NoteColumns.SNIPPET) : ""; //定义小部件 + if (mIsCreate || !mSnippet.equals(snippet)) { + mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); + } //判断小部件是否一致 + mSnippet = snippet; + + int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) + : Notes.TYPE_NOTE; + if (mIsCreate || mType != type) { + mDiffNoteValues.put(NoteColumns.TYPE, type); + } //判断类型是否一致 + mType = type; + + int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) + : AppWidgetManager.INVALID_APPWIDGET_ID; + if (mIsCreate || mWidgetId != widgetId) { + mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); + } //判断控件id是否一致 + mWidgetId = widgetId; + + int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note + .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; + if (mIsCreate || mWidgetType != widgetType) { + mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); + } + mWidgetType = widgetType; + + long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note + .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; + if (mIsCreate || mOriginParent != originParent) { + mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); + } + mOriginParent = originParent; + + for (int i = 0; i < dataArray.length(); i++) { + JSONObject data = dataArray.getJSONObject(i); + SqlData sqlData = null; + if (data.has(DataColumns.ID)) { + long dataId = data.getLong(DataColumns.ID); + for (SqlData temp : mDataList) { + if (dataId == temp.getId()) { + sqlData = temp; + } + } + } + + if (sqlData == null) { + sqlData = new SqlData(mContext); + mDataList.add(sqlData); + } + + sqlData.setContent(data); + } + } + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + return false; + } + return true; + } + + //功能描述：获取content机制提供的数据并加载到note中 + + public JSONObject getContent() { //获取content机制提供的数据并加载到note中 + try { + JSONObject js = new JSONObject(); + + if (mIsCreate) { + Log.e(TAG, "it seems that we haven't created this in database yet"); + return null; + } //采用的是第一种构造方式，自然实施初始化而已，显示错误：没创建数据库 + + JSONObject note = new JSONObject(); + if (mType == Notes.TYPE_NOTE) { //类型为note时//判断类型是否note类型 + note.put(NoteColumns.ID, mId); //设置以下12个内部变量 + note.put(NoteColumns.ALERTED_DATE, mAlertDate);//提醒时间 + note.put(NoteColumns.BG_COLOR_ID, mBgColorId);//背景颜色 + note.put(NoteColumns.CREATED_DATE, mCreatedDate);//创建日期 + note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); + note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);//修改日期 + note.put(NoteColumns.PARENT_ID, mParentId); + note.put(NoteColumns.SNIPPET, mSnippet);//摘要 + note.put(NoteColumns.TYPE, mType);//类型 + note.put(NoteColumns.WIDGET_ID, mWidgetId); + note.put(NoteColumns.WIDGET_TYPE, mWidgetType);//小部件类型 + note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);//最初的父类 + js.put(GTaskStringUtils.META_HEAD_NOTE, note);;//将这个便签存入元数据中 + + + JSONArray dataArray = new JSONArray(); + for (SqlData sqlData : mDataList) { + JSONObject data = sqlData.getContent(); + if (data != null) { + dataArray.put(data); + } + } + js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); + } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { //类型为文件夹或者系统时 + note.put(NoteColumns.ID, mId); + note.put(NoteColumns.TYPE, mType); + note.put(NoteColumns.SNIPPET, mSnippet); + js.put(GTaskStringUtils.META_HEAD_NOTE, note); + } + //对于文件夹类型或者系统文件夹类型，将id，类型，以及摘要，存入jsonobject,然后对应META_HEAD_NOTE键，存入共享，其实也只有那么多可以传输 + + return js; + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + } + return null; + } + + //功能描述：给当前id设置父id + + public void setParentId(long id) { + mParentId = id; + mDiffNoteValues.put(NoteColumns.PARENT_ID, id); + } + + //功能描述：给当前id设置Gtaskid + + public void setGtaskId(String gid) { + mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); + } + + //功能描述：给当前id设置同步id + + public void setSyncId(long syncId) { + mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); + } + + //功能描述：将本地修改初始化，即撤销当前所有修改 + + public void resetLocalModified() { + mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); + } + + //功能描述：获得当前id + + public long getId() { + return mId; + } + + //功能描述：获得当前id的父id + public long getParentId() { + return mParentId; + } + + //功能描述：获取小片段，即用于显示的部分便签内容 + public String getSnippet() { + return mSnippet; + } + + //功能描述：判断是否为便签类型 + public boolean isNoteType() { + return mType == Notes.TYPE_NOTE; + } + + //功能描述：commit函数，作用于把当前所做的修改传送并保存在数据库中 + public void commit(boolean validateVersion) { + if (mIsCreate) { + if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { + mDiffNoteValues.remove(NoteColumns.ID); + //如果是一个无效的id并且还含有这个id，就将它移除 + } + + Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); + //插入便签的uri + try { + mId = Long.valueOf(uri.getPathSegments().get(1)); + //强制转换path为id ，Long型 + } catch (NumberFormatException e) { + Log.e(TAG, "Get note id error :" + e.toString()); + throw new ActionFailureException("create note failed"); + } //捕获异常，转换出错，显示错误“获取note的id出现错误” + if (mId == 0) { + throw new IllegalStateException("Create thread id failed"); + } //创建线程 id 失败 + + if (mType == Notes.TYPE_NOTE) { //对于note类型，引用sqlData.commit + for (SqlData sqlData : mDataList) { //直接使用sqldata中实现 + sqlData.commit(mId, false, -1); + } + } + } else { + if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { + Log.e(TAG, "No such note"); //判断是否含有这个便签 + throw new IllegalStateException("Try to update note with invalid id"); + //如果没有就是无效id + } + if (mDiffNoteValues.size() > 0) { + mVersion ++; + int result = 0; + if (!validateVersion) { //构造字符串 + result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + + NoteColumns.ID + "=?)", new String[] { + String.valueOf(mId) + }); + } else { + result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", + new String[] { + String.valueOf(mId), String.valueOf(mVersion) + }); + } + if (result == 0) { + Log.w(TAG, "there is no update. maybe user updates note when syncing"); + } //如果没有更新，可能是用户在同步的时候更新了 + } + + if (mType == Notes.TYPE_NOTE) { + for (SqlData sqlData : mDataList) { + sqlData.commit(mId, validateVersion, mVersion); + } + } //对note类型，还是对其中的data引用commit，从而实现目的 + } + + // refresh local info + //刷新本地信息 + loadFromCursor(mId); + if (mType == Notes.TYPE_NOTE) + loadDataContent(); //如果是便签类型，获取共享数据并加载到数据库 + + mDiffNoteValues.clear(); //清空共享数据 + mIsCreate = false; //重置 + } +} diff --git a/doc/标注/210340054_金佳艺/Task.java b/doc/标注/210340054_金佳艺/Task.java new file mode 100644 index 0000000..fd99fe7 --- /dev/null +++ b/doc/标注/210340054_金佳艺/Task.java @@ -0,0 +1,365 @@ +/* + * 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. + */ + //Task代码注释 + //主要作用：同步任务，将创建、更新和同步动作包装成JSON对象，同时使用本地和远程的JSON对结点内容进行设置，从而获取同步信息，实现本地和远程的信息同步 +package net.micode.notes.gtask.data; + +import android.database.Cursor; +import android.text.TextUtils; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.DataConstants; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.gtask.exception.ActionFailureException; +import net.micode.notes.tool.GTaskStringUtils; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + + +public class Task extends Node { //定义一个Task类,继承Node类 + private static final String TAG = Task.class.getSimpleName(); + //调用函数得到类简写名称并存入字符串TAG内 + private boolean mCompleted; //判断当前任务是否完成 + + private String mNotes; //在实例中存储数据的类型，表示任务的注释信息 + + private JSONObject mMetaInfo; //将在实例中存储数据的类型 + + private Task mPriorSibling; //对应的优先兄弟Task的指针 + + private TaskList mParent; //所在的任务列表的指针 + + public Task() { + super(); + mCompleted = false; + mNotes = null; + mPriorSibling = null; //TaskList中当前Task前面的Task的指针 + mParent = null; //当前Task所在的TaskList + mMetaInfo = null; + } + + public JSONObject getCreateAction(int actionId) { + //getCreateAction方法接收一个整型参数actionId，将该参数作为返回JSONObject对象的action_id属性值。 + JSONObject js = new JSONObject(); + + try { + // action_type + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, //存入当前task指针 + GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); + //发送对actiontype的请求 + // action_id + js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); + + // index 父任务列表中的索引 + js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this)); //设置索引 + + // entity_delta + JSONObject entity = new JSONObject(); + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); //获取任务名 + entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); //对任务创建id进行判空操作 + entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, //实体类数据 + GTaskStringUtils.GTASK_JSON_TYPE_TASK); + if (getNotes() != null) { + entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); + } //若存在文本输入放入实体内 + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); //讲实体存入js + + // parent_id + js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid()); //父类id类型 + + // dest_parent_type + js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE, + GTaskStringUtils.GTASK_JSON_TYPE_GROUP); //所在列表的id存入父id + + // list_id + js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid()); + + // prior_sibling_id + if (mPriorSibling != null) { + js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid()); + } + //如果该任务在兄弟任务中不是第一个，则设置prior_sibling_id属性值为前一个兄弟任务的gid + //将其优先存入ID序列中 + } catch (JSONException e) { + Log.e(TAG, e.toString()); //e.toString()获取异常类型和异常详细消息 + e.printStackTrace(); + throw new ActionFailureException("fail to generate task-create jsonobject"); + } //抛出异常处理机制 + + return js; + } + + public JSONObject getUpdateAction(int actionId) { //更新action + //getUpdateAction方法接收一个整型参数actionId，将该参数作为返回JSONObject对象的action_id属性值 + JSONObject js = new JSONObject(); + + try { + // action_type + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, + GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); + //action_type属性值为update，表示更新操作 + + // action_id + js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); + + // id + js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); + + // entity_delta + JSONObject entity = new JSONObject(); + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); + if (getNotes() != null) { + entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); + }//如果存在 notes ，则将其也放入 entity 中 + entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + //deleted属性表示任务是否被删除，如果该值为true，则该任务会被移除 + + } catch (JSONException e) { //获取异常 + Log.e(TAG, e.toString()); + e.printStackTrace(); //命令行打印异常信息在程序中出错的位置及原因 + throw new ActionFailureException("fail to generate task-update jsonobject"); + } //生成任务更新的数据传输失败 + + return js; + } + + public void setContentByRemoteJSON(JSONObject js) //通过云端传输数据设置内容 + //定义了一个setContentByRemoteJSON方法，该方法从远程JSON对象中获取任务的属性值，并将这些属性值设置到本地任务对象中 + //表示从远程服务器获取的任务信息 + + { + if (js != null) { + try { + // id + if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { //如果js指针指向的目标存在 + setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); //利用类自身的set函数，并且使用了JSONObject的get类型函数 + } //判断记录是否被删除 + + // last_modified + if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { + setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); + } + + // name + if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { + setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); + } + + // notes + if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) { + setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); + } + + // deleted + if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) { + setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); + } + + // completed + if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { + setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); + } //记录已经完成的 + } catch (JSONException e) { //抛出异常 + Log.e(TAG, e.toString()); //获取异常类型和异常信息 + e.printStackTrace(); //打印 + throw new ActionFailureException("fail to get task content from jsonobject"); + } + } + } + + public void setContentByLocalJSON(JSONObject js) { //通过本地的jsonobject获取内容 + if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) + || !js.has(GTaskStringUtils.META_HEAD_DATA)) { //如果js不存在或者js没有元数据的开头或者js指针没有元数据 + Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); //反馈给用户出错信息 + } + + try { + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + + if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { //note类型不匹配 + Log.e(TAG, "invalid type"); //无效 + return; + } + + for (int i = 0; i < dataArray.length(); i++) { + //遍历 dataArray 查找与数据库中DataConstants.NOTE 记录信息一致的 data + JSONObject data = dataArray.getJSONObject(i); + if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { + setName(data.getString(DataColumns.CONTENT)); //判断两个字符串是否相等 + break; + } + } + + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + } + } + + public JSONObject getLocalJSONFromContent() { //从content获取本地json + String name = getName(); //获取名称 + try { + if (mMetaInfo == null) { + // new task created from web + if (name == null) { + Log.w(TAG, "the note seems to be an empty one"); + return null; + } + //若命名为空则创建一个新的 + + JSONObject js = new JSONObject(); + JSONObject note = new JSONObject(); + JSONArray dataArray = new JSONArray(); + JSONObject data = new JSONObject(); //对四个指针进行初始化 + data.put(DataColumns.CONTENT, name); + dataArray.put(data); + js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); //元数据类型信息非空，则进行同步更新操作 + note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); + js.put(GTaskStringUtils.META_HEAD_NOTE, note); //实现数据同步 + return js; + } else { //否则将元数据同步至数据中 + // synced task + JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); //同步任务 + JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); //同步数据 + + for (int i = 0; i < dataArray.length(); i++) { + JSONObject data = dataArray.getJSONObject(i); + if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { + data.put(DataColumns.CONTENT, getName()); + break; + } + }//通过循环查找与数据库中DataConstants.NOTE 记录信息一致的 data + + note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); + return mMetaInfo; + } + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + return null; + } + } + + public void setMetaInfo(MetaData metaData) { //设置元数据信息 + if (metaData != null && metaData.getNotes() != null) { + try { + mMetaInfo = new JSONObject(metaData.getNotes()); + } catch (JSONException e) { + Log.w(TAG, e.toString()); + mMetaInfo = null; + } + } //如果元数据非空且其 notes 非空，则修改元数据类型信息 + } + + public int getSyncAction(Cursor c) { //实现同步操作 + try { + JSONObject noteInfo = null; //新建一个 JSONObject 的对象实体 + if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) { + noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + } //元数据信息不为空并且元数据信息还含有“META_HEAD_NOTE”，说明便签存在 + + if (noteInfo == null) { + Log.w(TAG, "it seems that note meta has been deleted"); + return SYNC_ACTION_UPDATE_REMOTE; + } //云端便签 id 已被删除，不存在，返回更新本地数据的同步行为 + + if (!noteInfo.has(NoteColumns.ID)) { + Log.w(TAG, "remote note id seems to be deleted"); + return SYNC_ACTION_UPDATE_LOCAL; + } //匹配note的id + + // validate the note id now + if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) { + Log.w(TAG, "note id doesn't match"); + return SYNC_ACTION_UPDATE_LOCAL; //判断修改后的ID匹配是否成功，成功则返回无同步操作，未成功则应用云端到本地，返回本地同步更新操作 + } + + if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { + // there is no local update + if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + // no update both side + return SYNC_ACTION_NONE; + } else { + // apply remote to local + return SYNC_ACTION_UPDATE_LOCAL; + } + } else { + // validate gtask id + if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { + //判断gtask的id与获取的id是否匹配 + Log.e(TAG, "gtask id doesn't match"); //错误，未找到 gtask 的 id + return SYNC_ACTION_ERROR; + } + if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + ////错误，未找到 gtask 的 id + // local modification only + return SYNC_ACTION_UPDATE_REMOTE; + } else { + return SYNC_ACTION_UPDATE_CONFLICT; + } + } + } catch (Exception e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + } + + return SYNC_ACTION_ERROR; + } + + public boolean isWorthSaving() { //判断是否修改并同步操作 + return mMetaInfo != null || (getName() != null && getName().trim().length() > 0) + || (getNotes() != null && getNotes().trim().length() > 0); + } + + public void setCompleted(boolean completed) { + this.mCompleted = completed; + } //设定是否完成的成员变量 + + public void setNotes(String notes) { + this.mNotes = notes; + } //设定note成员变量 + + public void setPriorSibling(Task priorSibling) { + this.mPriorSibling = priorSibling; + } //设置优先兄弟 task 的优先级 + + public void setParent(TaskList parent) { + this.mParent = parent; + } //设置父类节点 + + public boolean getCompleted() { + return this.mCompleted; + } //判断是否完成 + + public String getNotes() { + return this.mNotes; + } //获取成员变量 mNotes 的信息 + + public Task getPriorSibling() { + return this.mPriorSibling; + } //获取优先兄弟列表 + + public TaskList getParent() { + return this.mParent; + } //获取父类节点列表 + +} diff --git a/doc/标注/210340054_金佳艺/TaskList.java b/doc/标注/210340054_金佳艺/TaskList.java new file mode 100644 index 0000000..7abba2c --- /dev/null +++ b/doc/标注/210340054_金佳艺/TaskList.java @@ -0,0 +1,431 @@ +/* + * 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. + */ + //TaskList代码标注 + //主要作用：同步任务列表，将Task组织成同步任务列表进行管理 +package net.micode.notes.gtask.data; + +import android.database.Cursor; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.gtask.exception.ActionFailureException; +import net.micode.notes.tool.GTaskStringUtils; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; + + +public class TaskList extends Node {//创建继承 Node的任务表类 + private static final String TAG = TaskList.class.getSimpleName(); //tag标记 + //调用getSimplename（）函数获取名字并赋值给TAG作为标记 + private int mIndex; //当前TaskList的指针 + + private ArrayList mChildren; //类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList + + + public TaskList() { //构造函数进行初始化 + super(); //调用父类构造方法 + mChildren = new ArrayList(); //声明数组 + mIndex = 1; + } + + /* (non-Javadoc) + * @see net.micode.notes.gtask.data.Node#getCreateAction(int) + * 生成并返回一个包含了一定数据的JSONObject实体 + */ + + public JSONObject getCreateAction(int actionId) { + JSONObject js = new JSONObject(); //直接构建即直接实例化一个JSONObject对象 + + try { + // action_type + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, + GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); + //操作的是列表，而不只是单个task了 + // action_id + js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); + + // index + js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex); + + // entity_delta + // 新建一个 JSONObject 对象，名为实体，将 name，creator id，entity type 三个信息存在一起 + JSONObject entity = new JSONObject(); //创建一个实体类并进行初始化 + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); + //getName是父类的一个函数 + entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); + //初始化id + entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, + GTaskStringUtils.GTASK_JSON_TYPE_GROUP); + //将实体类型设置为“GROUP” + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + throw new ActionFailureException("fail to generate tasklist-create jsonobject"); + } + + return js; + } + + /* (non-Javadoc) + * @see net.micode.notes.gtask.data.Node#getUpdateAction(int) + * 生成并返回一个包含了一定数据的JSONObject实体 + */ + + public JSONObject getUpdateAction(int actionId) { //接受更新action，返回jsonobject + JSONObject js = new JSONObject(); //创建一个对象并进行初始化 + + try { + // action_type + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, + GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); + + // action_id + js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); + + // id + js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); + + // entity_delta + JSONObject entity = new JSONObject(); + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); + entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + throw new ActionFailureException("fail to generate tasklist-update jsonobject"); + } + + return js; + } + + public void setContentByRemoteJSON(JSONObject js) { + //通过云端 JSON 数据设置实例化对象 js 的内容 + if (js != null) { + try { + // id + if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { + setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); + } + //判断js对象是否为空，如果为空即没有内容就不需要进行设置了 + + // last_modified + if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { + setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); + } + //调用JSONObject中的getLong函数，得到last_modified的号，并作为参数传给setLastModified函数（父类函数）进行设置 + + // name + if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { + setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); + } //对任务的name进行设置 + + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + throw new ActionFailureException("fail to get tasklist content from jsonobject"); + } + } + } + + public void setContentByLocalJSON(JSONObject js) { //通过本地 JSON 数据设置对象 js 内容 + if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { + //若 js 创建失败或 js 中不存在 META_HEAD_NOTE信息 + Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); + } //警告，没有可用资源 + + try { + JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + //NullPointerException这个异常出现在处理对象时对象不存在但又没有捕捉到进行处理的时候 + + if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + //对文件夹，设置文件名 + String name = folder.getString(NoteColumns.SNIPPET); + //获取文件夹片段字符串作为文件夹名称 + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); + //设置名称为MIUI系统文件夹前缀+文件夹名称 + } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { + //判断是不是系统文件 + if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); + //如果是根文件夹，设置名称：MIUI系统文件夹前缀+默认文件夹名称 + else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + + GTaskStringUtils.FOLDER_CALL_NOTE); + //如果是通话文件夹，设置名称：MIUI系统文件夹前缀+通话便签文件夹名称 + else + Log.e(TAG, "invalid system folder"); + ;//无效系统文件夹警告 + } else { + Log.e(TAG, "error type"); + //错误的文件夹类型 + } + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + } + } + + public JSONObject getLocalJSONFromContent() { //从content获取本地json + try { + JSONObject js = new JSONObject(); //创建对象并初始化 + JSONObject folder = new JSONObject(); //创建文件夹对象并初始化 + + String folderName = getName(); + if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)) + folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(), + folderName.length()); + folder.put(NoteColumns.SNIPPET, folderName); + //如果获取的文件夹名称是以[MIUI_Notes]开头，则文件夹名称应删掉前缀 + if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT) + || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE)) + folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + //这里与上一个函数setContentByRemoteJSON(JSONObject js)是一个逆过程，可以参看上一个函数是如何构造出foldername的 + else + folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); + + js.put(GTaskStringUtils.META_HEAD_NOTE, folder); + + return js; + } catch (JSONException e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + return null; + } + } + + public int getSyncAction(Cursor c) { //获取同步信息 + try { + if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { //若本地修改未记录 + // there is no local update + if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + //记录最后一次修改 + // no update both side + return SYNC_ACTION_NONE; + } else { + // apply remote to local + return SYNC_ACTION_UPDATE_LOCAL; + } //匹配失败，返回更新本地数据的同步行为 + } else { + // validate gtask id + if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { + Log.e(TAG, "gtask id doesn't match"); + return SYNC_ACTION_ERROR; + } //如果获取的ID不匹配，返回同步动作失败 + if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + // local modification only + return SYNC_ACTION_UPDATE_REMOTE; + //如果是最近一次修改的 id，则返回云端更新的同步动作 + } else { + // for folder conflicts, just apply local modification + return SYNC_ACTION_UPDATE_REMOTE; + } + } + } catch (Exception e) { + Log.e(TAG, e.toString()); + e.printStackTrace(); + } + + return SYNC_ACTION_ERROR; + } + + + // @return + //功能：获得TaskList的大小，即mChildren的大小 + + public int getChildTaskCount() { + + return mChildren.size(); + } + + //获得TaskList的大小，即mChildren的大小，mChildren 是TaskList 的一个实例 + //@param task + //@return 返回值为是否成功添加任务。 + //功能：在当前任务表末尾添加新的任务。 + + public boolean addChildTask(Task task) { + boolean ret = false; + if (task != null && !mChildren.contains(task)) { //任务非空且任务表中不存在该任务 + ret = mChildren.add(task); + if (ret) { + // need to set prior sibling and parent + task.setPriorSibling(mChildren.isEmpty() ? null : mChildren + .get(mChildren.size() - 1)); + task.setParent(this); + //ArrayList的每一次修改变化都要紧跟相关Task中PriorSibling的修改 + } + } + return ret; + } + + /** + * @param task + * @param index + * @return + * 功能：在当前任务表的指定位置添加新的任务。 + */ + + public boolean addChildTask(Task task, int index) { + if (index < 0 || index > mChildren.size()) { + Log.e(TAG, "add child task: invalid index"); + return false; + } + //在当前任务表的指定位置添加新的任务，index是指针 + + int pos = mChildren.indexOf(task); + if (task != null && pos == -1) { + mChildren.add(index, task); + //获取要添加的任务在列表中的位置，如果不在列表中则返回-1 + + // update the task list + Task preTask = null; //更新任务表 + Task afterTask = null; + if (index != 0) + preTask = mChildren.get(index - 1); + if (index != mChildren.size() - 1) + afterTask = mChildren.get(index + 1); + + task.setPriorSibling(preTask); //使得前后三个任务连在一起 + if (afterTask != null) + afterTask.setPriorSibling(task); + } + + return true; + } + + /** + * @param task + * @return 返回删除是否成功 + * 功能：删除TaskList中的一个Task + */ + + public boolean removeChildTask(Task task) { //删除任务表中的子任务 + boolean ret = false; + int index = mChildren.indexOf(task); //获取该任务在任务表中的索引 + if (index != -1) { //索引有效，任务在表中存在 + ret = mChildren.remove(task); //移除任务 + + if (ret) { + // reset prior sibling and parent + task.setPriorSibling(null); + task.setParent(null); //删除成功，task的上一个任务指针和父指针置空 + + // update the task list + if (index != mChildren.size()) { + mChildren.get(index).setPriorSibling( + index == 0 ? null : mChildren.get(index - 1)); + } //删除成功后，要对任务列表进行更新 + } + } + return ret; + } + + /** + * @param task + * @param index + * @return + * 功能：将当前TaskList中含有的某个Task移到index位置 + */ + + public boolean moveChildTask(Task task, int index) { + + if (index < 0 || index >= mChildren.size()) { + Log.e(TAG, "move child task: invalid index"); + return false; + } + + int pos = mChildren.indexOf(task); + if (pos == -1) { + Log.e(TAG, "move child task: the task should in the list"); + return false; + } + + if (pos == index) + return true; + return (removeChildTask(task) && addChildTask(task, index)); + } + //利用已经实现好的功能完成当下功能 + + /** + * @param gid + * @return返回寻找结果 + * 功能：按gid寻找Task + */ + + public Task findChildTaskByGid(String gid) { + for (int i = 0; i < mChildren.size(); i++) { + Task t = mChildren.get(i); + if (t.getGid().equals(gid)) { + return t; + } + } + return null; + } + + /** + * @param task + * @return + * 功能：返回指定Task的index + */ + public int getChildTaskIndex(Task task) { + return mChildren.indexOf(task); + } + + /** + * @param index + * @return + * 功能：返回指定index的Task + */ + public Task getChildTaskByIndex(int index) { + if (index < 0 || index >= mChildren.size()) { + Log.e(TAG, "getTaskByIndex: invalid index"); //如果指针不在范围内，无效索引 + return null; + } + return mChildren.get(index); + } + + /** + * @param gid + * @return + * 功能：返回指定gid的Task + */ + public Task getChilTaskByGid(String gid) { + for (Task task : mChildren) { //ArrayList的遍历方法 //通过索引获取子任务 + if (task.getGid().equals(gid)) + return task; + } + return null; + } + + public ArrayList getChildTaskList() { + return this.mChildren; + } //获取子任务列表 + + public void setIndex(int index) { + this.mIndex = index; + } //设置任务索引 + + public int getIndex() { + return this.mIndex; + } //获取任务索引 +} diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore new file mode 100644 index 0000000..359bb53 --- /dev/null +++ b/src/.idea/.gitignore @@ -0,0 +1,3 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml new file mode 100644 index 0000000..4eb8629 --- /dev/null +++ b/src/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 0000000..f669a0e --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/.idea/src.iml b/src/.idea/src.iml new file mode 100644 index 0000000..9f3ab6f --- /dev/null +++ b/src/.idea/src.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/src/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.bin b/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.bin index a52cf92..cef4be2 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.bin and b/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.bin differ diff --git a/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.lock b/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.lock index bc09e2d..5d9ae04 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.lock and b/src/Xiaominotes/.gradle/6.7.1/executionHistory/executionHistory.lock differ diff --git a/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.bin b/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.bin index 18ce660..96e5948 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.bin and b/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.bin differ diff --git a/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.lock b/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.lock index 0a1589d..21560ff 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.lock and b/src/Xiaominotes/.gradle/6.7.1/fileHashes/fileHashes.lock differ diff --git a/src/Xiaominotes/.gradle/6.7.1/fileHashes/resourceHashesCache.bin b/src/Xiaominotes/.gradle/6.7.1/fileHashes/resourceHashesCache.bin index a2552a9..0346b33 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/fileHashes/resourceHashesCache.bin and b/src/Xiaominotes/.gradle/6.7.1/fileHashes/resourceHashesCache.bin differ diff --git a/src/Xiaominotes/.gradle/6.7.1/javaCompile/javaCompile.lock b/src/Xiaominotes/.gradle/6.7.1/javaCompile/javaCompile.lock index 3398912..507c56b 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/javaCompile/javaCompile.lock and b/src/Xiaominotes/.gradle/6.7.1/javaCompile/javaCompile.lock differ diff --git a/src/Xiaominotes/.gradle/6.7.1/javaCompile/taskHistory.bin b/src/Xiaominotes/.gradle/6.7.1/javaCompile/taskHistory.bin index 4230530..6d68e96 100644 Binary files a/src/Xiaominotes/.gradle/6.7.1/javaCompile/taskHistory.bin and b/src/Xiaominotes/.gradle/6.7.1/javaCompile/taskHistory.bin differ diff --git a/src/Xiaominotes/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Xiaominotes/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 81d9783..277f945 100644 Binary files a/src/Xiaominotes/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Xiaominotes/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Xiaominotes/.gradle/buildOutputCleanup/outputFiles.bin b/src/Xiaominotes/.gradle/buildOutputCleanup/outputFiles.bin index 797e62e..ba51926 100644 Binary files a/src/Xiaominotes/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Xiaominotes/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Xiaominotes/.gradle/checksums/checksums.lock b/src/Xiaominotes/.gradle/checksums/checksums.lock index a7b782a..34e8a01 100644 Binary files a/src/Xiaominotes/.gradle/checksums/checksums.lock and b/src/Xiaominotes/.gradle/checksums/checksums.lock differ diff --git a/src/Xiaominotes/.gradle/checksums/md5-checksums.bin b/src/Xiaominotes/.gradle/checksums/md5-checksums.bin new file mode 100644 index 0000000..ed7b1f9 Binary files /dev/null and b/src/Xiaominotes/.gradle/checksums/md5-checksums.bin differ diff --git a/src/Xiaominotes/.gradle/checksums/sha1-checksums.bin b/src/Xiaominotes/.gradle/checksums/sha1-checksums.bin new file mode 100644 index 0000000..df94d8b Binary files /dev/null and b/src/Xiaominotes/.gradle/checksums/sha1-checksums.bin differ diff --git a/src/Xiaominotes/.idea/gradle.xml b/src/Xiaominotes/.idea/gradle.xml index 5cd135a..a2d7c21 100644 --- a/src/Xiaominotes/.idea/gradle.xml +++ b/src/Xiaominotes/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_commons_logging_1_2_jar.xml b/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_commons_logging_1_2_jar.xml deleted file mode 100644 index 163dfa2..0000000 --- a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_commons_logging_1_2_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_httpclient_osgi_4_5_14_jar.xml b/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_httpclient_osgi_4_5_14_jar.xml deleted file mode 100644 index aec18d7..0000000 --- a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_httpclient_osgi_4_5_14_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_httpcore_4_4_16_jar.xml b/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_httpcore_4_4_16_jar.xml deleted file mode 100644 index 97fcc45..0000000 --- a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_httpcore_4_4_16_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_jna_4_5_2_jar.xml b/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_jna_4_5_2_jar.xml deleted file mode 100644 index efbaaf4..0000000 --- a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_jna_4_5_2_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_jna_platform_4_5_2_jar.xml b/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_jna_platform_4_5_2_jar.xml deleted file mode 100644 index eb0a760..0000000 --- a/src/Xiaominotes/.idea/libraries/Gradle__E__Android_lib_httpcomponents_client_4_5_14_bin_lib_jna_platform_4_5_2_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/libraries/Gradle__org_apache_http_legacy.xml b/src/Xiaominotes/.idea/libraries/Gradle__org_apache_http_legacy.xml deleted file mode 100644 index cebc51d..0000000 --- a/src/Xiaominotes/.idea/libraries/Gradle__org_apache_http_legacy.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/modules.xml b/src/Xiaominotes/.idea/modules.xml index df1d393..303455e 100644 --- a/src/Xiaominotes/.idea/modules.xml +++ b/src/Xiaominotes/.idea/modules.xml @@ -4,6 +4,9 @@ + + + \ No newline at end of file diff --git a/src/Xiaominotes/.idea/modules/Xiaominotes.iml b/src/Xiaominotes/.idea/modules/Xiaominotes.iml index 96efc54..af9a779 100644 --- a/src/Xiaominotes/.idea/modules/Xiaominotes.iml +++ b/src/Xiaominotes/.idea/modules/Xiaominotes.iml @@ -1,13 +1,5 @@ - - - - - - diff --git a/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.androidTest.iml b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.androidTest.iml new file mode 100644 index 0000000..8f7dafa --- /dev/null +++ b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.androidTest.iml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.iml b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.iml index 8b57806..e7f49d5 100644 --- a/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.iml +++ b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.iml @@ -11,11 +11,6 @@ \ No newline at end of file diff --git a/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.main.iml b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.main.iml new file mode 100644 index 0000000..542ae13 --- /dev/null +++ b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.main.iml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.unitTest.iml b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.unitTest.iml new file mode 100644 index 0000000..3b929da --- /dev/null +++ b/src/Xiaominotes/.idea/modules/app/Xiaominotes.app.unitTest.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Xiaominotes/.idea/runConfigurations.xml b/src/Xiaominotes/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/src/Xiaominotes/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Xiaominotes/.idea/vcs.xml b/src/Xiaominotes/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/src/Xiaominotes/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 50f1cb3..195efee 100644 Binary files a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 601f245..9e66b4b 100644 Binary files a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index aea6665..601f245 100644 Binary files a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 601f245..b776ca2 100644 Binary files a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 430979e..3c2cf5b 100644 Binary files a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin new file mode 100644 index 0000000..5c4b42b Binary files /dev/null and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin new file mode 100644 index 0000000..ce69d6f Binary files /dev/null and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_0/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_0/graph.bin similarity index 100% rename from src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_0/graph.bin rename to src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_0/graph.bin diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_1/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_1/graph.bin similarity index 100% rename from src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_1/graph.bin rename to src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_1/graph.bin diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_2/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_2/graph.bin similarity index 100% rename from src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_2/graph.bin rename to src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_2/graph.bin diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_3/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_3/graph.bin similarity index 100% rename from src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_3/graph.bin rename to src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_3/graph.bin diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_4/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_4/graph.bin similarity index 100% rename from src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_4/graph.bin rename to src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_4/graph.bin diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_5/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_5/graph.bin similarity index 100% rename from src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c7d976b36f416ea1a6d8b6a1069699aaaf8e2ba1ad1b10ebc68cdd42775c6f13_bucket_5/graph.bin rename to src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_5/graph.bin diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_6/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_6/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_7/graph.bin b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/Xiaominotes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_46e0d1d90baf58e82ed6a86120d7a3336abcdd54e04ab0720119fac99f89d695_bucket_7/graph.bin differ diff --git a/src/Xiaominotes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Xiaominotes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 5f9b82d..c3f84aa 100644 Binary files a/src/Xiaominotes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Xiaominotes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Xiaominotes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Xiaominotes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 6020111..4197b97 100644 Binary files a/src/Xiaominotes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Xiaominotes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Xiaominotes/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Xiaominotes/app/build/intermediates/dex_number_of_buckets_file/debug/out index 62f9457..301160a 100644 --- a/src/Xiaominotes/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/src/Xiaominotes/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/0_commons-logging-1.2.jar b/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/0_commons-logging-1.2.jar deleted file mode 100644 index e36e59c..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/0_commons-logging-1.2.jar and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/1_httpclient-osgi-4.5.14.jar b/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/1_httpclient-osgi-4.5.14.jar deleted file mode 100644 index 3796c08..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/1_httpclient-osgi-4.5.14.jar and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpcore-4.4.16.jar b/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpcore-4.4.16.jar deleted file mode 100644 index 373ebad..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpcore-4.4.16.jar and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/3_jna-4.5.2.jar b/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/3_jna-4.5.2.jar deleted file mode 100644 index e35363b..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/3_jna-4.5.2.jar and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/4_jna-platform-4.5.2.jar b/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/4_jna-platform-4.5.2.jar deleted file mode 100644 index 5348ecd..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/external_file_lib_dex_archives/debug/4_jna-platform-4.5.2.jar and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Xiaominotes/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex deleted file mode 100644 index d0e86e2..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index c6ae856..d5ff387 100644 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1iFgaQIXtSaQYIgU94xhviCo2rE= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1iFgaQIXtSaQYIgU94xhviCo2rE= deleted file mode 100644 index aa34419..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1iFgaQIXtSaQYIgU94xhviCo2rE= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KFeEYQd9buBHxBgys4y5TIxcd+Q= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KFeEYQd9buBHxBgys4y5TIxcd+Q= deleted file mode 100644 index aed581e..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KFeEYQd9buBHxBgys4y5TIxcd+Q= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O7PvAZy9R3kR7yOgmQsCw90BF9Q= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O7PvAZy9R3kR7yOgmQsCw90BF9Q= deleted file mode 100644 index 78e2058..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O7PvAZy9R3kR7yOgmQsCw90BF9Q= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PLZ8N6ZihFzKytB6dvROVFAMkGY= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PLZ8N6ZihFzKytB6dvROVFAMkGY= deleted file mode 100644 index 93a3b9f..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PLZ8N6ZihFzKytB6dvROVFAMkGY= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lDBVkn3lAKXdVileolfZxUOB61o= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lDBVkn3lAKXdVileolfZxUOB61o= deleted file mode 100644 index 270124f..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lDBVkn3lAKXdVileolfZxUOB61o= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1iFgaQIXtSaQYIgU94xhviCo2rE= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1iFgaQIXtSaQYIgU94xhviCo2rE= deleted file mode 100644 index aa34419..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1iFgaQIXtSaQYIgU94xhviCo2rE= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/KFeEYQd9buBHxBgys4y5TIxcd+Q= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/KFeEYQd9buBHxBgys4y5TIxcd+Q= deleted file mode 100644 index aed581e..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/KFeEYQd9buBHxBgys4y5TIxcd+Q= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/O7PvAZy9R3kR7yOgmQsCw90BF9Q= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/O7PvAZy9R3kR7yOgmQsCw90BF9Q= deleted file mode 100644 index 78e2058..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/O7PvAZy9R3kR7yOgmQsCw90BF9Q= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PLZ8N6ZihFzKytB6dvROVFAMkGY= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PLZ8N6ZihFzKytB6dvROVFAMkGY= deleted file mode 100644 index 93a3b9f..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PLZ8N6ZihFzKytB6dvROVFAMkGY= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lDBVkn3lAKXdVileolfZxUOB61o= b/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lDBVkn3lAKXdVileolfZxUOB61o= deleted file mode 100644 index 270124f..0000000 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lDBVkn3lAKXdVileolfZxUOB61o= and /dev/null differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 0ddfe26..a37253a 100644 --- a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 0731961..534c5ff 100644 --- a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 5b56455..e9d1721 100644 --- a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Fri Mar 31 17:31:15 CST 2023 -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\raw\\introduction=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat -D\:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat +#Thu Apr 06 11:57:30 CST 2023 +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\raw\\introduction=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat +D\:\\xiaomi\ Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat diff --git a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 04a37c7..1ed183a 100644 --- a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ 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 + #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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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 + \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 74f3ac2..8ad584b 100644 --- a/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Xiaominotes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index b894128..4031ef9 100644 --- a/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Mar 31 17:43:54 CST 2023 -base.0=D\:\\Campus\\Xiaominotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Thu Apr 06 11:57:38 CST 2023 +base.0=D\:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 06a817e..e112167 100644 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index fc69bf3..945a7c5 100644 Binary files a/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Xiaominotes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/Xiaominotes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Xiaominotes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 932a238..d449de8 100644 --- a/src/Xiaominotes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Xiaominotes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,255 +20,255 @@ 20 android:versionName="0.1" > 21 22 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +22-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="14" -23-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:15-41 +23-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="30" /> -24-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +24-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:26:5-81 -26-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:26:22-78 +26-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:27:5-88 -27-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:27:22-85 +27-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:28:5-67 -28-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:28:22-64 +28-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:29:5-72 -29-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:29:22-69 +29-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:30:5-74 -30-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:30:22-71 +30-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:31:5-80 -31-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:31:22-77 +31-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:32:5-71 -32-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:32:22-68 +32-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:33:5-74 -33-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:33:22-71 +33-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:34:5-81 -34-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:34:22-78 +34-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:36:5-152:19 +36-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:36:5-152:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:37:9-42 +38-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:37:9-42 39 android:label="@string/app_name" -39-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:38:9-41 +39-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:38:9-41 40 android:testOnly="true" > 41 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:39:9-52:20 +41-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:39:9-52:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:40:13-49 +42-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:40:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:41:13-74 +43-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:41:13-74 44 android:label="@string/app_name" -44-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:42:13-45 +44-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:42:13-45 45 android:launchMode="singleTop" -45-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:43:13-43 +45-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:43:13-43 46 android:theme="@style/NoteTheme" -46-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:44:13-45 +46-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:44:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:45:13-57 +47-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:45:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:46:13-52 +48-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:46:13-52 49 -49-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:48:13-51:29 +49-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:48:13-51:29 50 -50-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:49:17-69 -50-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:49:25-66 +50-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:49:17-69 +50-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:49:25-66 51 52 -52-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:50:17-77 -52-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:50:27-74 +52-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:50:17-77 +52-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:50:27-74 53 54 55 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:54:9-84:20 +55-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:54:9-84:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:55:13-48 +56-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:55:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:56:13-74 +57-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:56:13-74 58 android:launchMode="singleTop" -58-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:57:13-43 +58-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:57:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:58:13-45 +59-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:58:13-45 60 -60-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:60:13-67:29 -60-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:60:28-49 +60-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:60:13-67:29 +60-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:60:28-49 61 -61-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:61:17-62:54 -61-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:61:25-66 +61-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:61:17-62:54 +61-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:61:25-66 62 63 -63-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 -63-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 +63-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 +63-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 64 65 -65-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 -65-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 +65-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 +65-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 66 -66-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 -66-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 +66-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 +66-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 67 68 -68-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:69:13-74:29 +68-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:69:13-74:29 69 -69-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:70:17-79 -69-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:70:25-76 +69-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:70:17-79 +69-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:70:25-76 70 71 -71-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 -71-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 +71-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 +71-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 72 73 -73-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 -73-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 +73-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 +73-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 74 -74-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 -74-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 +74-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 +74-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 75 76 -76-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:76:13-79:29 +76-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:76:13-79:29 77 -77-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:77:17-71 -77-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:77:25-68 +77-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:77:17-71 +77-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:77:25-68 78 79 -79-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 -79-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 +79-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 +79-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 80 81 82 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:81:13-83:54 +82-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:81:13-83:54 83 android:name="android.app.searchable" -83-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:82:17-54 +83-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:82:17-54 84 android:resource="@xml/searchable" /> -84-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:83:17-51 +84-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:83:17-51 85 86 87 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:86:9-89:43 +87-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:86:9-89:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:87:13-63 +88-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:87:13-63 89 android:authorities="micode_notes" -89-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:88:13-47 +89-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:88:13-47 90 android:multiprocess="true" /> -90-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:89:13-40 +90-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:89:13-40 91 92 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:91:9-103:20 +92-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:91:9-103:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:92:13-57 +93-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:92:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:93:13-50 +94-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:93:13-50 95 -95-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:94:13-98:29 +95-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:94:13-98:29 96 -96-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:95:17-84 -96-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:95:25-81 +96-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:95:17-84 +96-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:95:25-81 97 -97-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:96:17-85 -97-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:96:25-82 +97-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:96:17-85 +97-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:96:25-82 98 -98-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:97:17-85 -98-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:97:25-82 +98-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:97:17-85 +98-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:97:25-82 99 100 101 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:100:13-102:58 +101-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:100:13-102:58 102 android:name="android.appwidget.provider" -102-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:101:17-58 +102-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:101:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:102:17-55 +103-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:102:17-55 104 105 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:104:9-117:20 +105-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:104:9-117:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:105:13-57 +106-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:105:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:106:13-50 +107-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:106:13-50 108 -108-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:94:13-98:29 +108-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:94:13-98:29 109 -109-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:95:17-84 -109-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:95:25-81 +109-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:95:17-84 +109-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:95:25-81 110 -110-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:96:17-85 -110-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:96:25-82 +110-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:96:17-85 +110-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:96:25-82 111 -111-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:97:17-85 -111-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:97:25-82 +111-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:97:17-85 +111-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:97:25-82 112 113 114 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:100:13-102:58 +114-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:100:13-102:58 115 android:name="android.appwidget.provider" -115-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:101:17-58 +115-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:101:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:102:17-55 +116-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:102:17-55 117 118 -118-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:119:9-123:20 -118-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:119:19-55 +118-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:119:9-123:20 +118-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:119:19-55 119 -119-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:120:13-122:29 +119-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:120:13-122:29 120 -120-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:121:17-79 -120-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:121:25-76 +120-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:121:17-79 +120-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:121:25-76 121 122 123 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:125:9-128:20 +123-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:125:9-128:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:126:13-61 +124-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:126:13-61 125 android:process=":remote" > -125-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:127:13-38 +125-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:127:13-38 126 127 128 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:130:9-135:20 +128-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:130:9-135:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:131:13-50 +129-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:131:13-50 130 android:label="@string/app_name" -130-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:132:13-45 +130-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:132:13-45 131 android:launchMode="singleInstance" -131-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:133:13-48 +131-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:133:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:134:13-75 +132-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:134:13-75 133 134 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:137:9-142:20 +134-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:137:9-142:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:138:13-71 +135-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:138:13-71 136 android:label="@string/preferences_title" -136-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:139:13-54 +136-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:139:13-54 137 android:launchMode="singleTop" -137-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:140:13-43 +137-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:140:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:141:13-60 +138-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:141:13-60 139 140 141 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:144:9-147:19 +141-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:144:9-147:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:145:13-74 +142-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:145:13-74 143 android:exported="true" > -143-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:146:13-36 +143-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:146:13-36 144 145 146 D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:149:9-151:52 +146-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:149:9-151:52 147 android:name="android.app.default_searchable" -147-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:150:13-58 +147-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:150:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:151:13-49 +148-->D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:151:13-49 149 150 151 diff --git a/src/Xiaominotes/app/build/intermediates/merged_java_res/debug/out.jar b/src/Xiaominotes/app/build/intermediates/merged_java_res/debug/out.jar index 9d214d4..15cb0ec 100644 Binary files a/src/Xiaominotes/app/build/intermediates/merged_java_res/debug/out.jar and b/src/Xiaominotes/app/build/intermediates/merged_java_res/debug/out.jar differ diff --git a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index fde9a95..3200c79 100644 --- a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,103 +1,53 @@ { "logs": [ { - "outputFile": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", "map": [ { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "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": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "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": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", + "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" } }, { - "source": "D:\\Campus\\Xiaominotes\\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": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "589,641,694,747,799", + "endColumns": "51,52,52,51,51", + "endOffsets": "636,689,742,794,846" } }, { - "source": "D:\\Campus\\Xiaominotes\\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" - } - } - ] - }, - { - "outputFile": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", - "map": [ - { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\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", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", "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" + "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -109,32 +59,13 @@ } }, { - "source": "D:\\Campus\\Xiaominotes\\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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", - "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" - } - }, - { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -145,14 +76,14 @@ } }, { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "739,1047", + "startOffsets": "758,1073", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1041,1162" + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -162,22 +93,91 @@ "endColumns": "19,19", "endOffsets": "407,527" } + } + ] + }, + { + "outputFile": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } }, { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values-zh-rCN\\strings.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" + "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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", - "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" + "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": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "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" + } + }, + { + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } } ] diff --git a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 053059d..2a58072 100644 --- a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,17 +1,17 @@ { "logs": [ { - "outputFile": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\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", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "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" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "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", diff --git a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index d98bfb5..3afc8bb 100644 --- a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,36 +1,17 @@ { "logs": [ { - "outputFile": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "D:\\Campus\\Xiaominotes\\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:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\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", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "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" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "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", @@ -40,6 +21,25 @@ "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" } + }, + { + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 1dc8f98..bd74e1b 100644 --- a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,36 +1,17 @@ { "logs": [ { - "outputFile": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", + "outputFile": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { - "source": "D:\\Campus\\Xiaominotes\\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": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", - "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" - } - }, - { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\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", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", "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" + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "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", @@ -42,13 +23,49 @@ } }, { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "589,641,694,747,799", + "endColumns": "51,52,52,51,51", + "endOffsets": "636,689,742,794,846" + } + }, + { + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "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": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + }, + "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": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", + "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" + } + }, + { + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -59,14 +76,14 @@ } }, { - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "739,1047", + "startOffsets": "758,1073", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1041,1162" + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -76,23 +93,6 @@ "endColumns": "19,19", "endOffsets": "407,527" } - }, - { - "source": "D:\\Campus\\Xiaominotes\\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": "589,641,694,747,799", - "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" - } } ] } diff --git a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 7bc1718..52db009 100644 --- a/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Xiaominotes/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,382 @@ [ { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\raw\\introduction" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\raw\\introduction" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\preferences.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\color\\primary_text_dark.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\clock.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\sub_folder.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_4x.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\folder_list_item.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\sub_folder.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_2x.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\call_record_folder.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\call_note_edit.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\add_account_text.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_2x_info.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_2x_info.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\raw-zh-rCN\\introduction" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\call_record_folder.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_4x_info.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\searchable.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_options.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\call_note_edit.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_edit.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\delete.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\notification.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\add_account_text.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_2x.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\datetime_picker.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\folder_list_item.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\selected.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\settings_header.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\selected.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\color\\primary_text_dark.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\settings_header.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\xml\\widget_4x_info.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\searchable.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable\\new_note.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_item.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_footer.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_item.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\xml\\preferences.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_options.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_footer.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_edit.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\account_dialog_title.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\layout\\widget_4x.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "D:\\Campus\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", - "source": "D:\\Campus\\Xiaominotes\\app\\src\\main\\res\\drawable\\new_note.xml" + "merged": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", + "source": "D:\\xiaomi Notes\\GPL_Project\\src\\Xiaominotes\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" } ] \ No newline at end of file diff --git a/src/Xiaominotes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Xiaominotes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 7525265..931afab 100644 Binary files a/src/Xiaominotes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Xiaominotes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat index ea7a13e..e31f3e8 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat index 2047e34..45e0b73 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat index 3fec010..e6c950c 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat index 9770ac0..fe4cf86 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat index cc457bc..14d91f9 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat index 77299c7..186b389 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat index ce00d50..faa7f46 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat index 7764730..c1720b2 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat index e8f30be..b02041d 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat index e9f1c41..5c10eb3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat index 000fbd9..b7ec1b8 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat index 802d365..d96b66d 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat index 31a6f0f..72b9ede 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat index b2b1ee1..e174eba 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat index b3f4c5b..c0efd96 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat index 893d2b9..460c324 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat index 3242e4e..e96e165 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat index a8ceed0..aa76872 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat index 81bacff..ba7e111 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat index dd54971..942bc0a 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat index b58841e..9f23671 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat index ee5ec9a..e11aff1 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat index 1c45803..ec56255 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat index c244483..f72bd40 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat index bf31251..e4257e3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat index d241eff..a5beb7d 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat index 9ab3663..acbae65 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat index 73edc87..a1965e6 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat index 8e324e6..209896f 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat index 4590123..2ed69be 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat index ccc08d1..c6a4387 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat index 81da2a4..ca79f86 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat index 09225e6..f58c907 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat index 8a3f1e4..b00e266 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat index 5c1c3fe..87976be 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat index f4d3d5b..846849b 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat index c99996c..37291ed 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat index dbc4066..3f49b38 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat index 9851748..8649034 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat index c3713b6..e220de0 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat index a6fb313..8fa7014 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat index bece902..fd1c7da 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat index dcf89f7..f0f5a22 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat index ce8f7e4..cd01359 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat index 32458c7..d3faa6a 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat index df35b86..c271a87 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat index 8aa11fb..eee760c 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat index 01b858b..fe69165 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat index 883589a..b489db3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat index 1044de9..0f9a358 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat index 7bb13bf..c5c891d 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat index ca05216..9dd479c 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat index 36ab190..4adef97 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat index 8ee7677..029a694 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat index 2a7d4b1..118daf9 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat index e554b3c..f6f6492 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat index c6f4ef1..f2043f5 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat index 659d93b..b4a6e08 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat index 65ba53a..d65cdd3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat index 6936725..156a419 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat index ea15759..8c3bf34 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat index 07ff645..4187e64 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat index 6f85076..1601d98 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat index 88df918..de022b3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat index 2b4c597..58b63c1 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat index 6c13e5e..72cab07 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat index bbe4e6e..06409d5 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat index c25e9ff..033c9dc 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat index 7a6fe8b..13b0c93 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat index 80b6ffb..97660c2 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat index 9d5460a..ec216f3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat index 16371f1..9f71b7c 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat index 2add6bb..71bbbf7 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat index 75fd565..a274b68 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat index da42050..0292681 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat index 77f2a50..d246005 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat index b3137d6..b337ab2 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat index 2ffdc8f..4637cb9 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat index 048c0cd..78426f1 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat index 95d9f6f..8bab7ab 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat index 21f5b7a..c27a5d0 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat index d4bb6ea..e982623 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat index 196cbcb..aece5dc 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat index a5409f1..935ae54 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat index e64242e..c51c3ae 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat index 1fc88b8..70dc3e3 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat index a689d1a..971b82f 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat index 9cc45fd..974cf20 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat index 7f9b6e0..71c7e25 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat index 5ab1084..6133bdd 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw_introduction.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw_introduction.flat index c32da18..4c62dad 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw_introduction.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/raw_introduction.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat index e5c0fad..cea1252 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat index 8505f7f..0824c40 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/values_values.arsc.flat index 59fdf60..ebba649 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat index 7cf2bf7..ed82c1b 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat index 13a468b..efe6b0c 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat index 58682bd..1d79baf 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat index d1476f6..d65bab5 100644 Binary files a/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat and b/src/Xiaominotes/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat differ diff --git a/src/Xiaominotes/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Xiaominotes/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index 51f6368..1920ca8 100644 --- a/src/Xiaominotes/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/src/Xiaominotes/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Xiaominotes/app/build/outputs/apk/debug/app-debug.apk b/src/Xiaominotes/app/build/outputs/apk/debug/app-debug.apk index 27ff6b3..84ca7c5 100644 Binary files a/src/Xiaominotes/app/build/outputs/apk/debug/app-debug.apk and b/src/Xiaominotes/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Xiaominotes/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Xiaominotes/app/build/outputs/logs/manifest-merger-debug-report.txt index cb0bdf3..73e3e03 100644 --- a/src/Xiaominotes/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Xiaominotes/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,243 +1,243 @@ -- Merging decision tree log --- manifest -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:1-153:12 package - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml - INJECTED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml + INJECTED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:26:5-81 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:26:22-78 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:27:5-88 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:27:22-85 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:28:5-67 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:28:22-64 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:29:5-72 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:29:22-69 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:30:5-74 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:30:22-71 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:31:5-80 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:31:22-77 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:32:5-71 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:32:22-68 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:33:5-74 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:33:22-71 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:34:5-81 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:34:22-78 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:36:5-152:19 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:36:5-152:19 android:label - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:38:9-41 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:38:9-41 android:icon - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:37:9-42 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:37:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:39:9-52:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:39:9-52:20 android:label - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:42:13-45 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:42:13-45 android:launchMode - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:43:13-43 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:43:13-43 android:windowSoftInputMode - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:46:13-52 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:46:13-52 android:uiOptions - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:45:13-57 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:45:13-57 android:configChanges - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:41:13-74 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:41:13-74 android:theme - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:44:13-45 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:44:13-45 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:40:13-49 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\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:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:48:13-51:29 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:48:13-51:29 action#android.intent.action.MAIN -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:49:17-69 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:49:17-69 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:49:25-66 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:49:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:50:17-77 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:50:17-77 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:50:27-74 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:50:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:54:9-84:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:54:9-84:20 android:launchMode - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:57:13-43 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:57:13-43 android:configChanges - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:56:13-74 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:56:13-74 android:theme - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:58:13-45 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:58:13-45 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:55:13-48 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:55: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:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:60:13-67:29 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:60:13-67:29 android:scheme - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:60:28-49 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:60:28-49 action#android.intent.action.VIEW -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:61:17-62:54 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:61:17-62:54 tools:ignore - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:62:21-51 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:62:21-51 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:61:25-66 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:61:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:17-64:54 tools:ignore - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:64:21-51 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:64:21-51 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:63:27-73 data -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:65:17-78 android:mimeType - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:65:23-75 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\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:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:69:13-74:29 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:69:13-74:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:70:17-79 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:70:17-79 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:70:25-76 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\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:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:76:13-79:29 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:76:13-79:29 action#android.intent.action.SEARCH -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:77:17-71 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:77:17-71 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:77:25-68 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:77:25-68 meta-data#android.app.searchable -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:81:13-83:54 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:81:13-83:54 android:resource - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:83:17-51 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:83:17-51 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:82:17-54 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:82:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:86:9-89:43 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:86:9-89:43 android:authorities - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:88:13-47 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:88:13-47 android:multiprocess - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:89:13-40 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:89:13-40 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:87:13-63 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:87:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:91:9-103:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:91:9-103:20 android:label - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:93:13-50 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:93:13-50 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:92:13-57 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:92: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:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:94:13-98:29 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:94:13-98:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:95:17-84 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:95:17-84 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:95:25-81 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:95:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:96:17-85 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:96:17-85 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:96:25-82 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:96:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:97:17-85 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:97:17-85 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:97:25-82 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:97:25-82 meta-data#android.appwidget.provider -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:100:13-102:58 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:100:13-102:58 android:resource - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:102:17-55 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:102:17-55 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:101:17-58 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:101:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:104:9-117:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:104:9-117:20 android:label - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:106:13-50 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:106:13-50 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:105:13-57 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:105:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:119:9-123:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:119:9-123:20 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:119:19-55 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:119:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:120:13-122:29 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:120:13-122:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:121:17-79 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:121:17-79 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:121:25-76 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:121:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:125:9-128:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:125:9-128:20 android:process - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:127:13-38 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:127:13-38 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:126:13-61 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:126:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:130:9-135:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:130:9-135:20 android:label - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:132:13-45 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:132:13-45 android:launchMode - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:133:13-48 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:133:13-48 android:theme - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:134:13-75 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:134:13-75 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:131:13-50 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:131:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:137:9-142:20 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:137:9-142:20 android:label - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:139:13-54 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:139:13-54 android:launchMode - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:140:13-43 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:140:13-43 android:theme - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:141:13-60 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:141:13-60 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:138:13-71 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:138:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:144:9-147:19 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:144:9-147:19 android:exported - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:146:13-36 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:146:13-36 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:145:13-74 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:145:13-74 meta-data#android.app.default_searchable -ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:149:9-151:52 +ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:149:9-151:52 android:value - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:151:13-49 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:151:13-49 android:name - ADDED from D:\Campus\Xiaominotes\app\src\main\AndroidManifest.xml:150:13-58 + ADDED from D:\xiaomi Notes\GPL_Project\src\Xiaominotes\app\src\main\AndroidManifest.xml:150:13-58 diff --git a/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java index 79a4095..4480051 100644 --- a/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java +++ b/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java @@ -1,4 +1,3 @@ -/* * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -9,11 +8,16 @@ * * 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. + * WITHOUT WAR/* +RANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ - +//sqlNote代码注释 +/* sqlNote：用于支持软件最底层的数据库的相关操作，note是data的子父集。 + 用来实现数据库中管理便签的数据， + 方法包括提取便签内容、从数据库中获取便签数据、设置便签内容、向数据库提交便签。 + */ package net.micode.notes.gtask.data; import android.appwidget.AppWidgetManager; @@ -39,8 +43,12 @@ import java.util.ArrayList; public class SqlNote { + /* + * 功能描述：得到类的简写名称存入字符串TAG中 + * 实现过程：调用getSimpleName ()函数 + */ private static final String TAG = SqlNote.class.getSimpleName(); - + //定义一个标识便于后面数据的输入输出 private static final int INVALID_ID = -99999; public static final String[] PROJECTION_NOTE = new String[] { @@ -51,7 +59,7 @@ public class SqlNote { NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, NoteColumns.VERSION }; - +//设置17个列的编号 public static final int ID_COLUMN = 0; public static final int ALERTED_DATE_COLUMN = 1; @@ -85,12 +93,12 @@ public class SqlNote { public static final int GTASK_ID_COLUMN = 15; public static final int VERSION_COLUMN = 16; - +//定义了17个内部变量。12个可以从content中获得，5个需要初始化为0或new private Context mContext; - private ContentResolver mContentResolver; + private ContentResolver mContentResolver; //定义了一个私有全局变量 - private boolean mIsCreate; + private boolean mIsCreate; //后续选择生成 private long mId; @@ -122,16 +130,21 @@ public class SqlNote { private ArrayList mDataList; - public SqlNote(Context context) { + /* + * 功能描述：构造函数 + * 参数注解： mIsCreate用于标示构造方式 + */ + //构造函数只有context，对所有的变量进行初始化 + public SqlNote(Context context) { //构造函数进行初始化 mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mId = INVALID_ID; + mContentResolver = context.getContentResolver(); //获取对象或直接查询数据 + mIsCreate = true; //当前数据的创建 + mId = INVALID_ID; //初始值定义 mAlertDate = 0; mBgColorId = ResourceParser.getDefaultBgId(context); - mCreatedDate = System.currentTimeMillis(); + mCreatedDate = System.currentTimeMillis();//调用系统函数获取创建时间 mHasAttachment = 0; - mModifiedDate = System.currentTimeMillis(); + mModifiedDate = System.currentTimeMillis();//最后一次修改时间初始化为创建时间 mParentId = 0; mSnippet = ""; mType = Notes.TYPE_NOTE; @@ -139,21 +152,32 @@ public class SqlNote { mWidgetType = Notes.TYPE_WIDGET_INVALIDE; mOriginParent = 0; mVersion = 0; - mDiffNoteValues = new ContentValues(); + mDiffNoteValues = new ContentValues(); //创建内容 mDataList = new ArrayList(); } + /* + * 功能描述：构造函数 + * 参数注解： mIsCreate用于标示构造方式 + */ + //构造函数有context和一个数据库的cursor，多数变量通过cursor指向的一条记录直接进行初始化 + public SqlNote(Context context, Cursor c) { mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); + mContentResolver = context.getContentResolver(); //获取程序之间的数据共享 + mIsCreate = false; //记录当前数据创建方式 + loadFromCursor(c); //从光标处载入数据 mDataList = new ArrayList(); if (mType == Notes.TYPE_NOTE) loadDataContent(); mDiffNoteValues = new ContentValues(); } + /* + * 功能描述：构造函数 + * 参数注解： mIsCreate用于标示构造方式 + */ + public SqlNote(Context context, long id) { mContext = context; mContentResolver = context.getContentResolver(); @@ -166,16 +190,21 @@ public class SqlNote { } + /* + *功能描述：通过id从光标处加载数据 + */ private void loadFromCursor(long id) { Cursor c = null; try { c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", new String[] { String.valueOf(id) - }, null); + }, null);//通过id获取对应的ContentResolver中的cursor if (c != null) { c.moveToNext(); loadFromCursor(c); + //加载数据进行初始化 + //使函数SqlNote(Context context, long id)与SqlNote(Context context, long id)的实现方式基本相同 } else { Log.w(TAG, "loadFromCursor: cursor = null"); } @@ -185,7 +214,9 @@ public class SqlNote { } } + //功能描述：通过游标从光标处加载数据 private void loadFromCursor(Cursor c) { + //直接从一条记录中的获得以下变量的初始值 mId = c.getLong(ID_COLUMN); mAlertDate = c.getLong(ALERTED_DATE_COLUMN); mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); @@ -200,6 +231,7 @@ public class SqlNote { mVersion = c.getLong(VERSION_COLUMN); } + //功能描述：通过content机制获取共享数据并加载到数据库当前游标处 private void loadDataContent() { Cursor c = null; mDataList.clear(); @@ -226,67 +258,69 @@ public class SqlNote { } } + //功能描述：通过设置content机制用于共享的数据信息 public boolean setContent(JSONObject js) { try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); //创建一个JSONObject对象 if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { Log.w(TAG, "cannot set system folder"); } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { // for folder we can only update the snnipet and type + //对于文件夹，只能更新snnipet并键入 String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; + .getString(NoteColumns.SNIPPET) : ""; //如果共享数据存在摘要，需要将其赋给声明的snippct变量，否则变量为空 if (mIsCreate || !mSnippet.equals(snippet)) { mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } + } //如果SQLNote采用的是第一种构造方式，或snippet为空，则将snippet键值存入contenttvalue中 mSnippet = snippet; int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE; if (mIsCreate || mType != type) { mDiffNoteValues.put(NoteColumns.TYPE, type); - } + } //判断类型是否匹配 mType = type; } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; if (mIsCreate || mId != id) { mDiffNoteValues.put(NoteColumns.ID, id); - } + } //判断id是否匹配 mId = id; long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note .getLong(NoteColumns.ALERTED_DATE) : 0; if (mIsCreate || mAlertDate != alertDate) { mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); - } + } //如果仅通过上下文对Note进行数据库修改，或该标记日与原标记日不同 mAlertDate = alertDate; int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); if (mIsCreate || mBgColorId != bgColorId) { mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); - } + } //判断背景颜色是否一致 mBgColorId = bgColorId; long createDate = note.has(NoteColumns.CREATED_DATE) ? note .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); if (mIsCreate || mCreatedDate != createDate) { mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); - } + } //判断日期是否一致 mCreatedDate = createDate; int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note - .getInt(NoteColumns.HAS_ATTACHMENT) : 0; + .getInt(NoteColumns.HAS_ATTACHMENT) : 0; //修改附件 if (mIsCreate || mHasAttachment != hasAttachment) { mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); - } + } //判断附件是否一致 mHasAttachment = hasAttachment; long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note - .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); + .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); //修改日期 if (mIsCreate || mModifiedDate != modifiedDate) { mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); - } + } //判断修改的日期是否一致 mModifiedDate = modifiedDate; long parentId = note.has(NoteColumns.PARENT_ID) ? note @@ -297,24 +331,24 @@ public class SqlNote { mParentId = parentId; String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; + .getString(NoteColumns.SNIPPET) : ""; //定义小部件 if (mIsCreate || !mSnippet.equals(snippet)) { mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } + } //判断小部件是否一致 mSnippet = snippet; int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE; if (mIsCreate || mType != type) { mDiffNoteValues.put(NoteColumns.TYPE, type); - } + } //判断类型是否一致 mType = type; int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) : AppWidgetManager.INVALID_APPWIDGET_ID; if (mIsCreate || mWidgetId != widgetId) { mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); - } + } //判断控件id是否一致 mWidgetId = widgetId; int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note @@ -359,30 +393,33 @@ public class SqlNote { return true; } - public JSONObject getContent() { + //功能描述：获取content机制提供的数据并加载到note中 + + public JSONObject getContent() { //获取content机制提供的数据并加载到note中 try { JSONObject js = new JSONObject(); if (mIsCreate) { Log.e(TAG, "it seems that we haven't created this in database yet"); return null; - } + } //采用的是第一种构造方式，自然实施初始化而已，显示错误：没创建数据库 JSONObject note = new JSONObject(); - if (mType == Notes.TYPE_NOTE) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.ALERTED_DATE, mAlertDate); - note.put(NoteColumns.BG_COLOR_ID, mBgColorId); - note.put(NoteColumns.CREATED_DATE, mCreatedDate); + if (mType == Notes.TYPE_NOTE) { //类型为note时//判断类型是否note类型 + note.put(NoteColumns.ID, mId); //设置以下12个内部变量 + note.put(NoteColumns.ALERTED_DATE, mAlertDate);//提醒时间 + note.put(NoteColumns.BG_COLOR_ID, mBgColorId);//背景颜色 + note.put(NoteColumns.CREATED_DATE, mCreatedDate);//创建日期 note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); - note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); + note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);//修改日期 note.put(NoteColumns.PARENT_ID, mParentId); - note.put(NoteColumns.SNIPPET, mSnippet); - note.put(NoteColumns.TYPE, mType); + note.put(NoteColumns.SNIPPET, mSnippet);//摘要 + note.put(NoteColumns.TYPE, mType);//类型 note.put(NoteColumns.WIDGET_ID, mWidgetId); - note.put(NoteColumns.WIDGET_TYPE, mWidgetType); - note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); + note.put(NoteColumns.WIDGET_TYPE, mWidgetType);//小部件类型 + note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);//最初的父类 + js.put(GTaskStringUtils.META_HEAD_NOTE, note);;//将这个便签存入元数据中 + JSONArray dataArray = new JSONArray(); for (SqlData sqlData : mDataList) { @@ -392,12 +429,13 @@ public class SqlNote { } } js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { + } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { //类型为文件夹或者系统时 note.put(NoteColumns.ID, mId); note.put(NoteColumns.TYPE, mType); note.put(NoteColumns.SNIPPET, mSnippet); js.put(GTaskStringUtils.META_HEAD_NOTE, note); } + //对于文件夹类型或者系统文件夹类型，将id，类型，以及摘要，存入jsonobject,然后对应META_HEAD_NOTE键，存入共享，其实也只有那么多可以传输 return js; } catch (JSONException e) { @@ -407,70 +445,88 @@ public class SqlNote { return null; } + //功能描述：给当前id设置父id + public void setParentId(long id) { mParentId = id; mDiffNoteValues.put(NoteColumns.PARENT_ID, id); } + //功能描述：给当前id设置Gtaskid + public void setGtaskId(String gid) { mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); } + //功能描述：给当前id设置同步id + public void setSyncId(long syncId) { mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); } + //功能描述：将本地修改初始化，即撤销当前所有修改 + public void resetLocalModified() { mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); } + //功能描述：获得当前id + public long getId() { return mId; } + //功能描述：获得当前id的父id public long getParentId() { return mParentId; } + //功能描述：获取小片段，即用于显示的部分便签内容 public String getSnippet() { return mSnippet; } + //功能描述：判断是否为便签类型 public boolean isNoteType() { return mType == Notes.TYPE_NOTE; } + //功能描述：commit函数，作用于把当前所做的修改传送并保存在数据库中 public void commit(boolean validateVersion) { if (mIsCreate) { if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { mDiffNoteValues.remove(NoteColumns.ID); + //如果是一个无效的id并且还含有这个id，就将它移除 } Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); + //插入便签的uri try { mId = Long.valueOf(uri.getPathSegments().get(1)); + //强制转换path为id ，Long型 } catch (NumberFormatException e) { Log.e(TAG, "Get note id error :" + e.toString()); throw new ActionFailureException("create note failed"); - } + } //捕获异常，转换出错，显示错误“获取note的id出现错误” if (mId == 0) { throw new IllegalStateException("Create thread id failed"); - } + } //创建线程 id 失败 - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { + if (mType == Notes.TYPE_NOTE) { //对于note类型，引用sqlData.commit + for (SqlData sqlData : mDataList) { //直接使用sqldata中实现 sqlData.commit(mId, false, -1); } } } else { if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { - Log.e(TAG, "No such note"); + Log.e(TAG, "No such note"); //判断是否含有这个便签 throw new IllegalStateException("Try to update note with invalid id"); + //如果没有就是无效id } if (mDiffNoteValues.size() > 0) { mVersion ++; int result = 0; - if (!validateVersion) { + if (!validateVersion) { //构造字符串 result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + NoteColumns.ID + "=?)", new String[] { String.valueOf(mId) @@ -484,22 +540,23 @@ public class SqlNote { } if (result == 0) { Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } + } //如果没有更新，可能是用户在同步的时候更新了 } if (mType == Notes.TYPE_NOTE) { for (SqlData sqlData : mDataList) { sqlData.commit(mId, validateVersion, mVersion); } - } + } //对note类型，还是对其中的data引用commit，从而实现目的 } // refresh local info + //刷新本地信息 loadFromCursor(mId); if (mType == Notes.TYPE_NOTE) - loadDataContent(); + loadDataContent(); //如果是便签类型，获取共享数据并加载到数据库 - mDiffNoteValues.clear(); - mIsCreate = false; + mDiffNoteValues.clear(); //清空共享数据 + mIsCreate = false; //重置 } } diff --git a/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/Task.java index 6a19454..fd99fe7 100644 --- a/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ b/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + //Task代码注释 + //主要作用：同步任务，将创建、更新和同步动作包装成JSON对象，同时使用本地和远程的JSON对结点内容进行设置，从而获取同步信息，实现本地和远程的信息同步 package net.micode.notes.gtask.data; import android.database.Cursor; @@ -32,59 +33,60 @@ import org.json.JSONException; import org.json.JSONObject; -public class Task extends Node { +public class Task extends Node { //定义一个Task类,继承Node类 private static final String TAG = Task.class.getSimpleName(); + //调用函数得到类简写名称并存入字符串TAG内 + private boolean mCompleted; //判断当前任务是否完成 - private boolean mCompleted; - - private String mNotes; + private String mNotes; //在实例中存储数据的类型，表示任务的注释信息 - private JSONObject mMetaInfo; + private JSONObject mMetaInfo; //将在实例中存储数据的类型 - private Task mPriorSibling; + private Task mPriorSibling; //对应的优先兄弟Task的指针 - private TaskList mParent; + private TaskList mParent; //所在的任务列表的指针 public Task() { super(); mCompleted = false; mNotes = null; - mPriorSibling = null; - mParent = null; + mPriorSibling = null; //TaskList中当前Task前面的Task的指针 + mParent = null; //当前Task所在的TaskList mMetaInfo = null; } public JSONObject getCreateAction(int actionId) { + //getCreateAction方法接收一个整型参数actionId，将该参数作为返回JSONObject对象的action_id属性值。 JSONObject js = new JSONObject(); try { // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, //存入当前task指针 GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); - + //发送对actiontype的请求 // action_id js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - // index - js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this)); + // index 父任务列表中的索引 + js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this)); //设置索引 // entity_delta JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); - entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); //获取任务名 + entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); //对任务创建id进行判空操作 + entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, //实体类数据 GTaskStringUtils.GTASK_JSON_TYPE_TASK); if (getNotes() != null) { entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); - } - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + } //若存在文本输入放入实体内 + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); //讲实体存入js // parent_id - js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid()); + js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid()); //父类id类型 // dest_parent_type js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_GROUP); + GTaskStringUtils.GTASK_JSON_TYPE_GROUP); //所在列表的id存入父id // list_id js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid()); @@ -93,23 +95,26 @@ public class Task extends Node { if (mPriorSibling != null) { js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid()); } - + //如果该任务在兄弟任务中不是第一个，则设置prior_sibling_id属性值为前一个兄弟任务的gid + //将其优先存入ID序列中 } catch (JSONException e) { - Log.e(TAG, e.toString()); + Log.e(TAG, e.toString()); //e.toString()获取异常类型和异常详细消息 e.printStackTrace(); throw new ActionFailureException("fail to generate task-create jsonobject"); - } + } //抛出异常处理机制 return js; } - public JSONObject getUpdateAction(int actionId) { + public JSONObject getUpdateAction(int actionId) { //更新action + //getUpdateAction方法接收一个整型参数actionId，将该参数作为返回JSONObject对象的action_id属性值 JSONObject js = new JSONObject(); try { // action_type js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); + //action_type属性值为update，表示更新操作 // action_id js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); @@ -122,26 +127,31 @@ public class Task extends Node { entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); if (getNotes() != null) { entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); - } + }//如果存在 notes ，则将其也放入 entity 中 entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + //deleted属性表示任务是否被删除，如果该值为true，则该任务会被移除 - } catch (JSONException e) { + } catch (JSONException e) { //获取异常 Log.e(TAG, e.toString()); - e.printStackTrace(); + e.printStackTrace(); //命令行打印异常信息在程序中出错的位置及原因 throw new ActionFailureException("fail to generate task-update jsonobject"); - } + } //生成任务更新的数据传输失败 return js; } - public void setContentByRemoteJSON(JSONObject js) { + public void setContentByRemoteJSON(JSONObject js) //通过云端传输数据设置内容 + //定义了一个setContentByRemoteJSON方法，该方法从远程JSON对象中获取任务的属性值，并将这些属性值设置到本地任务对象中 + //表示从远程服务器获取的任务信息 + + { if (js != null) { try { // id - if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); - } + if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { //如果js指针指向的目标存在 + setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); //利用类自身的set函数，并且使用了JSONObject的get类型函数 + } //判断记录是否被删除 // last_modified if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { @@ -166,34 +176,35 @@ public class Task extends Node { // completed if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); + } //记录已经完成的 + } catch (JSONException e) { //抛出异常 + Log.e(TAG, e.toString()); //获取异常类型和异常信息 + e.printStackTrace(); //打印 throw new ActionFailureException("fail to get task content from jsonobject"); } } } - public void setContentByLocalJSON(JSONObject js) { + public void setContentByLocalJSON(JSONObject js) { //通过本地的jsonobject获取内容 if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) - || !js.has(GTaskStringUtils.META_HEAD_DATA)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); + || !js.has(GTaskStringUtils.META_HEAD_DATA)) { //如果js不存在或者js没有元数据的开头或者js指针没有元数据 + Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); //反馈给用户出错信息 } try { JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { - Log.e(TAG, "invalid type"); + if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { //note类型不匹配 + Log.e(TAG, "invalid type"); //无效 return; } for (int i = 0; i < dataArray.length(); i++) { + //遍历 dataArray 查找与数据库中DataConstants.NOTE 记录信息一致的 data JSONObject data = dataArray.getJSONObject(i); if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - setName(data.getString(DataColumns.CONTENT)); + setName(data.getString(DataColumns.CONTENT)); //判断两个字符串是否相等 break; } } @@ -204,8 +215,8 @@ public class Task extends Node { } } - public JSONObject getLocalJSONFromContent() { - String name = getName(); + public JSONObject getLocalJSONFromContent() { //从content获取本地json + String name = getName(); //获取名称 try { if (mMetaInfo == null) { // new task created from web @@ -213,21 +224,22 @@ public class Task extends Node { Log.w(TAG, "the note seems to be an empty one"); return null; } + //若命名为空则创建一个新的 JSONObject js = new JSONObject(); JSONObject note = new JSONObject(); JSONArray dataArray = new JSONArray(); - JSONObject data = new JSONObject(); + JSONObject data = new JSONObject(); //对四个指针进行初始化 data.put(DataColumns.CONTENT, name); dataArray.put(data); - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); + js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); //元数据类型信息非空，则进行同步更新操作 note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); + js.put(GTaskStringUtils.META_HEAD_NOTE, note); //实现数据同步 return js; - } else { + } else { //否则将元数据同步至数据中 // synced task - JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); //同步任务 + JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); //同步数据 for (int i = 0; i < dataArray.length(); i++) { JSONObject data = dataArray.getJSONObject(i); @@ -235,7 +247,7 @@ public class Task extends Node { data.put(DataColumns.CONTENT, getName()); break; } - } + }//通过循环查找与数据库中DataConstants.NOTE 记录信息一致的 data note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); return mMetaInfo; @@ -247,7 +259,7 @@ public class Task extends Node { } } - public void setMetaInfo(MetaData metaData) { + public void setMetaInfo(MetaData metaData) { //设置元数据信息 if (metaData != null && metaData.getNotes() != null) { try { mMetaInfo = new JSONObject(metaData.getNotes()); @@ -255,30 +267,30 @@ public class Task extends Node { Log.w(TAG, e.toString()); mMetaInfo = null; } - } + } //如果元数据非空且其 notes 非空，则修改元数据类型信息 } - public int getSyncAction(Cursor c) { + public int getSyncAction(Cursor c) { //实现同步操作 try { - JSONObject noteInfo = null; + JSONObject noteInfo = null; //新建一个 JSONObject 的对象实体 if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) { noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - } + } //元数据信息不为空并且元数据信息还含有“META_HEAD_NOTE”，说明便签存在 if (noteInfo == null) { Log.w(TAG, "it seems that note meta has been deleted"); return SYNC_ACTION_UPDATE_REMOTE; - } + } //云端便签 id 已被删除，不存在，返回更新本地数据的同步行为 if (!noteInfo.has(NoteColumns.ID)) { Log.w(TAG, "remote note id seems to be deleted"); return SYNC_ACTION_UPDATE_LOCAL; - } + } //匹配note的id // validate the note id now if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) { Log.w(TAG, "note id doesn't match"); - return SYNC_ACTION_UPDATE_LOCAL; + return SYNC_ACTION_UPDATE_LOCAL; //判断修改后的ID匹配是否成功，成功则返回无同步操作，未成功则应用云端到本地，返回本地同步更新操作 } if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { @@ -293,10 +305,12 @@ public class Task extends Node { } else { // validate gtask id if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { - Log.e(TAG, "gtask id doesn't match"); + //判断gtask的id与获取的id是否匹配 + Log.e(TAG, "gtask id doesn't match"); //错误，未找到 gtask 的 id return SYNC_ACTION_ERROR; } if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + ////错误，未找到 gtask 的 id // local modification only return SYNC_ACTION_UPDATE_REMOTE; } else { @@ -311,41 +325,41 @@ public class Task extends Node { return SYNC_ACTION_ERROR; } - public boolean isWorthSaving() { + public boolean isWorthSaving() { //判断是否修改并同步操作 return mMetaInfo != null || (getName() != null && getName().trim().length() > 0) || (getNotes() != null && getNotes().trim().length() > 0); } public void setCompleted(boolean completed) { this.mCompleted = completed; - } + } //设定是否完成的成员变量 public void setNotes(String notes) { this.mNotes = notes; - } + } //设定note成员变量 public void setPriorSibling(Task priorSibling) { this.mPriorSibling = priorSibling; - } + } //设置优先兄弟 task 的优先级 public void setParent(TaskList parent) { this.mParent = parent; - } + } //设置父类节点 public boolean getCompleted() { return this.mCompleted; - } + } //判断是否完成 public String getNotes() { return this.mNotes; - } + } //获取成员变量 mNotes 的信息 public Task getPriorSibling() { return this.mPriorSibling; - } + } //获取优先兄弟列表 public TaskList getParent() { return this.mParent; - } + } //获取父类节点列表 } diff --git a/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/TaskList.java index 4ea21c5..7abba2c 100644 --- a/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ b/src/Xiaominotes/app/src/main/java/net/micode/notes/gtask/data/TaskList.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + //TaskList代码标注 + //主要作用：同步任务列表，将Task组织成同步任务列表进行管理 package net.micode.notes.gtask.data; import android.database.Cursor; @@ -30,27 +31,33 @@ import org.json.JSONObject; import java.util.ArrayList; -public class TaskList extends Node { - private static final String TAG = TaskList.class.getSimpleName(); +public class TaskList extends Node {//创建继承 Node的任务表类 + private static final String TAG = TaskList.class.getSimpleName(); //tag标记 + //调用getSimplename（）函数获取名字并赋值给TAG作为标记 + private int mIndex; //当前TaskList的指针 - private int mIndex; + private ArrayList mChildren; //类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList - private ArrayList mChildren; - public TaskList() { - super(); - mChildren = new ArrayList(); + public TaskList() { //构造函数进行初始化 + super(); //调用父类构造方法 + mChildren = new ArrayList(); //声明数组 mIndex = 1; } + /* (non-Javadoc) + * @see net.micode.notes.gtask.data.Node#getCreateAction(int) + * 生成并返回一个包含了一定数据的JSONObject实体 + */ + public JSONObject getCreateAction(int actionId) { - JSONObject js = new JSONObject(); + JSONObject js = new JSONObject(); //直接构建即直接实例化一个JSONObject对象 try { // action_type js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); - + //操作的是列表，而不只是单个task了 // action_id js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); @@ -58,11 +65,15 @@ public class TaskList extends Node { js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex); // entity_delta - JSONObject entity = new JSONObject(); + // 新建一个 JSONObject 对象，名为实体，将 name，creator id，entity type 三个信息存在一起 + JSONObject entity = new JSONObject(); //创建一个实体类并进行初始化 entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); + //getName是父类的一个函数 entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); + //初始化id entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, GTaskStringUtils.GTASK_JSON_TYPE_GROUP); + //将实体类型设置为“GROUP” js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); } catch (JSONException e) { @@ -74,8 +85,13 @@ public class TaskList extends Node { return js; } - public JSONObject getUpdateAction(int actionId) { - JSONObject js = new JSONObject(); + /* (non-Javadoc) + * @see net.micode.notes.gtask.data.Node#getUpdateAction(int) + * 生成并返回一个包含了一定数据的JSONObject实体 + */ + + public JSONObject getUpdateAction(int actionId) { //接受更新action，返回jsonobject + JSONObject js = new JSONObject(); //创建一个对象并进行初始化 try { // action_type @@ -104,22 +120,25 @@ public class TaskList extends Node { } public void setContentByRemoteJSON(JSONObject js) { + //通过云端 JSON 数据设置实例化对象 js 的内容 if (js != null) { try { // id if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); } + //判断js对象是否为空，如果为空即没有内容就不需要进行设置了 // last_modified if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); } + //调用JSONObject中的getLong函数，得到last_modified的号，并作为参数传给setLastModified函数（父类函数）进行设置 // name if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); - } + } //对任务的name进行设置 } catch (JSONException e) { Log.e(TAG, e.toString()); @@ -129,27 +148,37 @@ public class TaskList extends Node { } } - public void setContentByLocalJSON(JSONObject js) { + public void setContentByLocalJSON(JSONObject js) { //通过本地 JSON 数据设置对象 js 内容 if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { + //若 js 创建失败或 js 中不存在 META_HEAD_NOTE信息 Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); - } + } //警告，没有可用资源 try { JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + //NullPointerException这个异常出现在处理对象时对象不存在但又没有捕捉到进行处理的时候 if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + //对文件夹，设置文件名 String name = folder.getString(NoteColumns.SNIPPET); + //获取文件夹片段字符串作为文件夹名称 setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); + //设置名称为MIUI系统文件夹前缀+文件夹名称 } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { + //判断是不是系统文件 if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); + //如果是根文件夹，设置名称：MIUI系统文件夹前缀+默认文件夹名称 else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE); + //如果是通话文件夹，设置名称：MIUI系统文件夹前缀+通话便签文件夹名称 else Log.e(TAG, "invalid system folder"); + ;//无效系统文件夹警告 } else { Log.e(TAG, "error type"); + //错误的文件夹类型 } } catch (JSONException e) { Log.e(TAG, e.toString()); @@ -157,19 +186,21 @@ public class TaskList extends Node { } } - public JSONObject getLocalJSONFromContent() { + public JSONObject getLocalJSONFromContent() { //从content获取本地json try { - JSONObject js = new JSONObject(); - JSONObject folder = new JSONObject(); + JSONObject js = new JSONObject(); //创建对象并初始化 + JSONObject folder = new JSONObject(); //创建文件夹对象并初始化 String folderName = getName(); if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)) folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(), folderName.length()); folder.put(NoteColumns.SNIPPET, folderName); + //如果获取的文件夹名称是以[MIUI_Notes]开头，则文件夹名称应删掉前缀 if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT) || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE)) folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + //这里与上一个函数setContentByRemoteJSON(JSONObject js)是一个逆过程，可以参看上一个函数是如何构造出foldername的 else folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); @@ -183,26 +214,28 @@ public class TaskList extends Node { } } - public int getSyncAction(Cursor c) { + public int getSyncAction(Cursor c) { //获取同步信息 try { - if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { + if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { //若本地修改未记录 // there is no local update if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + //记录最后一次修改 // no update both side return SYNC_ACTION_NONE; } else { // apply remote to local return SYNC_ACTION_UPDATE_LOCAL; - } + } //匹配失败，返回更新本地数据的同步行为 } else { // validate gtask id if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { Log.e(TAG, "gtask id doesn't match"); return SYNC_ACTION_ERROR; - } + } //如果获取的ID不匹配，返回同步动作失败 if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { // local modification only return SYNC_ACTION_UPDATE_REMOTE; + //如果是最近一次修改的 id，则返回云端更新的同步动作 } else { // for folder conflicts, just apply local modification return SYNC_ACTION_UPDATE_REMOTE; @@ -216,43 +249,63 @@ public class TaskList extends Node { return SYNC_ACTION_ERROR; } + + // @return + //功能：获得TaskList的大小，即mChildren的大小 + public int getChildTaskCount() { + return mChildren.size(); } + //获得TaskList的大小，即mChildren的大小，mChildren 是TaskList 的一个实例 + //@param task + //@return 返回值为是否成功添加任务。 + //功能：在当前任务表末尾添加新的任务。 + public boolean addChildTask(Task task) { boolean ret = false; - if (task != null && !mChildren.contains(task)) { + if (task != null && !mChildren.contains(task)) { //任务非空且任务表中不存在该任务 ret = mChildren.add(task); if (ret) { // need to set prior sibling and parent task.setPriorSibling(mChildren.isEmpty() ? null : mChildren .get(mChildren.size() - 1)); task.setParent(this); + //ArrayList的每一次修改变化都要紧跟相关Task中PriorSibling的修改 } } return ret; } + /** + * @param task + * @param index + * @return + * 功能：在当前任务表的指定位置添加新的任务。 + */ + public boolean addChildTask(Task task, int index) { if (index < 0 || index > mChildren.size()) { Log.e(TAG, "add child task: invalid index"); return false; } + //在当前任务表的指定位置添加新的任务，index是指针 int pos = mChildren.indexOf(task); if (task != null && pos == -1) { mChildren.add(index, task); + //获取要添加的任务在列表中的位置，如果不在列表中则返回-1 // update the task list - Task preTask = null; + Task preTask = null; //更新任务表 Task afterTask = null; if (index != 0) preTask = mChildren.get(index - 1); if (index != mChildren.size() - 1) afterTask = mChildren.get(index + 1); - task.setPriorSibling(preTask); + task.setPriorSibling(preTask); //使得前后三个任务连在一起 if (afterTask != null) afterTask.setPriorSibling(task); } @@ -260,27 +313,40 @@ public class TaskList extends Node { return true; } - public boolean removeChildTask(Task task) { + /** + * @param task + * @return 返回删除是否成功 + * 功能：删除TaskList中的一个Task + */ + + public boolean removeChildTask(Task task) { //删除任务表中的子任务 boolean ret = false; - int index = mChildren.indexOf(task); - if (index != -1) { - ret = mChildren.remove(task); + int index = mChildren.indexOf(task); //获取该任务在任务表中的索引 + if (index != -1) { //索引有效，任务在表中存在 + ret = mChildren.remove(task); //移除任务 if (ret) { // reset prior sibling and parent task.setPriorSibling(null); - task.setParent(null); + task.setParent(null); //删除成功，task的上一个任务指针和父指针置空 // update the task list if (index != mChildren.size()) { mChildren.get(index).setPriorSibling( index == 0 ? null : mChildren.get(index - 1)); - } + } //删除成功后，要对任务列表进行更新 } } return ret; } + /** + * @param task + * @param index + * @return + * 功能：将当前TaskList中含有的某个Task移到index位置 + */ + public boolean moveChildTask(Task task, int index) { if (index < 0 || index >= mChildren.size()) { @@ -298,6 +364,13 @@ public class TaskList extends Node { return true; return (removeChildTask(task) && addChildTask(task, index)); } + //利用已经实现好的功能完成当下功能 + + /** + * @param gid + * @return返回寻找结果 + * 功能：按gid寻找Task + */ public Task findChildTaskByGid(String gid) { for (int i = 0; i < mChildren.size(); i++) { @@ -309,20 +382,35 @@ public class TaskList extends Node { return null; } + /** + * @param task + * @return + * 功能：返回指定Task的index + */ public int getChildTaskIndex(Task task) { return mChildren.indexOf(task); } + /** + * @param index + * @return + * 功能：返回指定index的Task + */ public Task getChildTaskByIndex(int index) { if (index < 0 || index >= mChildren.size()) { - Log.e(TAG, "getTaskByIndex: invalid index"); + Log.e(TAG, "getTaskByIndex: invalid index"); //如果指针不在范围内，无效索引 return null; } return mChildren.get(index); } + /** + * @param gid + * @return + * 功能：返回指定gid的Task + */ public Task getChilTaskByGid(String gid) { - for (Task task : mChildren) { + for (Task task : mChildren) { //ArrayList的遍历方法 //通过索引获取子任务 if (task.getGid().equals(gid)) return task; } @@ -331,13 +419,13 @@ public class TaskList extends Node { public ArrayList getChildTaskList() { return this.mChildren; - } + } //获取子任务列表 public void setIndex(int index) { this.mIndex = index; - } + } //设置任务索引 public int getIndex() { return this.mIndex; - } + } //获取任务索引 } diff --git a/src/Xiaominotes/local.properties b/src/Xiaominotes/local.properties index a207a91..49b1aba 100644 --- a/src/Xiaominotes/local.properties +++ b/src/Xiaominotes/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Fri Mar 31 16:31:15 CST 2023 -sdk.dir=E\:\\Android_SDK +# For customization when using a Version Control System, please read the +# header note. +#Thu Apr 06 11:54:08 CST 2023 +sdk.dir=C\:\\Users\\j'j'y\\AppData\\Local\\Android\\Sdk