diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java deleted file mode 100644 index 2e9ac87..0000000 --- a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.ui; - -import android.content.Context; -import android.database.Cursor; -import android.util.Log; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CursorAdapter; - -import net.micode.notes.data.Notes; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; - - -public class NotesListAdapter extends CursorAdapter { - private static final String TAG = "NotesListAdapter"; - private Context mContext; - private HashMap mSelectedIndex; - private int mNotesCount; - private boolean mChoiceMode; - - public static class AppWidgetAttribute { - public int widgetId; - public int widgetType; - }; - - public NotesListAdapter(Context context) { - super(context, null); - mSelectedIndex = new HashMap(); - mContext = context; - mNotesCount = 0; - } - - @Override - public View newView(Context context, Cursor cursor, ViewGroup parent) { - return new NotesListItem(context); - } - - @Override - public void bindView(View view, Context context, Cursor cursor) { - if (view instanceof NotesListItem) { - NoteItemData itemData = new NoteItemData(context, cursor); - ((NotesListItem) view).bind(context, itemData, mChoiceMode, - isSelectedItem(cursor.getPosition())); - } - } - - public void setCheckedItem(final int position, final boolean checked) { - mSelectedIndex.put(position, checked); - notifyDataSetChanged(); - } - - public boolean isInChoiceMode() { - return mChoiceMode; - } - - public void setChoiceMode(boolean mode) { - mSelectedIndex.clear(); - mChoiceMode = mode; - } - - public void selectAll(boolean checked) { - Cursor cursor = getCursor(); - for (int i = 0; i < getCount(); i++) { - if (cursor.moveToPosition(i)) { - if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) { - setCheckedItem(i, checked); - } - } - } - } - - public HashSet getSelectedItemIds() { - HashSet itemSet = new HashSet(); - for (Integer position : mSelectedIndex.keySet()) { - if (mSelectedIndex.get(position) == true) { - Long id = getItemId(position); - if (id == Notes.ID_ROOT_FOLDER) { - Log.d(TAG, "Wrong item id, should not happen"); - } else { - itemSet.add(id); - } - } - } - - return itemSet; - } - - public HashSet getSelectedWidget() { - HashSet itemSet = new HashSet(); - for (Integer position : mSelectedIndex.keySet()) { - if (mSelectedIndex.get(position) == true) { - Cursor c = (Cursor) getItem(position); - if (c != null) { - AppWidgetAttribute widget = new AppWidgetAttribute(); - NoteItemData item = new NoteItemData(mContext, c); - widget.widgetId = item.getWidgetId(); - widget.widgetType = item.getWidgetType(); - itemSet.add(widget); - /** - * Don't close cursor here, only the adapter could close it - */ - } else { - Log.e(TAG, "Invalid cursor"); - return null; - } - } - } - return itemSet; - } - - public int getSelectedCount() { - Collection values = mSelectedIndex.values(); - if (null == values) { - return 0; - } - Iterator iter = values.iterator(); - int count = 0; - while (iter.hasNext()) { - if (true == iter.next()) { - count++; - } - } - return count; - } - - public boolean isAllSelected() { - int checkedCount = getSelectedCount(); - return (checkedCount != 0 && checkedCount == mNotesCount); - } - - public boolean isSelectedItem(final int position) { - if (null == mSelectedIndex.get(position)) { - return false; - } - return mSelectedIndex.get(position); - } - - @Override - protected void onContentChanged() { - super.onContentChanged(); - calcNotesCount(); - } - - @Override - public void changeCursor(Cursor cursor) { - super.changeCursor(cursor); - calcNotesCount(); - } - - private void calcNotesCount() { - mNotesCount = 0; - for (int i = 0; i < getCount(); i++) { - Cursor c = (Cursor) getItem(i); - if (c != null) { - if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { - mNotesCount++; - } - } else { - Log.e(TAG, "Invalid cursor"); - return; - } - } - } - - public int retCount() { - int NotesCount = mNotesCount; - int ItemCount = getCount(); - for (int i = 0; i < ItemCount; i++) { - Cursor c = (Cursor) getItem(i); - if (c != null) { - if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { - NoteItemData NoteItem = new NoteItemData(mContext, c); - NotesCount += NoteItem.getNotesCount(); - } - } else { - Log.e(TAG, "Invalid cursor"); - return -1; - } - } - return NotesCount; - } -} - diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin index dd8c75e..2e4fcb4 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.bin and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock index bca4b22..79e1261 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.lock and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin index eca541f..b23af9a 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.bin and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock index a64102f..d89abe5 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin index ef1b5df..dbd7fd6 100644 Binary files a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 690c23b..acf2f7e 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index 5e83dcd..d0a3a1a 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 0000000..fba00ca --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/src.app.androidTest.iml b/src/.idea/modules/app/src.app.androidTest.iml new file mode 100644 index 0000000..70d4b1e --- /dev/null +++ b/src/.idea/modules/app/src.app.androidTest.iml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/src.app.iml b/src/.idea/modules/app/src.app.iml new file mode 100644 index 0000000..8f8bb49 --- /dev/null +++ b/src/.idea/modules/app/src.app.iml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/src.app.main.iml b/src/.idea/modules/app/src.app.main.iml new file mode 100644 index 0000000..213d746 --- /dev/null +++ b/src/.idea/modules/app/src.app.main.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/modules/app/src.app.unitTest.iml b/src/.idea/modules/app/src.app.unitTest.iml new file mode 100644 index 0000000..b653258 --- /dev/null +++ b/src/.idea/modules/app/src.app.unitTest.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/src.iml b/src/.idea/src.iml new file mode 100644 index 0000000..d1374d1 --- /dev/null +++ b/src/.idea/src.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index 5aed210..dc30049 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 31ebbbc..9e3b177 100644 Binary files a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index bdecd4b..21a6bf8 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 79aa7d7..191dbaf 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index bdf5d45..e96b44f 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Jun 07 23:08:53 CST 2023 +#Thu Jun 08 17:19:54 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index ef33351..80f1e25 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,7 +7,7 @@ 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 namecountallNotes" Searching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" @@ -48,9 +48,9 @@ 邮件 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - 字数 + 字数统计便签数量 短信 郵件 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - 字數 \ No newline at end of file + 字數统计便签数量 \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5546908..02b23ee 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Jun 07 23:09:00 CST 2023 +#Thu Jun 08 17:19:55 CST 2023 base.0=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 865389e..b094f70 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 7f5c020..5fbcb46 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index a1f6118..6982202 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 3d21f92..f7671fc 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 63c9d80..bf2b9df 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 155e778..b950ba8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 383f2f5..4ed72ab 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 78e3a3f..f46438f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 3f0427e..f6d05f2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 0899dc3..31003b6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index ee960d8..97383d1 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 74e924b..f33c7e8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index a563b60..166eb75 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 60ae598..e540d87 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index 5e432e9..62a2e62 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 1f37848..8273101 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 5df3561..a285a55 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 18645bf..36d9cb3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index a84795d..b7fe430 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 32f2d0e..d2cdbcd 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 7b31dce..17bad24 100644 Binary files a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 4beb064..c1e3310 100644 Binary files a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 531aa3b..a1f77cd 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,36 +1,128 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", "map": [ { - "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\dimens.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,124,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,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,6833,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,124,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,42,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,6871,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" + "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": "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,107", - "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", - "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,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", - "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,107", - "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,42,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,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" } }, { - "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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,2920,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "127,131,135,139,142,146,150,154,158,162,166", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8255,8459,8670,8843,9003,9186,9371,9556,9759,9965,10148", + "endLines": "130,134,138,141,145,149,153,157,161,165,169", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8454,8665,8838,8998,9181,9366,9551,9754,9960,10143,10344" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "129,72,75,74,73,19,20,21,118,119,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,121,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,134,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,126,124,123,125,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,4,4", + "startOffsets": "8221,3970,4234,4137,4067,846,890,943,7624,7674,8162,8110,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,7794,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,8635,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,8068,7939,7881,7993,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "133,72,75,74,73,19,20,21,118,119,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,121,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,134,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,126,124,123,125,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,83,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,46,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": "8629,4061,4312,4228,4131,884,937,990,7668,7732,8215,8156,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,7873,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,8677,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,8104,7987,7933,8062,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,125,126", + "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,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3469,3527,3574,3633,3690,3761,3822,3879,3929,3981,4034,4084,4134,4194,4247,4313,4375,4438,4485,4540,4628,4686,4748,4798,4843,4886,4946,5013,5068,5115,5170,5223,5270,5323,5379,5427,5482,5535,5619,5686,5750,5846,5920,6001,6090,6253,6397,6476,6551,6633,6692,6772,6852,6907,7029,7132,7173,7226,7283,7357,7422,7490,7576,7656,7725,7819,7878,7933,7995,8055,8165", + "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,125,126", + "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,83,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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3464,3522,3569,3628,3685,3756,3817,3874,3924,3976,4029,4079,4129,4189,4242,4308,4370,4433,4480,4535,4623,4681,4743,4793,4838,4881,4941,5008,5063,5110,5165,5218,5265,5318,5374,5422,5477,5530,5614,5681,5745,5841,5915,5996,6085,6248,6392,6471,6546,6628,6687,6767,6847,6902,7024,7127,7168,7221,7278,7352,7417,7485,7571,7651,7720,7814,7873,7928,7990,8050,8160,8250" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,115,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6350,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6399,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,107,108", + "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", + "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,2161,2214,2257,2308,2358,2418,2471,2522,2568,2616,2664,2710,2757,2807,2852,2911,2963,3015,3058,3105,3161,3216,3271,3315,3357,3398,3448,3507,3558,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022", + "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,107,108", + "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,53,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,42,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,2156,2209,2252,2303,2353,2413,2466,2517,2563,2611,2659,2705,2752,2802,2847,2906,2958,3010,3053,3100,3156,3211,3266,3310,3352,3393,3443,3502,3553,3596,3645,3694,3741,3788,3835,3880,3931,3984,4059,4118,4175,4249,4313,4382,4460,4570,4674,4747,4813,4868,4933,4998,5047,5130,5208,5246,5291,5339,5401,5458,5513,5572,5639,5697,5759,5807,5852,5900,5951,6017,6083" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "2", @@ -49,11 +141,9 @@ { "source": "D:\\softwareengineering\\gitProject\\src\\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" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "13,14,15,16,17", @@ -66,12 +156,9 @@ { "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -85,30 +172,25 @@ { "source": "D:\\softwareengineering\\gitProject\\src\\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,2920,2696,1098,1287,1476,1685,1897,911,2104" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "126,130,134,138,141,145,149,153,157,161,165", + "startLines": "127,131,135,139,142,146,150,154,158,162,166", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064", - "endLines": "129,133,137,140,144,148,152,156,160,164,168", + "startOffsets": "8234,8438,8649,8822,8982,9165,9350,9535,9738,9944,10127", + "endLines": "130,134,138,141,145,149,153,157,161,165,169", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260" + "endOffsets": "8433,8644,8817,8977,9160,9345,9530,9733,9939,10122,10323" } }, { "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", @@ -121,26 +203,26 @@ { "source": "D:\\softwareengineering\\gitProject\\src\\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,133,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,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,8550,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,133,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,46,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,8592,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" + "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8200,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7794,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8608,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7852,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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,125", - "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,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081", - "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,125", - "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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166" + "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,125,126", + "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,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3448,3506,3553,3612,3669,3740,3801,3858,3908,3960,4013,4063,4113,4173,4226,4292,4354,4417,4464,4519,4607,4665,4727,4777,4822,4865,4925,4992,5047,5094,5149,5202,5249,5302,5358,5406,5461,5514,5598,5665,5729,5825,5899,5980,6069,6232,6376,6455,6530,6612,6671,6751,6831,6886,7008,7111,7152,7205,7262,7336,7401,7469,7555,7635,7704,7798,7857,7912,7974,8034,8144", + "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,125,126", + "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,62,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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3443,3501,3548,3607,3664,3735,3796,3853,3903,3955,4008,4058,4108,4168,4221,4287,4349,4412,4459,4514,4602,4660,4722,4772,4817,4860,4920,4987,5042,5089,5144,5197,5244,5297,5353,5401,5456,5509,5593,5660,5724,5820,5894,5975,6064,6227,6371,6450,6525,6607,6666,6746,6826,6881,7003,7106,7147,7200,7257,7331,7396,7464,7550,7630,7699,7793,7852,7907,7969,8029,8139,8229" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", @@ -181,6 +263,88 @@ } } ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,116,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6326,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6375,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,107,108", + "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", + "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,2159,2212,2255,2306,2356,2416,2469,2520,2566,2614,2662,2708,2755,2805,2850,2909,2961,3013,3056,3103,3159,3214,3269,3313,3355,3396,3446,3505,3556,3599,3648,3697,3744,3791,3838,3883,3934,3987,4062,4121,4178,4252,4316,4385,4463,4573,4677,4750,4816,4871,4936,5001,5050,5133,5211,5249,5294,5342,5404,5461,5516,5575,5642,5700,5762,5810,5855,5903,5954,6020", + "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,107,108", + "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,53,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,42,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,2154,2207,2250,2301,2351,2411,2464,2515,2561,2609,2657,2703,2750,2800,2845,2904,2956,3008,3051,3098,3154,3209,3264,3308,3350,3391,3441,3500,3551,3594,3643,3692,3739,3786,3833,3878,3929,3982,4057,4116,4173,4247,4311,4380,4458,4568,4672,4745,4811,4866,4931,4996,5045,5128,5206,5244,5289,5337,5399,5456,5511,5570,5637,5695,5757,5805,5850,5898,5949,6015,6081" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + }, + { + "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\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,124,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,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,6833,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,124,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,42,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,6871,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,107", + "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", + "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,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", + "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,107", + "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,42,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,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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" + } + } + ] } ] } \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 7cea338..b3b9249 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", @@ -42,6 +42,45 @@ } } ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,115,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6350,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6399,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,107,108", + "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", + "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,2161,2214,2257,2308,2358,2418,2471,2522,2568,2616,2664,2710,2757,2807,2852,2911,2963,3015,3058,3105,3161,3216,3271,3315,3357,3398,3448,3507,3558,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022", + "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,107,108", + "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,53,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,42,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,2156,2209,2252,2303,2353,2413,2466,2517,2563,2611,2659,2705,2752,2802,2847,2906,2958,3010,3053,3100,3156,3211,3266,3310,3352,3393,3443,3502,3553,3596,3645,3694,3741,3788,3835,3880,3931,3984,4059,4118,4175,4249,4313,4382,4460,4570,4674,4747,4813,4868,4933,4998,5047,5130,5208,5246,5291,5339,5401,5458,5513,5572,5639,5697,5759,5807,5852,5900,5951,6017,6083" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] } ] } \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 1eea0c5..ace881d 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", @@ -42,6 +42,45 @@ } } ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,116,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6326,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6375,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,107,108", + "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", + "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,2159,2212,2255,2306,2356,2416,2469,2520,2566,2614,2662,2708,2755,2805,2850,2909,2961,3013,3056,3103,3159,3214,3269,3313,3355,3396,3446,3505,3556,3599,3648,3697,3744,3791,3838,3883,3934,3987,4062,4121,4178,4252,4316,4385,4463,4573,4677,4750,4816,4871,4936,5001,5050,5133,5211,5249,5294,5342,5404,5461,5516,5575,5642,5700,5762,5810,5855,5903,5954,6020", + "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,107,108", + "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,53,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,42,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,2154,2207,2250,2301,2351,2411,2464,2515,2561,2609,2657,2703,2750,2800,2845,2904,2956,3008,3051,3098,3154,3209,3264,3308,3350,3391,3441,3500,3551,3594,3643,3692,3739,3786,3833,3878,3929,3982,4057,4116,4173,4247,4311,4380,4458,4568,4672,4745,4811,4866,4931,4996,5045,5128,5206,5244,5289,5337,5399,5456,5511,5570,5637,5695,5757,5805,5850,5898,5949,6015,6081" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] } ] } \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index cb14c5a..224545d 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -2,6 +2,92 @@ "logs": [ { "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "127,131,135,139,142,146,150,154,158,162,166", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8234,8438,8649,8822,8982,9165,9350,9535,9738,9944,10127", + "endLines": "130,134,138,141,145,149,153,157,161,165,169", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8433,8644,8817,8977,9160,9345,9530,9733,9939,10122,10323" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8200,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7794,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8608,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7852,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,125,126", + "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,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3448,3506,3553,3612,3669,3740,3801,3858,3908,3960,4013,4063,4113,4173,4226,4292,4354,4417,4464,4519,4607,4665,4727,4777,4822,4865,4925,4992,5047,5094,5149,5202,5249,5302,5358,5406,5461,5514,5598,5665,5729,5825,5899,5980,6069,6232,6376,6455,6530,6612,6671,6751,6831,6886,7008,7111,7152,7205,7262,7336,7401,7469,7555,7635,7704,7798,7857,7912,7974,8034,8144", + "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,125,126", + "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,62,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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3443,3501,3548,3607,3664,3735,3796,3853,3903,3955,4008,4058,4108,4168,4221,4287,4349,4412,4459,4514,4602,4660,4722,4772,4817,4860,4920,4987,5042,5089,5144,5197,5244,5297,5353,5401,5456,5509,5593,5660,5724,5820,5894,5975,6064,6227,6371,6450,6525,6607,6666,6746,6826,6881,7003,7106,7147,7200,7257,7331,7396,7464,7550,7630,7699,7793,7852,7907,7969,8029,8139,8229" + } + } + ] + }, + { + "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", "map": [ { "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\dimens.xml", @@ -50,12 +136,12 @@ "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "126,130,134,138,141,145,149,153,157,161,165", + "startLines": "127,131,135,139,142,146,150,154,158,162,166", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064", - "endLines": "129,133,137,140,144,148,152,156,160,164,168", + "startOffsets": "8255,8459,8670,8843,9003,9186,9371,9556,9759,9965,10148", + "endLines": "130,134,138,141,145,149,153,157,161,165,169", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260" + "endOffsets": "8454,8665,8838,8998,9181,9366,9551,9754,9960,10143,10344" } }, { @@ -78,20 +164,20 @@ { "source": "D:\\softwareengineering\\gitProject\\src\\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,133,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,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,8550,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,133,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,46,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,8592,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" + "startLines": "129,72,75,74,73,19,20,21,118,119,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,121,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,134,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,126,124,123,125,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,4,4", + "startOffsets": "8221,3970,4234,4137,4067,846,890,943,7624,7674,8162,8110,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,7794,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,8635,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,8068,7939,7881,7993,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "133,72,75,74,73,19,20,21,118,119,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,121,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,134,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,126,124,123,125,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,83,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,46,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": "8629,4061,4312,4228,4131,884,937,990,7668,7732,8215,8156,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,7873,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,8677,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,8104,7987,7933,8062,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,125", - "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,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081", - "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,125", - "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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166" + "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,125,126", + "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,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3469,3527,3574,3633,3690,3761,3822,3879,3929,3981,4034,4084,4134,4194,4247,4313,4375,4438,4485,4540,4628,4686,4748,4798,4843,4886,4946,5013,5068,5115,5170,5223,5270,5323,5379,5427,5482,5535,5619,5686,5750,5846,5920,6001,6090,6253,6397,6476,6551,6633,6692,6772,6852,6907,7029,7132,7173,7226,7283,7357,7422,7490,7576,7656,7725,7819,7878,7933,7995,8055,8165", + "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,125,126", + "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,83,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,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3464,3522,3569,3628,3685,3756,3817,3874,3924,3976,4029,4079,4129,4189,4242,4308,4370,4433,4480,4535,4623,4681,4743,4793,4838,4881,4941,5008,5063,5110,5165,5218,5265,5318,5374,5422,5477,5530,5614,5681,5745,5841,5915,5996,6085,6248,6392,6471,6546,6628,6687,6767,6847,6902,7024,7127,7168,7221,7278,7352,7417,7485,7571,7651,7720,7814,7873,7928,7990,8050,8160,8250" } } ] diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 089bc28..2a106a9 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,382 @@ [ { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_item.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw/introduction" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/preferences.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" + "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/searchable.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" } ] \ No newline at end of file diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 82b2e8f..0a936ea 100644 Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index c230dd9..4b49267 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 69203fa..5c85cfb 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index c6ba47f..d7f84f6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index b9f86f0..705147a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index f3c79f9..cbe0279 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 054f849..79c01d0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index d74767f..f4dc986 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 2b23262..1086fa3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index da06cb1..fd8a025 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index f3e35fe..59c89f0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index ba171f1..00f3f51 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index efaf5ff..ae8ed99 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index e565d31..a945a18 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index 68f5579..46f431d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 663fcc1..8a0e34d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index f3b906f..45fd872 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 003b5a8..a3deefb 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index ae6adc2..1d5b301 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index d190c0e..cbb0bb5 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt index 7c8b44d..c06d313 100644 --- a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -107,42 +107,43 @@ int id ll_font_normal 0x7f05001d int id ll_font_small 0x7f05001e int id ll_font_super 0x7f05001f int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050040 -int id menu_font_size 0x7f050023 -int id menu_list_mode 0x7f050024 -int id menu_new_folder 0x7f050041 -int id menu_new_note 0x7f050025 -int id menu_restore 0x7f050042 -int id menu_search 0x7f050026 -int id menu_send_to_desktop 0x7f050027 -int id menu_setting 0x7f050043 -int id menu_share 0x7f050028 -int id menu_sync 0x7f050044 -int id minute 0x7f050029 -int id move 0x7f05002a -int id navigation_bar 0x7f05002b -int id note_bg_color_selector 0x7f05002c -int id note_edit_list 0x7f05002d -int id note_edit_view 0x7f05002e -int id note_item 0x7f05002f -int id note_title 0x7f050030 -int id notes_list 0x7f050031 -int id prefenerece_sync_status_textview 0x7f050032 -int id preference_sync_button 0x7f050033 -int id selection_menu 0x7f050034 -int id sv_note_edit 0x7f050035 -int id text_num 0x7f050036 -int id tv_alert_date 0x7f050037 -int id tv_folder_name 0x7f050038 -int id tv_modified_date 0x7f050039 -int id tv_name 0x7f05003a -int id tv_time 0x7f05003b -int id tv_title 0x7f05003c -int id tv_title_bar 0x7f05003d -int id widget_bg_image 0x7f05003e -int id widget_text 0x7f05003f +int id menu_countallNotes 0x7f050021 +int id menu_delete 0x7f050022 +int id menu_delete_remind 0x7f050023 +int id menu_export_text 0x7f050024 +int id menu_font_size 0x7f050025 +int id menu_list_mode 0x7f050026 +int id menu_new_folder 0x7f050027 +int id menu_new_note 0x7f050028 +int id menu_restore 0x7f050029 +int id menu_search 0x7f05002a +int id menu_send_to_desktop 0x7f05002b +int id menu_setting 0x7f05002c +int id menu_share 0x7f05002d +int id menu_sync 0x7f05002e +int id minute 0x7f05002f +int id move 0x7f050030 +int id navigation_bar 0x7f050031 +int id note_bg_color_selector 0x7f050032 +int id note_edit_list 0x7f050033 +int id note_edit_view 0x7f050034 +int id note_item 0x7f050035 +int id note_title 0x7f050036 +int id notes_list 0x7f050037 +int id prefenerece_sync_status_textview 0x7f050038 +int id preference_sync_button 0x7f050039 +int id selection_menu 0x7f05003a +int id sv_note_edit 0x7f05003b +int id text_num 0x7f05003c +int id tv_alert_date 0x7f05003d +int id tv_folder_name 0x7f05003e +int id tv_modified_date 0x7f05003f +int id tv_name 0x7f050040 +int id tv_time 0x7f050041 +int id tv_title 0x7f050042 +int id tv_title_bar 0x7f050043 +int id widget_bg_image 0x7f050044 +int id widget_text 0x7f050045 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -160,10 +161,10 @@ int layout widget_4x 0x7f06000d int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 -int menu note_list 0x7f070006 -int menu note_list_dropdown 0x7f070003 -int menu note_list_options 0x7f070004 -int menu sub_folder 0x7f070005 +int menu note_list 0x7f070003 +int menu note_list_dropdown 0x7f070004 +int menu note_list_options 0x7f070005 +int menu sub_folder 0x7f070006 int plurals search_results_title 0x7f080000 int raw introduction 0x7f090000 int string alert_message_delete_folder 0x7f0a0000 @@ -198,77 +199,78 @@ int string format_move_notes_to_folder 0x7f0a001c int string hint_foler_name 0x7f0a001d int string info_note_enter_desktop 0x7f0a001e int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_length 0x7f0a003c -int string note_link_email 0x7f0a003d -int string note_link_other 0x7f0a003e -int string note_link_tel 0x7f0a003f -int string note_link_web 0x7f0a0040 -int string notealert_enter 0x7f0a0041 -int string notealert_ok 0x7f0a0042 -int string notelist_menu_new 0x7f0a0043 -int string notelist_string_info 0x7f0a0044 -int string preferences_account_summary 0x7f0a0045 -int string preferences_account_title 0x7f0a0046 -int string preferences_add_account 0x7f0a0047 -int string preferences_bg_random_appear_title 0x7f0a0048 -int string preferences_button_sync_cancel 0x7f0a0049 -int string preferences_button_sync_immediately 0x7f0a004a -int string preferences_dialog_change_account_title 0x7f0a004b -int string preferences_dialog_change_account_warn_msg 0x7f0a004c -int string preferences_dialog_select_account_tips 0x7f0a004d -int string preferences_dialog_select_account_title 0x7f0a004e -int string preferences_last_sync_time 0x7f0a004f -int string preferences_last_sync_time_format 0x7f0a0050 -int string preferences_menu_cancel 0x7f0a0051 -int string preferences_menu_change_account 0x7f0a0052 -int string preferences_menu_remove_account 0x7f0a0053 -int string preferences_title 0x7f0a0054 -int string preferences_toast_cannot_change_account 0x7f0a0055 -int string preferences_toast_success_set_accout 0x7f0a0056 -int string search 0x7f0a0057 -int string search_hint 0x7f0a0058 -int string search_label 0x7f0a0059 -int string search_setting_description 0x7f0a005a -int string set_remind_time_message 0x7f0a005b -int string success_sdcard_export 0x7f0a005c -int string success_sync_account 0x7f0a005d -int string sync_progress_init_list 0x7f0a005e -int string sync_progress_login 0x7f0a005f -int string sync_progress_syncing 0x7f0a0060 -int string ticker_cancel 0x7f0a0061 -int string ticker_fail 0x7f0a0062 -int string ticker_success 0x7f0a0063 -int string ticker_syncing 0x7f0a0064 -int string widget_havenot_content 0x7f0a0065 -int string widget_under_visit_mode 0x7f0a0066 +int string menu_countallNotes 0x7f0a0020 +int string menu_create_folder 0x7f0a0021 +int string menu_delete 0x7f0a0022 +int string menu_deselect_all 0x7f0a0023 +int string menu_export_text 0x7f0a0024 +int string menu_folder_change_name 0x7f0a0025 +int string menu_folder_delete 0x7f0a0026 +int string menu_folder_view 0x7f0a0027 +int string menu_font_large 0x7f0a0028 +int string menu_font_normal 0x7f0a0029 +int string menu_font_size 0x7f0a002a +int string menu_font_small 0x7f0a002b +int string menu_font_super 0x7f0a002c +int string menu_list_mode 0x7f0a002d +int string menu_move 0x7f0a002e +int string menu_move_parent_folder 0x7f0a002f +int string menu_normal_mode 0x7f0a0030 +int string menu_remove_remind 0x7f0a0031 +int string menu_search 0x7f0a0032 +int string menu_select_all 0x7f0a0033 +int string menu_select_none 0x7f0a0034 +int string menu_select_title 0x7f0a0035 +int string menu_send_to_desktop 0x7f0a0036 +int string menu_setting 0x7f0a0037 +int string menu_share 0x7f0a0038 +int string menu_sync 0x7f0a0039 +int string menu_sync_cancel 0x7f0a003a +int string menu_title_select_folder 0x7f0a003b +int string note_alert_expired 0x7f0a003c +int string note_length 0x7f0a003d +int string note_link_email 0x7f0a003e +int string note_link_other 0x7f0a003f +int string note_link_tel 0x7f0a0040 +int string note_link_web 0x7f0a0041 +int string notealert_enter 0x7f0a0042 +int string notealert_ok 0x7f0a0043 +int string notelist_menu_new 0x7f0a0044 +int string notelist_string_info 0x7f0a0045 +int string preferences_account_summary 0x7f0a0046 +int string preferences_account_title 0x7f0a0047 +int string preferences_add_account 0x7f0a0048 +int string preferences_bg_random_appear_title 0x7f0a0049 +int string preferences_button_sync_cancel 0x7f0a004a +int string preferences_button_sync_immediately 0x7f0a004b +int string preferences_dialog_change_account_title 0x7f0a004c +int string preferences_dialog_change_account_warn_msg 0x7f0a004d +int string preferences_dialog_select_account_tips 0x7f0a004e +int string preferences_dialog_select_account_title 0x7f0a004f +int string preferences_last_sync_time 0x7f0a0050 +int string preferences_last_sync_time_format 0x7f0a0051 +int string preferences_menu_cancel 0x7f0a0052 +int string preferences_menu_change_account 0x7f0a0053 +int string preferences_menu_remove_account 0x7f0a0054 +int string preferences_title 0x7f0a0055 +int string preferences_toast_cannot_change_account 0x7f0a0056 +int string preferences_toast_success_set_accout 0x7f0a0057 +int string search 0x7f0a0058 +int string search_hint 0x7f0a0059 +int string search_label 0x7f0a005a +int string search_setting_description 0x7f0a005b +int string set_remind_time_message 0x7f0a005c +int string success_sdcard_export 0x7f0a005d +int string success_sync_account 0x7f0a005e +int string sync_progress_init_list 0x7f0a005f +int string sync_progress_login 0x7f0a0060 +int string sync_progress_syncing 0x7f0a0061 +int string ticker_cancel 0x7f0a0062 +int string ticker_fail 0x7f0a0063 +int string ticker_success 0x7f0a0064 +int string ticker_syncing 0x7f0a0065 +int string widget_havenot_content 0x7f0a0066 +int string widget_under_visit_mode 0x7f0a0067 int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 diff --git a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index fe7c2fe..a820950 100644 --- a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,107 +1,103 @@ -net.micode.notes:menu/note_list = 0x7f070006 -net.micode.notes:id/menu_setting = 0x7f050043 -net.micode.notes:id/menu_new_folder = 0x7f050041 -net.micode.notes:string/ticker_success = 0x7f0a0063 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0053 +net.micode.notes:string/ticker_success = 0x7f0a0064 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0054 net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:id/menu_search = 0x7f050026 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:id/menu_search = 0x7f05002a +net.micode.notes:string/menu_export_text = 0x7f0a0024 +net.micode.notes:string/menu_search = 0x7f0a0032 net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:string/search_label = 0x7f0a0059 -net.micode.notes:string/note_link_other = 0x7f0a003e -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/search_label = 0x7f0a005a +net.micode.notes:string/note_link_other = 0x7f0a003f +net.micode.notes:string/note_alert_expired = 0x7f0a003c +net.micode.notes:string/menu_folder_change_name = 0x7f0a0025 net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:id/tv_title_bar = 0x7f05003d -net.micode.notes:string/ticker_syncing = 0x7f0a0064 +net.micode.notes:string/menu_font_small = 0x7f0a002b +net.micode.notes:id/tv_title_bar = 0x7f050043 +net.micode.notes:string/ticker_syncing = 0x7f0a0065 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/preferences_title = 0x7f0a0054 +net.micode.notes:string/preferences_title = 0x7f0a0055 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/sync_progress_syncing = 0x7f0a0060 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0055 +net.micode.notes:string/sync_progress_syncing = 0x7f0a0061 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0056 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:id/note_title = 0x7f050030 +net.micode.notes:id/note_title = 0x7f050036 net.micode.notes:drawable/title_alert = 0x7f040036 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0052 -net.micode.notes:id/selection_menu = 0x7f050034 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0051 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005e -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004f +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0053 +net.micode.notes:id/selection_menu = 0x7f05003a +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0052 +net.micode.notes:string/sync_progress_init_list = 0x7f0a005f +net.micode.notes:string/menu_sync = 0x7f0a0039 +net.micode.notes:string/menu_sync_cancel = 0x7f0a003a +net.micode.notes:string/menu_normal_mode = 0x7f0a0030 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0050 net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004e -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004c -net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004f +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004d +net.micode.notes:string/menu_select_none = 0x7f0a0034 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004a -net.micode.notes:string/widget_havenot_content = 0x7f0a0065 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004b +net.micode.notes:string/widget_havenot_content = 0x7f0a0066 net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050031 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0049 -net.micode.notes:string/preferences_account_summary = 0x7f0a0045 -net.micode.notes:string/notelist_menu_new = 0x7f0a0043 +net.micode.notes:id/notes_list = 0x7f050037 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004a +net.micode.notes:string/preferences_account_summary = 0x7f0a0046 +net.micode.notes:string/notelist_menu_new = 0x7f0a0044 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:string/notealert_ok = 0x7f0a0042 -net.micode.notes:menu/sub_folder = 0x7f070005 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/notealert_enter = 0x7f0a0041 -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f050035 -net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:string/notealert_ok = 0x7f0a0043 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:string/menu_remove_remind = 0x7f0a0031 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:string/menu_share = 0x7f0a0038 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0061 -net.micode.notes:string/note_link_web = 0x7f0a0040 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/note_link_tel = 0x7f0a003f -net.micode.notes:id/widget_text = 0x7f05003f -net.micode.notes:string/note_link_email = 0x7f0a003d -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:string/ticker_cancel = 0x7f0a0062 +net.micode.notes:string/note_link_web = 0x7f0a0041 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003b +net.micode.notes:string/menu_select_all = 0x7f0a0033 +net.micode.notes:string/note_link_tel = 0x7f0a0040 +net.micode.notes:id/widget_text = 0x7f050045 +net.micode.notes:string/note_link_email = 0x7f0a003e +net.micode.notes:string/menu_move_parent_folder = 0x7f0a002f +net.micode.notes:string/success_sdcard_export = 0x7f0a005d +net.micode.notes:string/notelist_string_info = 0x7f0a0045 +net.micode.notes:string/menu_move = 0x7f0a002e net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:string/menu_list_mode = 0x7f0a002d net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:drawable/list_folder = 0x7f04001b -net.micode.notes:string/menu_delete = 0x7f0a0021 +net.micode.notes:string/menu_font_super = 0x7f0a002c +net.micode.notes:string/menu_deselect_all = 0x7f0a0023 +net.micode.notes:string/menu_create_folder = 0x7f0a0021 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/menu_share = 0x7f05002d +net.micode.notes:string/menu_countallNotes = 0x7f0a0020 +net.micode.notes:string/file_path = 0x7f0a0016 +net.micode.notes:string/format_date_ymd = 0x7f0a0018 net.micode.notes:string/hint_foler_name = 0x7f0a001d net.micode.notes:string/folder_exist = 0x7f0a0017 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0056 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0066 -net.micode.notes:id/menu_send_to_desktop = 0x7f050027 -net.micode.notes:id/tv_modified_date = 0x7f050039 -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/ticker_fail = 0x7f0a0062 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:string/set_remind_time_message = 0x7f0a005b +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0057 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0067 +net.micode.notes:id/menu_send_to_desktop = 0x7f05002b +net.micode.notes:string/set_remind_time_message = 0x7f0a005c net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:string/error_note_not_exist = 0x7f0a000e net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:string/notelist_string_info = 0x7f0a0044 -net.micode.notes:string/success_sdcard_export = 0x7f0a005c net.micode.notes:drawable/new_note_normal = 0x7f040030 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 +net.micode.notes:string/menu_select_title = 0x7f0a0035 +net.micode.notes:string/menu_font_normal = 0x7f0a0029 net.micode.notes:raw/introduction = 0x7f090000 net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:layout/datetime_picker = 0x7f060002 +net.micode.notes:string/notealert_enter = 0x7f0a0042 +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:id/sv_note_edit = 0x7f05003b net.micode.notes:dimen/text_font_size_super = 0x7f030004 net.micode.notes:plurals/search_results_title = 0x7f080000 net.micode.notes:drawable/selected = 0x7f040035 @@ -117,99 +113,104 @@ net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:color/secondary_text_dark = 0x7f020001 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:id/move = 0x7f05002a +net.micode.notes:id/move = 0x7f050030 net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050032 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:layout/note_list_footer = 0x7f06000a net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:id/tv_time = 0x7f05003b -net.micode.notes:id/tv_name = 0x7f05003a +net.micode.notes:id/tv_time = 0x7f050041 +net.micode.notes:id/tv_name = 0x7f050040 net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050033 -net.micode.notes:id/note_edit_view = 0x7f05002e -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0050 -net.micode.notes:id/navigation_bar = 0x7f05002b +net.micode.notes:id/preference_sync_button = 0x7f050039 +net.micode.notes:id/note_edit_view = 0x7f050034 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0051 +net.micode.notes:id/navigation_bar = 0x7f050031 net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:id/minute = 0x7f050029 +net.micode.notes:id/minute = 0x7f05002f net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:id/menu_share = 0x7f050028 +net.micode.notes:drawable/font_super = 0x7f040014 +net.micode.notes:id/menu_sync = 0x7f05002e +net.micode.notes:id/menu_setting = 0x7f05002c +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a +net.micode.notes:id/delete = 0x7f050008 +net.micode.notes:id/menu_restore = 0x7f050029 net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050025 -net.micode.notes:id/menu_list_mode = 0x7f050024 -net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/success_sync_account = 0x7f0a005d +net.micode.notes:id/menu_new_note = 0x7f050028 +net.micode.notes:string/error_note_not_exist = 0x7f0a000e +net.micode.notes:id/menu_new_folder = 0x7f050027 +net.micode.notes:id/menu_list_mode = 0x7f050026 +net.micode.notes:id/iv_medium_select = 0x7f050019 +net.micode.notes:id/menu_export_text = 0x7f050024 +net.micode.notes:string/menu_folder_view = 0x7f0a0027 +net.micode.notes:id/menu_delete = 0x7f050022 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:string/ticker_fail = 0x7f0a0063 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050038 +net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:string/menu_font_size = 0x7f0a002a +net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:string/success_sync_account = 0x7f0a005e net.micode.notes:id/ll_font_super = 0x7f05001f net.micode.notes:id/ll_font_small = 0x7f05001e net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:id/ll_font_normal = 0x7f05001d net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:id/note_bg_color_selector = 0x7f05002c +net.micode.notes:id/note_bg_color_selector = 0x7f050032 net.micode.notes:id/iv_super_select = 0x7f05001b net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:id/menu_export_text = 0x7f050040 -net.micode.notes:id/iv_medium_select = 0x7f050019 net.micode.notes:id/iv_bg_yellow = 0x7f050016 net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:id/iv_bg_white_select = 0x7f050015 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:id/tv_alert_date = 0x7f050037 +net.micode.notes:id/tv_alert_date = 0x7f05003d net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_red = 0x7f050012 net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:string/menu_font_large = 0x7f0a0027 +net.micode.notes:string/menu_font_large = 0x7f0a0028 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:id/widget_bg_image = 0x7f05003e -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004b +net.micode.notes:id/widget_bg_image = 0x7f050044 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004c net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:drawable/widget_4x_white = 0x7f040040 net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004d +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004e net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:string/search = 0x7f0a0057 +net.micode.notes:string/search = 0x7f0a0058 net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 net.micode.notes:id/amPm = 0x7f050003 net.micode.notes:id/iv_bg_green = 0x7f050010 net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:menu/note_list_options = 0x7f070004 -net.micode.notes:id/iv_small_select = 0x7f05001a -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 net.micode.notes:id/hour = 0x7f05000c +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:id/menu_restore = 0x7f050042 -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050008 net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 net.micode.notes:drawable/list_green_single = 0x7f04001f net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 +net.micode.notes:id/tv_modified_date = 0x7f05003f +net.micode.notes:drawable/list_blue_middle = 0x7f040018 +net.micode.notes:id/iv_small_select = 0x7f05001a +net.micode.notes:menu/note_list_options = 0x7f070005 net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:string/menu_folder_delete = 0x7f0a0025 +net.micode.notes:string/menu_folder_delete = 0x7f0a0026 net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:id/date = 0x7f050007 net.micode.notes:drawable/list_yellow_single = 0x7f04002b net.micode.notes:drawable/list_red_up = 0x7f040024 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/tv_folder_name = 0x7f050038 +net.micode.notes:id/tv_folder_name = 0x7f05003e net.micode.notes:drawable/list_yellow_down = 0x7f040029 net.micode.notes:string/format_folder_files_count = 0x7f0a001b net.micode.notes:drawable/clock = 0x7f040003 @@ -218,24 +219,26 @@ net.micode.notes:drawable/edit_title_blue = 0x7f040009 net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:id/iv_alert_icon = 0x7f05000d net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:string/preferences_account_title = 0x7f0a0046 +net.micode.notes:string/preferences_account_title = 0x7f0a0047 net.micode.notes:drawable/edit_white = 0x7f04000e net.micode.notes:drawable/list_white_middle = 0x7f040026 net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:string/preferences_add_account = 0x7f0a0047 +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +net.micode.notes:id/menu_countallNotes = 0x7f050021 +net.micode.notes:string/preferences_add_account = 0x7f0a0048 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0048 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0049 net.micode.notes:layout/widget_2x = 0x7f06000c net.micode.notes:drawable/list_footer_bg = 0x7f04001c net.micode.notes:string/alert_title_delete = 0x7f0a0003 net.micode.notes:drawable/edit_title_green = 0x7f04000a net.micode.notes:drawable/icon_app = 0x7f040015 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0036 net.micode.notes:drawable/list_red_single = 0x7f040023 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:id/menu_delete_remind = 0x7f050022 +net.micode.notes:id/menu_delete_remind = 0x7f050023 net.micode.notes:drawable/list_red_down = 0x7f040021 net.micode.notes:drawable/list_red_middle = 0x7f040022 net.micode.notes:id/iv_bg_white = 0x7f050014 @@ -244,43 +247,42 @@ net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:drawable/list_blue_down = 0x7f040017 net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:id/menu_sync = 0x7f050044 -net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:string/sync_progress_login = 0x7f0a005f +net.micode.notes:string/sync_progress_login = 0x7f0a0060 net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:drawable/widget_2x_white = 0x7f04003b net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f05003c +net.micode.notes:id/tv_title = 0x7f050042 net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:string/search_setting_description = 0x7f0a005a +net.micode.notes:string/search_setting_description = 0x7f0a005b net.micode.notes:drawable/list_blue_single = 0x7f040019 net.micode.notes:drawable/font_large = 0x7f040010 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f05002f +net.micode.notes:id/note_item = 0x7f050035 net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f05002d +net.micode.notes:id/note_edit_list = 0x7f050033 net.micode.notes:drawable/edit_title_red = 0x7f04000b +net.micode.notes:string/menu_delete = 0x7f0a0022 +net.micode.notes:drawable/list_folder = 0x7f04001b net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:id/text_num = 0x7f050036 -net.micode.notes:string/search_hint = 0x7f0a0058 -net.micode.notes:id/menu_font_size = 0x7f050023 +net.micode.notes:id/text_num = 0x7f05003c +net.micode.notes:string/search_hint = 0x7f0a0059 +net.micode.notes:id/menu_font_size = 0x7f050025 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 net.micode.notes:drawable/list_yellow_up = 0x7f04002c net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:drawable/list_green_middle = 0x7f04001e net.micode.notes:drawable/list_background = 0x7f040016 net.micode.notes:string/app_name = 0x7f0a0004 -net.micode.notes:menu/note_list_dropdown = 0x7f070003 -net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:menu/note_list_dropdown = 0x7f070004 +net.micode.notes:string/menu_setting = 0x7f0a0037 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 net.micode.notes:layout/note_edit_list_item = 0x7f060006 -net.micode.notes:string/note_length = 0x7f0a003c +net.micode.notes:string/note_length = 0x7f0a003d net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index c03a779..8848b80 100644 Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java index 51c9cb9..2e9ac87 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -181,4 +181,23 @@ public class NotesListAdapter extends CursorAdapter { } } } + + public int retCount() { + int NotesCount = mNotesCount; + int ItemCount = getCount(); + for (int i = 0; i < ItemCount; i++) { + Cursor c = (Cursor) getItem(i); + if (c != null) { + if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { + NoteItemData NoteItem = new NoteItemData(mContext, c); + NotesCount += NoteItem.getNotesCount(); + } + } else { + Log.e(TAG, "Invalid cursor"); + return -1; + } + } + return NotesCount; + } } + diff --git a/src/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml index 618e04e..62fbb03 100644 --- a/src/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/app/src/main/res/values-zh-rCN/strings.xml @@ -113,6 +113,7 @@ 删除 通话便签 请输入名称 + 统计便签数量 正在搜索便签 搜索便签 便签中的文字 diff --git a/src/app/src/main/res/values-zh-rTW/strings.xml b/src/app/src/main/res/values-zh-rTW/strings.xml index 27431fb..90237fc 100644 --- a/src/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/app/src/main/res/values-zh-rTW/strings.xml @@ -114,6 +114,7 @@ 通話便籤 請輸入名稱 + 统计便签数量 正在搜索便籤 搜索便籤 便籤中的文字 diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml index a122299..d2db4ae 100644 --- a/src/app/src/main/res/values/strings.xml +++ b/src/app/src/main/res/values/strings.xml @@ -119,7 +119,7 @@ Delete Call notes Input name - countallNotes" + countallNotes" Searching Notes Search notes