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 af0b59a..be3f612 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,8 @@
+<<<<<<< HEAD
#Mon Dec 30 21:15:33 CST 2024
+=======
+#Mon Jan 06 19:32:33 CST 2025
+>>>>>>> a
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-7\:/color/text_color_state_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat
@@ -69,7 +73,15 @@ net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitnote\\no
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
net.micode.notes.app-main-7\:/drawable/button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_button_background.xml.flat
net.micode.notes.app-main-7\:/drawable/edittext_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_edittext_background.xml.flat
+<<<<<<< HEAD
net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
+=======
+net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_background.xml.flat
+net.micode.notes.app-main-7\:/drawable/gesture_button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat
+net.micode.notes.app-main-7\:/drawable/gesture_panel_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
+net.micode.notes.app-main-7\:/drawable/ic_lock_outline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat
+>>>>>>> a
net.micode.notes.app-main-7\:/drawable/ic_warning.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat
net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_toast_background.xml.flat
@@ -83,6 +95,11 @@ net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\a
net.micode.notes.app-main-7\:/layout/layout_custom_toast.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat
net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+<<<<<<< HEAD
+=======
+net.micode.notes.app-main-7\:/layout/note_gesture_password.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_password.xml.flat
+net.micode.notes.app-main-7\:/layout/note_gesture_verify.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_verify.xml.flat
+>>>>>>> a
net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index d65e0cc..0000000
--- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- - 短信
- - 邮件
-
-
- - %1$s 条符合“%2$s”的搜索结果
-
- 确认删除文件夹及所包含的便签吗？
- 确认要删除该条便签吗?
- 确认要删除所选的 %d 条便签吗?
- 删除
- 便签
- 便签2x2
- 便签4x4
- 删除
- 通话便签
- 取消
- 设置
- 成功删除提醒
- 不能为空便签设置闹钟提醒
- 不能将空便签发送到桌面
- 要查看的便签不存在
- 导出文本时发生错误，请检查SD卡
- SD卡被占用，不能操作
- 同步已取消
- 同步失败，发生内部错误
- 同步失败，请检查网络和帐号设置
- 导出失败
- 文件夹 %1$s 已存在，请重新命名
- yyyyMMdd
- MM月dd日 kk:mm
- 已将文本文件(%1$s)输出至SD卡(%2$s)目录
- 已将所选 %1$d 条便签移到 %2$s 文件夹
- 请输入名称
- 已添加到桌面
- 提醒我
- 新建文件夹
- 删除
- 取消全选
- 导出文本
- 修改文件夹名称
- 刪除文件夹
- 查看文件夹
- 大
- 正常
- 文字大小
- 小
- 超大
- 进入清单模式
- 移动到文件夹
- 上一级文件夹
- 退出清单模式
- 删除提醒
- 搜索
- 全选
- 没有选中项，操作无效
- 选中了 %d 项
- 发送到桌面
- 设置
- 分享
- 同步
- 取消同步
- 选择文件夹
- 已过期
- 发送邮件
- 打开地图
- 呼叫电话
- 浏览网页
- 查看
- 知道了
- 新建便签
- ...
- 与google task同步便签记录
- 同步账号
- 添加账号
- 新建便签背景颜色随机
- 取消同步
- 立即同步
- 当前帐号 %1$s
- 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复
- 请选择google帐号，便签将与该帐号的google task内容同步。
- 同步便签
- 上次同步于 %1$s
- 取消
- 更换账号
- 删除账号
- 设置
- 正在同步中，不能修改同步帐号
- 同步帐号已设置为%1$s
- 便签
- 搜索便签
- 正在搜索便签
- 便签中的文字
- 创建提醒
- 导出成功
- 与%1$s同步成功
- 正在获取服务器便签列表...
- 登录%1$s...
- 正在同步本地便签...
- 同步已取消
- 同步失败
- 同步成功
- 同步便签...
- 没有关联内容，点击新建便签。
- 访客模式下，便签内容不可见
-
\ No newline at end of file
diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 226b5bc..0000000
--- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- - 短信
- - 郵件
-
-
- - %1$s 條符合”%2$s“的搜尋結果
-
- 確認刪除檔夾及所包含的便簽嗎？
- 确认要删除該條便籤嗎?
- 确认要刪除所選的 %d 條便籤嗎?
- 刪除
- 便簽
- 便簽2x2
- 便簽4x4
- 刪除
- 通話便籤
- 取消
- 設置
- 成功刪除提醒
- 不能爲空便籤設置鬧鐘提醒
- 不能將空便籤發送到桌面
- 要查看的便籤不存在
- 導出TXT時發生錯誤，請檢查SD卡
- SD卡被佔用，不能操作
- 同步已取消
- 同步失敗，發生內部錯誤
- 同步失敗，請檢查網絡和帳號設置
- 導出失敗
- 文件夾 %1$s 已存在，請重新命名
- yyyyMMdd
- MM月dd日 kk:mm
- 已將文本文件(%1$s)導出至SD(%2$s)目錄
- 已將所選 %1$d 便籤移到 %2$s 文件夾
- 請輸入名稱
- 已添加到桌面
- 提醒我
- 新建文件夾
- 刪除
- 取消全選
- 導出文本
- 修改文件夾名稱
- 刪除文件夾
- 查看文件夾
- 大
- 正常
- 文字大小
- 小
- 超大
- 進入清單模式
- 移動到文件夾
- 上一級文件夾
- 退出清單模式
- 刪除提醒
- 搜尋
- 全選
- 沒有選中項，操作無效
- 選中了 %d 項
- 發送到桌面
- 設置
- 分享
- 同步
- 取消同步
- 選擇文件夾
- 已過期
- 發送郵件
- 打開地圖
- 呼叫電話
- 浏覽網頁
- 查看
- 知道了
- 新建便簽
- ...
- 与google task同步便簽記錄
- 同步賬號
- 添加賬號
- 新建便籤背景顏色隨機
- 取消同步
- 立即同步
- 當前帳號 %1$s
- 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復
- 請選擇google帳號，便簽將與該帳號的google task內容同步。
- 同步便簽
- 上次同步于 %1$s
- 取消
- 更換賬號
- 刪除賬號
- 設置
- 正在同步中，不能修改同步帳號
- 同步帳號已設置為%1$s
- 便籤
- 搜索便籤
- 正在搜索便籤
- 便籤中的文字
- 創建提醒
- 導出成功
- 與%1$s同步成功
- 正在獲取服務器便籤列表...
- 登陸%1$s...
- 正在同步本地便籤...
- 同步已取消
- 同步失敗
- 同步成功
- 同步便簽...
- 沒有關聯內容，點擊新建便簽。
- 訪客模式下，便籤內容不可見
-
\ No newline at end of file
diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
index b1858fe..62f7a24 100644
--- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -13,6 +13,26 @@
#FFFFFF
#2196F3
#FFFFFF
+<<<<<<< HEAD
+=======
+ #F5F5F5
+ #2196F3
+ #80FFFFFF
+ #FFFFFF
+ #F44336
+ #757575
+ #2196F3
+ #F44336
+ #2196F3
+ #2196F3
+ #FFFFFF
+ #E0E0E0
+ #F44336
+ #E0E0E0
+ #2196F3
+ #4CAF50
+ #333333
+>>>>>>> a
#808080
#000000
#335b5b5b
@@ -35,6 +55,9 @@
Notes 4x4
Delete
Call notes
+ 取消
+ 确认
+ 请再次绘制手势密码确认
cancel
set
Delete reminder successfully
@@ -55,6 +78,19 @@
Export text file (%1$s) to SD (%2$s) directory
(%d)
Have moved selected %1$d notes to %2$s folder
+ 您可以通过其他方式重置密码
+ 忘记密码？
+ 忘记密码
+ 请绘制手势密码
+ 手势匹配成功
+ 手势不匹配，请重试
+ 手势密码设置成功
+ 手势太短，至少需要4个点
+ 图案错误，还可以尝试%d次
+ 验证失败次数过多，笔记已锁定
+ 验证失败，还剩 %d 次机会
+ 请绘制手势密码解锁笔记
+ 验证成功
Input name
Note added to home
Remind me
@@ -80,6 +116,7 @@
Nothing selected, the operation is invalid
%d selected
Send to home
+ 设置手势密码
Settings
Share
Sync
@@ -94,6 +131,7 @@
Got it
Add note
...
+ 确定
Sync notes with google task
Sync account
Add account
@@ -133,6 +171,16 @@
- @color/text_color_state_list
- @color/hint_color
+<<<<<<< HEAD
+=======
+
+>>>>>>> a
- 短信
- 邮件
便签便签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知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消请绘制手势密码请再次绘制手势密码确认手势太短，至少需要4个点手势匹配成功手势不匹配，请重试手势密码设置成功设置手势密码
+ - %1$s 条符合“%2$s”的搜索结果
+ 确认请绘制手势密码解锁笔记验证失败次数过多，笔记已锁定验证失败，还剩 %d 次机会验证成功忘记密码您可以通过其他方式重置密码确定忘记密码？取消图案错误，还可以尝试%d次
+>>>>>>> a
- 短信
- 郵件
便簽便簽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
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> a
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 7fc4195..b773fa7 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,8 @@
+<<<<<<< HEAD
#Tue Dec 31 09:10:17 CST 2024
+=======
+#Mon Jan 06 20:13:24 CST 2025
+>>>>>>> a
base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
base.2=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
diff --git a/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
index 12da954..7e01825 100644
--- a/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
+++ b/Src/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
@@ -1 +1,5 @@
-D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_button_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_edittext_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_ic_warning.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_toast_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_login.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_register.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_layout_custom_toast.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values_values.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat
\ No newline at end of file
+<<<<<<< HEAD
+D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_button_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_edittext_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_ic_warning.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_toast_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_login.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_register.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_layout_custom_toast.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values_values.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat
+=======
+D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\color_text_color_state_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_button_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_edittext_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_ic_audio.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_ic_warning.png.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\drawable_toast_background.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_login.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_activity_register.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_layout_custom_toast.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_gesture_password.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\raw_introduction.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\values_values.arsc.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat D:\gitnote\notes\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat
+>>>>>>> a
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 8c28474..9d9accd 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 2619f4d..ac989dd 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/tool/BackupUtils$TextExport.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
index 80c1b84..8581c90 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
index 40f3b1c..7d3d293 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.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 ce35255..66594fc 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/DateTimePickerDialog.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 263d701..f7a5576 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.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 928ce77..e6dd700 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/LockPatternView$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$1.class
new file mode 100644
index 0000000..31d61a9
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$1.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$2.class
new file mode 100644
index 0000000..266e5ad
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$2.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$OnPatternListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$OnPatternListener.class
new file mode 100644
index 0000000..6f247d8
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$OnPatternListener.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$Point.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$Point.class
new file mode 100644
index 0000000..fc33993
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView$Point.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class
new file mode 100644
index 0000000..8319da2
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.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 4c358b1..8e8ded7 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/NoteGesturePasswordActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class
new file mode 100644
index 0000000..f64b096
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class
new file mode 100644
index 0000000..ce86b9b
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity$1.class
new file mode 100644
index 0000000..48a2774
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity$1.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class
new file mode 100644
index 0000000..ab0b538
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.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 1a05bac..b6809ea 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/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index bfec808..bb49674 100644
--- a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -34,6 +34,7 @@
18-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78
19
20 D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-137:19
21 android:debuggable="true"
22 android:icon="@drawable/icon_app"
@@ -265,3 +266,254 @@
147
148
149
+=======
+20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19
+21 android:debuggable="true"
+22 android:icon="@drawable/icon_app"
+22-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42
+23 android:label="@string/app_name"
+23-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41
+24 android:testOnly="true" >
+25
+26
+27 D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20
+28 android:name="net.micode.notes.login.LoginActivity"
+28-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48
+29 android:launchMode="singleTop" >
+29-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43
+30
+30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29
+31
+31-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69
+31-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66
+32
+33
+33-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77
+33-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74
+34
+35
+36
+37
+38
+38-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60
+38-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57
+39
+40 D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55
+41 android:name="net.micode.notes.ui.NotesListActivity"
+41-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49
+42 android:configChanges="keyboardHidden|orientation|screenSize"
+42-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74
+43 android:label="@string/app_name"
+43-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45
+44 android:launchMode="singleTop"
+44-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43
+45 android:theme="@style/NoteTheme"
+45-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45
+46 android:windowSoftInputMode="adjustPan" />
+46-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52
+47 D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70
+48 android:name="net.micode.notes.ui.NoteGesturePasswordActivity"
+48-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59
+49 android:label="@string/menu_set_gesture"
+49-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53
+50 android:theme="@android:style/Theme.Holo.Light.Dialog" />
+50-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67
+51 D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63
+52 android:name="net.micode.notes.ui.NoteGestureVerifyActivity"
+52-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57
+53 android:screenOrientation="portrait"
+53-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49
+54 android:theme="@style/GestureVerifyTheme"
+54-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54
+55 android:windowSoftInputMode="stateAlwaysHidden" />
+55-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60
+56
+57 D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-77:20
+58 android:name="net.micode.notes.ui.NoteEditActivity"
+58-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:52:13-48
+59 android:configChanges="keyboardHidden|orientation|screenSize"
+59-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:13-74
+60 android:launchMode="singleTop"
+60-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-43
+61 android:theme="@style/NoteTheme" >
+61-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-45
+62
+62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-63:29
+62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:17-38
+63
+63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-69
+63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:25-66
+64
+65
+65-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76
+65-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73
+66
+67
+67-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78
+67-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75
+68
+68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78
+68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75
+69
+70
+70-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:64:13-69:29
+71
+71-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:17-79
+71-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:25-76
+72
+73
+73-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76
+73-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73
+74
+75
+75-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78
+75-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75
+76
+76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78
+76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75
+77
+78
+78-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:70:13-73:29
+79
+79-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:17-71
+79-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:25-68
+80
+81
+81-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76
+81-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73
+82
+83
+84 D:\gitnote\notes\app\src\main\AndroidManifest.xml:74:13-76:54
+85 android:name="android.app.searchable"
+85-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:75:17-54
+86 android:resource="@xml/searchable" />
+86-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:17-51
+87
+88
+89
+90 D:\gitnote\notes\app\src\main\AndroidManifest.xml:80:9-83:43
+91 android:name="net.micode.notes.data.NotesProvider"
+91-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:81:13-63
+92 android:authorities="micode_notes"
+92-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:13-47
+93 android:multiprocess="true" />
+93-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-40
+94
+95
+96 D:\gitnote\notes\app\src\main\AndroidManifest.xml:86:9-96:20
+97 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+97-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:87:13-57
+98 android:label="@string/app_widget2x2" >
+98-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:13-50
+99
+99-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29
+100
+100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84
+100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81
+101
+101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85
+101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82
+102
+103
+104 D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58
+105 android:name="android.appwidget.provider"
+105-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58
+106 android:resource="@xml/widget_2x_info" />
+106-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55
+107
+108 D:\gitnote\notes\app\src\main\AndroidManifest.xml:98:9-108:20
+109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+109-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:99:13-57
+110 android:label="@string/app_widget4x4" >
+110-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:13-50
+111
+111-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29
+112
+112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84
+112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81
+113
+113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85
+113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82
+114
+115
+116 D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58
+117 android:name="android.appwidget.provider"
+117-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58
+118 android:resource="@xml/widget_4x_info" />
+118-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55
+119
+120
+121
+122
+122-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:9-115:20
+122-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:19-55
+123
+123-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:112:13-114:29
+124
+124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:17-79
+124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:25-76
+125
+126
+127
+128
+129 D:\gitnote\notes\app\src\main\AndroidManifest.xml:118:9-120:41
+130 android:name="net.micode.notes.ui.AlarmReceiver"
+130-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:119:13-61
+131 android:process=":remote" />
+131-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:13-38
+132
+133
+134 D:\gitnote\notes\app\src\main\AndroidManifest.xml:123:9-127:87
+135 android:name="net.micode.notes.ui.AlarmAlertActivity"
+135-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:124:13-50
+136 android:label="@string/app_name"
+136-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:13-45
+137 android:launchMode="singleInstance"
+137-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-48
+138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+138-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-75
+139
+140
+141 D:\gitnote\notes\app\src\main\AndroidManifest.xml:130:9-134:72
+142 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+142-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:131:13-71
+143 android:label="@string/preferences_title"
+143-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:13-54
+144 android:launchMode="singleTop"
+144-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-43
+145 android:theme="@android:style/Theme.Holo.Light" />
+145-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-60
+146
+147
+148 D:\gitnote\notes\app\src\main\AndroidManifest.xml:137:9-139:40
+149 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+149-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:138:13-74
+150 android:exported="false" />
+150-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:13-37
+151
+152
+153 D:\gitnote\notes\app\src\main\AndroidManifest.xml:142:9-144:52
+154 android:name="android.app.default_searchable"
+154-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58
+155 android:value=".ui.NoteEditActivity" />
+155-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:13-49
+156
+157
+158
+>>>>>>> a
diff --git a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index e40c6ac..3f94dc0 100644
--- a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -43,7 +43,19 @@
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
android:windowSoftInputMode="adjustPan" />
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> a
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> a
>>>>>> a
},
"to": {
"startLines": "2",
@@ -25,20 +31,78 @@
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
+<<<<<<< HEAD
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+=======
+ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,135,136,-1,-1,-1,-1,-1,133,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-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,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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7525,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7426,7315,7372,-1,-1,-1,-1,-1,7196,-1,-1,-1,7259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7491,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7558,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7486,7367,7421,-1,-1,-1,-1,-1,7254,-1,-1,-1,7310,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1876,1938,2023,2104,2169,2226,2280,2336,2387,2445,2503,2562,2625,2692,2761,2821,2877,2927,2986,3029,3082,3125,3176,3226,3286,3339,3390,3436,3484,3532,3578,3625,3675,3720,3779,3831,3883,3926,3973,4029,4084,4139,4191,4235,4277,4318,4368,4427,4478,4527,4576,4623,4670,4717,4762,4813,4866,4900,4975,5034,5091,5165,5229,5298,5376,5486,5590,5663,5729,5784,5849,5914,5963,6046,6124,6162,6207,6255,6317,6374,6429,6488,6555,6613,6675,6723,6768,6816,6867,6933",
+ "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,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,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,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1871,1933,2018,2099,2164,2221,2275,2331,2382,2440,2498,2557,2620,2687,2756,2816,2872,2922,2981,3024,3077,3120,3171,3221,3281,3334,3385,3431,3479,3527,3573,3620,3670,3715,3774,3826,3878,3921,3968,4024,4079,4134,4186,4230,4272,4313,4363,4422,4473,4522,4571,4618,4665,4712,4757,4808,4861,4895,4970,5029,5086,5160,5224,5293,5371,5481,5585,5658,5724,5779,5844,5909,5958,6041,6119,6157,6202,6250,6312,6369,6424,6483,6550,6608,6670,6718,6763,6811,6862,6928,6994"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "16",
+ "startColumns": "4",
+ "startOffsets": "333",
+ "endLines": "19",
+ "endColumns": "19",
+ "endOffsets": "438"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+>>>>>>> a
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+<<<<<<< HEAD
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+=======
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+>>>>>>> a
}
}
]
@@ -49,6 +113,7 @@
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
"from": {
+<<<<<<< HEAD
"startLines": "17,19,18,20,21,16",
"startColumns": "4,4,4,4,4,4",
"startOffsets": "388,515,451,574,632,331",
@@ -61,19 +126,106 @@
"startOffsets": "420,471,518,570,615,660",
"endColumns": "50,46,51,44,44,56",
"endOffsets": "466,513,565,610,655,712"
+=======
+ "startLines": "-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",
+ "startOffsets": "-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": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594",
+ "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56",
+ "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646"
}
},
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "40,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216",
+ "endLines": "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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\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:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endLines": "-1,82,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endColumns": "-1,12,-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endOffsets": "-1,3432,-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
+ "startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "10306,10584,10991,11199,11410,11575,11735,11918,12103,12288,12491,12697,12880",
+ "endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "10579,10986,11194,11405,11570,11730,11913,12098,12283,12486,12692,12875,13076"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\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": "35,36,37,38,39",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "1651,1703,1756,1809,1861",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "1698,1751,1804,1856,1908"
+>>>>>>> a
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
+ "map": [
+ {
+<<<<<<< HEAD
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
+=======
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
+>>>>>>> a
+ "from": {
+ "startLines": "17,19,18,20,21,16",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "388,515,451,574,632,331",
+ "endColumns": "50,46,51,44,44,56",
+ "endOffsets": "434,557,498,614,672,383"
+ },
+ "to": {
+<<<<<<< HEAD
"startLines": "23,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,127,128,129",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1993,2044,2128,2222,2330,2401,2485,2568,2634,2717,2819,2880,2942,2993,3071,3124,3184,3289,3348,3450,3505,3576,3625,3683,3730,3789,3846,3917,3978,4035,4085,4137,4190,4240,4290,4350,4403,4469,4531,4594,4641,4696,4784,4842,4904,4954,4999,5042,5102,5169,5224,5279,5332,5379,5432,5488,5536,5591,5644,5728,5795,5859,5955,6029,6110,6199,6362,6506,6585,6660,6742,6801,6881,6961,7016,7138,7241,7282,7335,7392,7466,7531,7599,7685,7765,7834,7928,7987,8042,8104,8164,8274",
@@ -83,6 +235,35 @@
}
},
{
+=======
+ "startLines": "12,13,14,15,16,17",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "420,471,518,570,615,660",
+ "endColumns": "50,46,51,44,44,56",
+ "endOffsets": "466,513,565,610,655,712"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "136,72,75,74,73,19,20,21,118,119,130,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,132,133,134,131,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,135,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,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,4,4,4,4,4",
+ "startOffsets": "8407,3898,4159,4063,3994,827,870,922,7506,7555,8065,7951,7900,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,8009,8188,8239,8297,8129,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,8355,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7859,7732,7675,7785,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "140,72,75,74,73,19,20,21,118,119,130,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,132,133,134,131,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,135,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,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,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,55,50,57,57,58,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8811,3989,4237,4154,4058,865,917,969,7550,7613,8124,8004,7946,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,8060,8234,8292,8350,8183,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,8402,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7895,7780,7727,7854,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ },
+ "to": {
+ "startLines": "23,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,127,128,129,130,131,132,133,134,135,136",
+ "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,4,4,4,4,4",
+ "startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1999,2057,2108,2192,2286,2394,2465,2549,2632,2698,2781,2883,2944,3006,3057,3135,3188,3248,3353,3412,3514,3570,3621,3679,3737,3796,3851,3922,3971,4029,4076,4135,4192,4263,4324,4381,4431,4483,4536,4586,4636,4696,4749,4815,4877,4940,4987,5042,5130,5188,5250,5302,5352,5397,5440,5500,5567,5622,5677,5730,5777,5830,5886,5934,5989,6042,6126,6193,6257,6353,6427,6508,6597,6760,6904,6983,7058,7140,7199,7279,7359,7414,7536,7639,7680,7733,7790,7864,7929,7997,8083,8163,8232,8326,8385,8440,8502,8562,8672",
+ "endLines": "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,127,128,129,130,131,132,133,134,135,136",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,55,50,57,57,58,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1327,1423,1506,1602,1671,1714,1766,1818,1867,1930,1994,2052,2103,2187,2281,2389,2460,2544,2627,2693,2776,2878,2939,3001,3052,3130,3183,3243,3348,3407,3509,3565,3616,3674,3732,3791,3846,3917,3966,4024,4071,4130,4187,4258,4319,4376,4426,4478,4531,4581,4631,4691,4744,4810,4872,4935,4982,5037,5125,5183,5245,5297,5347,5392,5435,5495,5562,5617,5672,5725,5772,5825,5881,5929,5984,6037,6121,6188,6252,6348,6422,6503,6592,6755,6899,6978,7053,7135,7194,7274,7354,7409,7531,7634,7675,7728,7785,7859,7924,7992,8078,8158,8227,8321,8380,8435,8497,8557,8667,8757"
+ }
+ },
+ {
+>>>>>>> a
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "10,18",
@@ -112,16 +293,26 @@
"endOffsets": "3025,2001,2249,2720,2454,599,808,1017,1264,1515,393,1756"
},
"to": {
+<<<<<<< HEAD
"startLines": "130,135,139,143,147,150,154,158,162,166,170,174",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8364,8642,8850,9061,9226,9386,9569,9754,9939,10142,10348,10531",
"endLines": "134,138,142,146,149,153,157,161,165,169,173,177",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8637,8845,9056,9221,9381,9564,9749,9934,10137,10343,10526,10727"
+=======
+ "startLines": "137,142,146,150,154,157,161,165,169,173,177,181",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8762,9040,9248,9459,9624,9784,9967,10152,10337,10540,10746,10929",
+ "endLines": "141,145,149,153,156,160,164,168,172,176,180,184",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "9035,9243,9454,9619,9779,9962,10147,10332,10535,10741,10924,11125"
+>>>>>>> a
}
},
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml",
+<<<<<<< HEAD
"from": {
"startLines": "15,17,19,21,13",
"startColumns": "4,4,4,4,4",
@@ -144,21 +335,21 @@
"map": [
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+=======
+>>>>>>> a
"from": {
- "startLines": "16",
- "startColumns": "4",
- "startOffsets": "333",
- "endLines": "19",
- "endColumns": "19",
- "endOffsets": "438"
+ "startLines": "15,17,19,21,13",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "335,409,484,558,262",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "382,457,532,605,309"
},
"to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
+ "startLines": "18,19,20,21,22",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "717,769,822,875,927",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "764,817,870,922,974"
}
},
{
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 cf710c3..963bbd1 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
@@ -5,6 +5,48 @@
"map": [
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+<<<<<<< HEAD
+=======
+ "from": {
+ "startLines": "-1",
+ "startColumns": "-1",
+ "startOffsets": "-1"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,135,136,-1,-1,-1,-1,-1,133,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-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,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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7525,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7426,7315,7372,-1,-1,-1,-1,-1,7196,-1,-1,-1,7259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7491,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7558,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7486,7367,7421,-1,-1,-1,-1,-1,7254,-1,-1,-1,7310,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1876,1938,2023,2104,2169,2226,2280,2336,2387,2445,2503,2562,2625,2692,2761,2821,2877,2927,2986,3029,3082,3125,3176,3226,3286,3339,3390,3436,3484,3532,3578,3625,3675,3720,3779,3831,3883,3926,3973,4029,4084,4139,4191,4235,4277,4318,4368,4427,4478,4527,4576,4623,4670,4717,4762,4813,4866,4900,4975,5034,5091,5165,5229,5298,5376,5486,5590,5663,5729,5784,5849,5914,5963,6046,6124,6162,6207,6255,6317,6374,6429,6488,6555,6613,6675,6723,6768,6816,6867,6933",
+ "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,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,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,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1871,1933,2018,2099,2164,2221,2275,2331,2382,2440,2498,2557,2620,2687,2756,2816,2872,2922,2981,3024,3077,3120,3171,3221,3281,3334,3385,3431,3479,3527,3573,3620,3670,3715,3774,3826,3878,3921,3968,4024,4079,4134,4186,4230,4272,4313,4363,4422,4473,4522,4571,4618,4665,4712,4757,4808,4861,4895,4970,5029,5086,5160,5224,5293,5371,5481,5585,5658,5724,5779,5844,5909,5958,6041,6119,6157,6202,6250,6312,6369,6424,6483,6550,6608,6670,6718,6763,6811,6862,6928,6994"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml",
+ "map": [
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+>>>>>>> a
"from": {
"startLines": "16",
"startColumns": "4",
@@ -25,6 +67,7 @@
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
+<<<<<<< HEAD
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
@@ -39,6 +82,22 @@
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+=======
+ "startLines": "128,71,70,69,68,19,20,21,112,113,122,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,124,125,126,123,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,127,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6930,3495,3429,3356,3306,827,867,915,6083,6128,6588,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6532,6711,6762,6820,6652,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,6878,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "130,71,70,69,68,19,20,21,112,113,122,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,124,125,126,123,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,127,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,55,50,57,57,58,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7102,3563,3490,3424,3351,862,910,958,6123,6180,6647,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6583,6757,6815,6873,6706,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,6925,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "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,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,948,1002,1052,1114,1182,1259,1318,1383,1446,1501,1561,1624,1678,1738,1791,1853,1938,2019,2075,2126,2184,2242,2301,2351,2410,2453,2506,2549,2600,2650,2710,2763,2814,2860,2908,2956,3002,3049,3099,3144,3203,3255,3307,3350,3397,3453,3508,3563,3615,3659,3701,3742,3792,3851,3902,3951,4000,4047,4094,4141,4186,4237,4290,4365,4424,4481,4555,4619,4688,4766,4876,4980,5053,5119,5174,5239,5304,5353,5436,5514,5552,5597,5645,5707,5764,5819,5878,5945,6003,6065,6113,6158,6206,6257,6323",
+ "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,109,110,111,112,113",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,55,50,57,57,58,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,943,997,1047,1109,1177,1254,1313,1378,1441,1496,1556,1619,1673,1733,1786,1848,1933,2014,2070,2121,2179,2237,2296,2346,2405,2448,2501,2544,2595,2645,2705,2758,2809,2855,2903,2951,2997,3044,3094,3139,3198,3250,3302,3345,3392,3448,3503,3558,3610,3654,3696,3737,3787,3846,3897,3946,3995,4042,4089,4136,4181,4232,4285,4360,4419,4476,4550,4614,4683,4761,4871,4975,5048,5114,5169,5234,5299,5348,5431,5509,5547,5592,5640,5702,5759,5814,5873,5940,5998,6060,6108,6153,6201,6252,6318,6384"
+>>>>>>> a
}
}
]
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 b8205b1..3ee56d4 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
@@ -1,11 +1,12 @@
{
"logs": [
{
- "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+ "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
"map": [
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
"from": {
+<<<<<<< HEAD
"startLines": "17,19,18,20,21,16",
"startColumns": "4,4,4,4,4,4",
"startOffsets": "388,515,451,574,632,331",
@@ -18,36 +19,65 @@
"startOffsets": "420,471,518,570,615,660",
"endColumns": "50,46,51,44,44,56",
"endOffsets": "466,513,565,610,655,712"
+=======
+ "startLines": "-1,-1,-1,23,27,29,28,38,40,36,34,33,37,24,25,32,30,31,39,26,-1,-1,-1",
+ "startColumns": "-1,-1,-1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,711,931,1045,991,1504,1614,1398,1323,1269,1451,764,823,1215,1103,1158,1558,878,-1,-1,-1",
+ "endColumns": "-1,-1,-1,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,-1,-1,-1",
+ "endOffsets": "-1,-1,-1,759,986,1098,1040,1553,1662,1446,1371,1318,1499,818,873,1264,1153,1210,1609,926,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594",
+ "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56",
+ "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646"
+>>>>>>> a
}
},
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ "startLines": "148,-1,-1,-1,-1,-1,-1,-1,-1,-1,147,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,145,143,144,-1,-1,-1,-1,-1,141,-1,-1,-1,142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,146,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-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,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",
+ "startOffsets": "9040,-1,-1,-1,-1,-1,-1,-1,-1,-1,9002,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8903,8792,8849,-1,-1,-1,-1,-1,8673,-1,-1,-1,8736,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8968,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "152,-1,-1,-1,-1,-1,-1,-1,-1,-1,147,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,145,143,144,-1,-1,-1,-1,-1,141,-1,-1,-1,142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,146,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "9444,-1,-1,-1,-1,-1,-1,-1,-1,-1,9035,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8963,8844,8898,-1,-1,-1,-1,-1,8731,-1,-1,-1,8787,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8997,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": {
+<<<<<<< HEAD
"startLines": "23,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,127,128,129",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1993,2044,2128,2222,2330,2401,2485,2568,2634,2717,2819,2880,2942,2993,3071,3124,3184,3289,3348,3450,3505,3576,3625,3683,3730,3789,3846,3917,3978,4035,4085,4137,4190,4240,4290,4350,4403,4469,4531,4594,4641,4696,4784,4842,4904,4954,4999,5042,5102,5169,5224,5279,5332,5379,5432,5488,5536,5591,5644,5728,5795,5859,5955,6029,6110,6199,6362,6506,6585,6660,6742,6801,6881,6961,7016,7138,7241,7282,7335,7392,7466,7531,7599,7685,7765,7834,7928,7987,8042,8104,8164,8274",
"endLines": "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,127,128,129",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1327,1423,1506,1602,1671,1714,1766,1818,1867,1930,1988,2039,2123,2217,2325,2396,2480,2563,2629,2712,2814,2875,2937,2988,3066,3119,3179,3284,3343,3445,3500,3571,3620,3678,3725,3784,3841,3912,3973,4030,4080,4132,4185,4235,4285,4345,4398,4464,4526,4589,4636,4691,4779,4837,4899,4949,4994,5037,5097,5164,5219,5274,5327,5374,5427,5483,5531,5586,5639,5723,5790,5854,5950,6024,6105,6194,6357,6501,6580,6655,6737,6796,6876,6956,7011,7133,7236,7277,7330,7387,7461,7526,7594,7680,7760,7829,7923,7982,8037,8099,8159,8269,8359"
+=======
+ "startLines": "40,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216",
+ "endLines": "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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301"
+>>>>>>> a
}
},
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
+<<<<<<< HEAD
"startLines": "10,18",
"startColumns": "4,4",
"startOffsets": "237,524",
"endLines": "15,21",
"endColumns": "19,19",
"endOffsets": "492,639"
+=======
+ "startLines": "-1,-1",
+ "startColumns": "-1,-1",
+ "startOffsets": "-1,-1"
+>>>>>>> a
},
"to": {
"startLines": "2,8",
@@ -61,6 +91,7 @@
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml",
"from": {
+<<<<<<< HEAD
"startLines": "71,49,55,66,61,15,20,25,31,37,10,43",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "2752,1798,2043,2507,2299,421,628,837,1066,1314,215,1560",
@@ -75,11 +106,25 @@
"endLines": "134,138,142,146,149,153,157,161,165,169,173,177",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8637,8845,9056,9221,9381,9564,9749,9934,10137,10343,10526,10727"
+=======
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "165,170,174,178,182,185,189,193,197,201,205,209",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "10306,10584,10792,11003,11168,11328,11511,11696,11881,12084,12290,12473",
+ "endLines": "169,173,177,181,184,188,192,196,200,204,208,212",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "10579,10787,10998,11163,11323,11506,11691,11876,12079,12285,12468,12669"
+>>>>>>> a
}
},
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
+<<<<<<< HEAD
"startLines": "15,17,19,21,13",
"startColumns": "4,4,4,4,4",
"startOffsets": "335,409,484,558,262",
@@ -92,6 +137,104 @@
"startOffsets": "717,769,822,875,927",
"endColumns": "51,52,52,51,51",
"endOffsets": "764,817,870,922,974"
+=======
+ "startLines": "-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "35,36,37,38,39",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "1651,1703,1756,1809,1861",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "1698,1751,1804,1856,1908"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+ "map": [
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.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",
+ "startColumns": "-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"
+ },
+ "to": {
+ "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594",
+ "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56",
+ "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "40,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216",
+ "endLines": "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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\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:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endLines": "-1,82,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endColumns": "-1,12,-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endOffsets": "-1,3432,-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "10306,10584,10991,11199,11410,11575,11735,11918,12103,12288,12491,12697,12880",
+ "endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "10579,10986,11194,11405,11570,11730,11913,12098,12283,12486,12692,12875,13076"
+ }
+ },
+ {
+ "source": "D:\\gitnote\\notes\\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": "35,36,37,38,39",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "1651,1703,1756,1809,1861",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "1698,1751,1804,1856,1908"
+>>>>>>> a
}
}
]
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 b7bfa75..7e59262 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,77 +1,176 @@
[
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
},
{
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_text_color_state_list.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\text_color_state_list.xml"
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_panel_background.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_panel_background.xml"
+>>>>>>> a
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
+ },
+ {
+<<<<<<< HEAD
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "D:\\Notes\\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_edit_title_yellow.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
+>>>>>>> a
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
+ },
+ {
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/drawable_toast_background.xml.flat",
"source": "net.micode.notes.app-main-7:/drawable/toast_background.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_button_background.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\button_background.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png"
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png"
+>>>>>>> a
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
+ },
+ {
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_activity_register.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/activity_register.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
- "source": "net.micode.notes.app-main-7:/raw/introduction"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_warning.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_warning.png"
+>>>>>>> a
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
+ },
+ {
+<<<<<<< HEAD
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "D:\\Notes\\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_list_white_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
+>>>>>>> a
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
+ },
+ {
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
+>>>>>>> a
},
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
},
{
+<<<<<<< HEAD
"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"
},
@@ -82,16 +181,33 @@
{
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
- "source": "net.micode.notes.app-main-7:/xml/preferences.xml"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
+>>>>>>> a
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
+ },
+ {
+<<<<<<< HEAD
"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"
},
@@ -102,92 +218,206 @@
{
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_verify.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_verify.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
+>>>>>>> a
},
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
+ "source": "D:\\Notes\\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_blue_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
+ "source": "D:\\Notes\\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_white_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_audio.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_audio.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
},
{
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "D:\\Notes\\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_edit_title_green.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
+>>>>>>> a
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png"
+ },
+ {
+<<<<<<< HEAD
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
+>>>>>>> a
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
+ },
+ {
+<<<<<<< HEAD
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_layout_custom_toast.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\layout_custom_toast.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
+>>>>>>> a
},
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_lock_outline.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_lock_outline.xml"
},
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_register.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_register.xml"
},
{
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
},
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png"
+>>>>>>> a
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png"
+ },
+ {
+<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "D:\\Notes\\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_font_super.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
+>>>>>>> a
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
+ },
+ {
+<<<<<<< HEAD
"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"
},
@@ -374,16 +604,21 @@
{
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png"
+>>>>>>> a
},
{
- "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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
},
{
+<<<<<<< HEAD
"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"
},
@@ -406,13 +641,130 @@
{
"merged": "net.micode.notes.app-merged_res-5:/layout_activity_login.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/activity_login.xml"
+=======
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_background.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_background.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_toast_background.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\toast_background.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_gesture_verify.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/note_gesture_verify.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edittext_background.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edittext_background.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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_password.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_password.xml"
+>>>>>>> a
},
{
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
+ },
+ {
+<<<<<<< HEAD
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_login.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_login.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_button_background.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_button_background.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png"
+ },
+ {
+ "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
+>>>>>>> a
}
]
\ No newline at end of file
diff --git a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index e40c6ac..3f94dc0 100644
--- a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -43,7 +43,19 @@
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
android:windowSoftInputMode="adjustPan" />
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> a
>>>>>> a
int dimen text_font_size_large 0x7f030000
int dimen text_font_size_medium 0x7f030001
int dimen text_font_size_normal 0x7f030002
@@ -37,7 +63,15 @@ int drawable font_normal 0x7f040013
int drawable font_size_selector_bg 0x7f040014
int drawable font_small 0x7f040015
int drawable font_super 0x7f040016
+<<<<<<< HEAD
+int drawable ic_audio 0x7f040017
+=======
+int drawable gesture_background 0x7f040047
+int drawable gesture_button_background 0x7f040048
+int drawable gesture_panel_background 0x7f040049
int drawable ic_audio 0x7f040017
+int drawable ic_lock_outline 0x7f04004a
+>>>>>>> a
int drawable ic_warning 0x7f040018
int drawable icon_app 0x7f040019
int drawable list_background 0x7f04001a
@@ -93,6 +127,7 @@ int id amPm 0x7f050004
int id btnBackToLogin 0x7f050005
int id btnLogin 0x7f050006
int id btnRegister 0x7f050007
+<<<<<<< HEAD
int id btn_logout 0x7f050008
int id btn_new_note 0x7f050009
int id btn_set_bg_color 0x7f05000a
@@ -165,6 +200,86 @@ int id tv_title 0x7f05004c
int id tv_title_bar 0x7f05004d
int id widget_bg_image 0x7f05004e
int id widget_text 0x7f05004f
+=======
+int id btn_confirm 0x7f050008
+int id btn_logout 0x7f050009
+int id btn_new_note 0x7f05000a
+int id btn_set_bg_color 0x7f05000b
+int id cb_edit_item 0x7f05000c
+int id date 0x7f05000d
+int id delete 0x7f05000e
+int id etLoginPassword 0x7f05000f
+int id etLoginUsername 0x7f050010
+int id etPassword 0x7f050011
+int id etUsername 0x7f050012
+int id et_edit_text 0x7f050013
+int id et_foler_name 0x7f050014
+int id font_size_selector 0x7f050015
+int id gesture_status 0x7f050017
+int id hour 0x7f050018
+int id imageView 0x7f050019
+int id iv_alert_icon 0x7f05001a
+int id iv_bg_blue 0x7f05001b
+int id iv_bg_blue_select 0x7f05001c
+int id iv_bg_green 0x7f05001d
+int id iv_bg_green_select 0x7f05001e
+int id iv_bg_red 0x7f05001f
+int id iv_bg_red_select 0x7f050020
+int id iv_bg_white 0x7f050021
+int id iv_bg_white_select 0x7f050022
+int id iv_bg_yellow 0x7f050023
+int id iv_bg_yellow_select 0x7f050024
+int id iv_large_select 0x7f050025
+int id iv_lock_icon 0x7f050055
+int id iv_medium_select 0x7f050026
+int id iv_small_select 0x7f050027
+int id iv_super_select 0x7f050028
+int id ll_font_large 0x7f050029
+int id ll_font_normal 0x7f05002a
+int id ll_font_small 0x7f05002b
+int id ll_font_super 0x7f05002c
+int id lock_pattern_view 0x7f050054
+int id menu_alert 0x7f05002d
+int id menu_delete 0x7f05002e
+int id menu_delete_remind 0x7f05002f
+int id menu_export_text 0x7f050030
+int id menu_font_size 0x7f050031
+int id menu_list_mode 0x7f050032
+int id menu_new_folder 0x7f050033
+int id menu_new_note 0x7f050034
+int id menu_search 0x7f050035
+int id menu_send_to_desktop 0x7f050036
+int id menu_set_gesture 0x7f050053
+int id menu_setting 0x7f050037
+int id menu_share 0x7f050038
+int id menu_sync 0x7f050039
+int id minute 0x7f05003a
+int id move 0x7f05003b
+int id navigation_bar 0x7f05003c
+int id note_bg_color_selector 0x7f05003d
+int id note_edit_list 0x7f05003e
+int id note_edit_view 0x7f05003f
+int id note_item 0x7f050040
+int id note_title 0x7f050041
+int id notes_list 0x7f050042
+int id prefenerece_sync_status_textview 0x7f050043
+int id preference_sync_button 0x7f050044
+int id record_audio_btn 0x7f050045
+int id selection_menu 0x7f050046
+int id speech_to_text_btn 0x7f050047
+int id sv_note_edit 0x7f050048
+int id textView 0x7f050049
+int id tv_alert_date 0x7f05004a
+int id tv_folder_name 0x7f05004b
+int id tv_forgot_pattern 0x7f050056
+int id tv_modified_date 0x7f05004c
+int id tv_name 0x7f05004d
+int id tv_time 0x7f05004e
+int id tv_title 0x7f05004f
+int id tv_title_bar 0x7f050050
+int id widget_bg_image 0x7f050051
+int id widget_text 0x7f050052
+>>>>>>> a
int layout account_dialog_title 0x7f060000
int layout activity_login 0x7f060001
int layout activity_register 0x7f060002
@@ -175,6 +290,7 @@ int layout folder_list_item 0x7f060006
int layout layout_custom_toast 0x7f060007
int layout note_edit 0x7f060008
int layout note_edit_list_item 0x7f060009
+<<<<<<< HEAD
int layout note_item 0x7f06000a
int layout note_list 0x7f06000b
int layout note_list_dropdown_menu 0x7f06000c
@@ -182,6 +298,17 @@ int layout note_list_footer 0x7f06000d
int layout settings_header 0x7f06000e
int layout widget_2x 0x7f06000f
int layout widget_4x 0x7f060010
+=======
+int layout note_gesture_password 0x7f06000a
+int layout note_gesture_verify 0x7f060012
+int layout note_item 0x7f06000b
+int layout note_list 0x7f06000c
+int layout note_list_dropdown_menu 0x7f06000d
+int layout note_list_footer 0x7f06000e
+int layout settings_header 0x7f06000f
+int layout widget_2x 0x7f060010
+int layout widget_4x 0x7f060011
+>>>>>>> a
int menu call_note_edit 0x7f070000
int menu call_record_folder 0x7f070001
int menu note_edit 0x7f070002
@@ -200,6 +327,7 @@ int string app_widget2x2 0x7f0a0005
int string app_widget4x4 0x7f0a0006
int string button_delete 0x7f0a0007
int string call_record_folder_name 0x7f0a0008
+<<<<<<< HEAD
int string datetime_dialog_cancel 0x7f0a0009
int string datetime_dialog_ok 0x7f0a000a
int string delete_remind_time_message 0x7f0a000b
@@ -294,6 +422,121 @@ int string ticker_syncing 0x7f0a0063
int string widget_havenot_content 0x7f0a0064
int string widget_under_visit_mode 0x7f0a0065
int style CustomEditTextStyle 0x7f0b0000
+=======
+int string cancel 0x7f0a0071
+int string confirm_gesture 0x7f0a0009
+int string confirm_gesture_pattern 0x7f0a000a
+int string datetime_dialog_cancel 0x7f0a000b
+int string datetime_dialog_ok 0x7f0a000c
+int string delete_remind_time_message 0x7f0a000d
+int string error_note_empty_for_clock 0x7f0a000e
+int string error_note_empty_for_send_to_desktop 0x7f0a000f
+int string error_note_not_exist 0x7f0a0010
+int string error_sdcard_export 0x7f0a0011
+int string error_sdcard_unmounted 0x7f0a0012
+int string error_sync_cancelled 0x7f0a0013
+int string error_sync_internal 0x7f0a0014
+int string error_sync_network 0x7f0a0015
+int string failed_sdcard_export 0x7f0a0016
+int string file_name_txt_format 0x7f0a0017
+int string file_path 0x7f0a0018
+int string folder_exist 0x7f0a0019
+int string format_date_ymd 0x7f0a001a
+int string format_datetime_mdhm 0x7f0a001b
+int string format_exported_file_location 0x7f0a001c
+int string format_folder_files_count 0x7f0a001d
+int string format_move_notes_to_folder 0x7f0a001e
+int string gesture_forgot_message 0x7f0a0072
+int string gesture_forgot_pattern 0x7f0a0073
+int string gesture_forgot_title 0x7f0a0074
+int string gesture_instruction 0x7f0a001f
+int string gesture_matched 0x7f0a0020
+int string gesture_not_matched 0x7f0a0021
+int string gesture_password_set 0x7f0a0022
+int string gesture_too_short 0x7f0a0023
+int string gesture_verify_error 0x7f0a0075
+int string gesture_verify_fail_max 0x7f0a006e
+int string gesture_verify_fail_tries 0x7f0a006f
+int string gesture_verify_hint 0x7f0a0070
+int string gesture_verify_success 0x7f0a0076
+int string hint_foler_name 0x7f0a0024
+int string info_note_enter_desktop 0x7f0a0025
+int string menu_alert 0x7f0a0026
+int string menu_create_folder 0x7f0a0027
+int string menu_delete 0x7f0a0028
+int string menu_deselect_all 0x7f0a0029
+int string menu_export_text 0x7f0a002a
+int string menu_folder_change_name 0x7f0a002b
+int string menu_folder_delete 0x7f0a002c
+int string menu_folder_view 0x7f0a002d
+int string menu_font_large 0x7f0a002e
+int string menu_font_normal 0x7f0a002f
+int string menu_font_size 0x7f0a0030
+int string menu_font_small 0x7f0a0031
+int string menu_font_super 0x7f0a0032
+int string menu_list_mode 0x7f0a0033
+int string menu_move 0x7f0a0034
+int string menu_move_parent_folder 0x7f0a0035
+int string menu_normal_mode 0x7f0a0036
+int string menu_remove_remind 0x7f0a0037
+int string menu_search 0x7f0a0038
+int string menu_select_all 0x7f0a0039
+int string menu_select_none 0x7f0a003a
+int string menu_select_title 0x7f0a003b
+int string menu_send_to_desktop 0x7f0a003c
+int string menu_set_gesture 0x7f0a003d
+int string menu_setting 0x7f0a003e
+int string menu_share 0x7f0a003f
+int string menu_sync 0x7f0a0040
+int string menu_sync_cancel 0x7f0a0041
+int string menu_title_select_folder 0x7f0a0042
+int string note_alert_expired 0x7f0a0043
+int string note_link_email 0x7f0a0044
+int string note_link_other 0x7f0a0045
+int string note_link_tel 0x7f0a0046
+int string note_link_web 0x7f0a0047
+int string notealert_enter 0x7f0a0048
+int string notealert_ok 0x7f0a0049
+int string notelist_menu_new 0x7f0a004a
+int string notelist_string_info 0x7f0a004b
+int string ok 0x7f0a0077
+int string preferences_account_summary 0x7f0a004c
+int string preferences_account_title 0x7f0a004d
+int string preferences_add_account 0x7f0a004e
+int string preferences_bg_random_appear_title 0x7f0a004f
+int string preferences_button_sync_cancel 0x7f0a0050
+int string preferences_button_sync_immediately 0x7f0a0051
+int string preferences_dialog_change_account_title 0x7f0a0052
+int string preferences_dialog_change_account_warn_msg 0x7f0a0053
+int string preferences_dialog_select_account_tips 0x7f0a0054
+int string preferences_dialog_select_account_title 0x7f0a0055
+int string preferences_last_sync_time 0x7f0a0056
+int string preferences_last_sync_time_format 0x7f0a0057
+int string preferences_menu_cancel 0x7f0a0058
+int string preferences_menu_change_account 0x7f0a0059
+int string preferences_menu_remove_account 0x7f0a005a
+int string preferences_title 0x7f0a005b
+int string preferences_toast_cannot_change_account 0x7f0a005c
+int string preferences_toast_success_set_accout 0x7f0a005d
+int string search 0x7f0a005e
+int string search_hint 0x7f0a005f
+int string search_label 0x7f0a0060
+int string search_setting_description 0x7f0a0061
+int string set_remind_time_message 0x7f0a0062
+int string success_sdcard_export 0x7f0a0063
+int string success_sync_account 0x7f0a0064
+int string sync_progress_init_list 0x7f0a0065
+int string sync_progress_login 0x7f0a0066
+int string sync_progress_syncing 0x7f0a0067
+int string ticker_cancel 0x7f0a0068
+int string ticker_fail 0x7f0a0069
+int string ticker_success 0x7f0a006a
+int string ticker_syncing 0x7f0a006b
+int string widget_havenot_content 0x7f0a006c
+int string widget_under_visit_mode 0x7f0a006d
+int style CustomEditTextStyle 0x7f0b0000
+int style GestureVerifyTheme 0x7f0b000c
+>>>>>>> a
int style HighlightTextAppearancePrimary 0x7f0b0001
int style HighlightTextAppearanceSecondary 0x7f0b0002
int style NoteActionBarStyle 0x7f0b0003
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 3477d96..e4ab46b 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,5 +1,26 @@
-net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:string/gesture_verify_success = 0x7f0a0076
+net.micode.notes:color/gesture_link_color = 0x7f020014
+net.micode.notes:layout/layout_custom_toast = 0x7f060007
+net.micode.notes:color/gesture_button_ripple = 0x7f02000d
+net.micode.notes:string/gesture_verify_error = 0x7f0a0075
+net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a006f
+net.micode.notes:id/tv_forgot_pattern = 0x7f050056
+net.micode.notes:string/format_folder_files_count = 0x7f0a001d
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0055
+net.micode.notes:string/ticker_success = 0x7f0a006a
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a005a
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0001
+net.micode.notes:string/menu_sync = 0x7f0a0040
+net.micode.notes:color/gesture_background = 0x7f02000b
+net.micode.notes:color/gesture_button_text = 0x7f02000e
+net.micode.notes:color/gesture_hint_color = 0x7f020010
+net.micode.notes:color/gesture_panel_border = 0x7f020016
+net.micode.notes:string/success_sdcard_export = 0x7f0a0063
+net.micode.notes:string/notelist_string_info = 0x7f0a004b
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0035
+net.micode.notes:string/confirm_gesture = 0x7f0a0009
net.micode.notes:xml/preferences = 0x7f0c0000
+<<<<<<< HEAD
net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0009
net.micode.notes:style/TextAppearanceNormal = 0x7f0b0007
net.micode.notes:style/TextAppearanceLarge = 0x7f0b0005
@@ -190,10 +211,211 @@ net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
net.micode.notes:drawable/menu_move = 0x7f040032
net.micode.notes:drawable/widget_4x_white = 0x7f040045
net.micode.notes:id/btnLogin = 0x7f050006
+=======
+net.micode.notes:id/iv_bg_white = 0x7f050021
+net.micode.notes:drawable/gesture_background = 0x7f040047
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000c
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0065
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0058
+net.micode.notes:color/gesture_point_error = 0x7f020017
+net.micode.notes:string/notelist_menu_new = 0x7f0a004a
+net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0009
+net.micode.notes:drawable/ic_lock_outline = 0x7f04004a
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001e
+net.micode.notes:string/menu_remove_remind = 0x7f0a0037
+net.micode.notes:string/gesture_forgot_pattern = 0x7f0a0073
+net.micode.notes:layout/note_list = 0x7f06000c
+net.micode.notes:color/gesture_error_color = 0x7f02000f
+net.micode.notes:drawable/gesture_panel_background = 0x7f040049
+net.micode.notes:string/ticker_syncing = 0x7f0a006b
+net.micode.notes:style/GestureVerifyTheme = 0x7f0b000c
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f
+net.micode.notes:id/lock_pattern_view = 0x7f050054
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0053
+net.micode.notes:color/gesture_button_background = 0x7f02000c
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0056
+net.micode.notes:color/gesture_text_color = 0x7f02001b
+net.micode.notes:color/gesture_point_selected = 0x7f020019
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000b
+net.micode.notes:string/search_label = 0x7f0a0060
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0006
+net.micode.notes:string/menu_select_none = 0x7f0a003a
+net.micode.notes:id/menu_send_to_desktop = 0x7f050036
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a006d
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005d
+net.micode.notes:style/NoteActionBarStyle = 0x7f0b0003
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0059
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a005c
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
+net.micode.notes:string/menu_normal_mode = 0x7f0a0036
+net.micode.notes:drawable/title_alert = 0x7f04003a
+net.micode.notes:id/note_title = 0x7f050041
+net.micode.notes:string/menu_search = 0x7f0a0038
+net.micode.notes:style/TextAppearanceNormal = 0x7f0b0007
+net.micode.notes:string/preferences_title = 0x7f0a005b
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000d
+net.micode.notes:string/widget_havenot_content = 0x7f0a006c
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0051
+net.micode.notes:id/notes_list = 0x7f050042
+net.micode.notes:layout/note_edit = 0x7f060008
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0050
+net.micode.notes:string/preferences_account_summary = 0x7f0a004c
+net.micode.notes:color/gesture_line_error = 0x7f020012
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:string/menu_share = 0x7f0a003f
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0002
+net.micode.notes:string/ticker_cancel = 0x7f0a0068
+net.micode.notes:string/ok = 0x7f0a0077
+net.micode.notes:string/notealert_ok = 0x7f0a0049
+net.micode.notes:string/app_widget4x4 = 0x7f0a0006
+net.micode.notes:string/note_link_web = 0x7f0a0047
+net.micode.notes:id/tv_time = 0x7f05004e
+net.micode.notes:drawable/widget_2x_blue = 0x7f04003d
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0067
+net.micode.notes:id/btn_confirm = 0x7f050008
+net.micode.notes:string/menu_deselect_all = 0x7f0a0029
+net.micode.notes:string/note_link_email = 0x7f0a0044
+net.micode.notes:string/menu_export_text = 0x7f0a002a
+net.micode.notes:string/note_alert_expired = 0x7f0a0043
+net.micode.notes:string/note_link_other = 0x7f0a0045
+net.micode.notes:string/file_path = 0x7f0a0018
+net.micode.notes:layout/activity_login = 0x7f060001
+net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:string/menu_set_gesture = 0x7f0a003d
+net.micode.notes:id/menu_search = 0x7f050035
+net.micode.notes:color/gesture_icon_color = 0x7f020011
+net.micode.notes:id/tv_name = 0x7f05004d
+net.micode.notes:string/menu_move = 0x7f0a0034
+net.micode.notes:menu/note_edit = 0x7f070002
+net.micode.notes:string/menu_list_mode = 0x7f0a0033
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e
+net.micode.notes:id/iv_bg_blue_select = 0x7f05001c
+net.micode.notes:id/menu_share = 0x7f050038
+net.micode.notes:string/menu_create_folder = 0x7f0a0027
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a001b
+net.micode.notes:string/format_date_ymd = 0x7f0a001a
+net.micode.notes:string/notealert_enter = 0x7f0a0048
+net.micode.notes:drawable/new_note = 0x7f040033
+net.micode.notes:id/sv_note_edit = 0x7f050048
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
+net.micode.notes:layout/datetime_picker = 0x7f060004
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:string/menu_font_small = 0x7f0a0031
+net.micode.notes:string/gesture_not_matched = 0x7f0a0021
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0016
+net.micode.notes:string/menu_folder_change_name = 0x7f0a002b
+net.micode.notes:string/set_remind_time_message = 0x7f0a0062
+net.micode.notes:string/error_sync_network = 0x7f0a0015
+net.micode.notes:string/error_note_not_exist = 0x7f0a0010
+net.micode.notes:id/menu_new_folder = 0x7f050033
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012
+net.micode.notes:id/speech_to_text_btn = 0x7f050047
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:string/menu_select_title = 0x7f0a003b
+net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:raw/introduction = 0x7f090000
+net.micode.notes:string/menu_font_normal = 0x7f0a002f
+net.micode.notes:string/format_exported_file_location = 0x7f0a001c
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0005
+net.micode.notes:drawable/new_note_pressed = 0x7f040035
+net.micode.notes:id/iv_bg_blue = 0x7f05001b
+net.micode.notes:layout/settings_header = 0x7f06000f
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b000a
+net.micode.notes:color/secondary_text_dark = 0x7f020007
+net.micode.notes:id/move = 0x7f05003b
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050024
+net.micode.notes:string/note_link_tel = 0x7f0a0046
+net.micode.notes:id/widget_text = 0x7f050052
+net.micode.notes:layout/note_list_footer = 0x7f06000e
+net.micode.notes:id/btn_new_note = 0x7f05000a
+net.micode.notes:string/menu_font_super = 0x7f0a0032
+net.micode.notes:id/textView = 0x7f050049
+net.micode.notes:id/preference_sync_button = 0x7f050044
+net.micode.notes:string/error_sdcard_export = 0x7f0a0011
+net.micode.notes:drawable/font_normal = 0x7f040013
+net.micode.notes:id/minute = 0x7f05003a
+net.micode.notes:drawable/font_super = 0x7f040016
+net.micode.notes:id/menu_sync = 0x7f050039
+net.micode.notes:id/menu_setting = 0x7f050037
+net.micode.notes:string/gesture_forgot_message = 0x7f0a0072
+net.micode.notes:id/menu_new_note = 0x7f050034
+net.micode.notes:drawable/list_green_down = 0x7f040021
+net.micode.notes:id/menu_list_mode = 0x7f050032
+net.micode.notes:id/iv_medium_select = 0x7f050026
+net.micode.notes:id/menu_export_text = 0x7f050030
+net.micode.notes:string/menu_folder_view = 0x7f0a002d
+net.micode.notes:id/menu_delete = 0x7f05002e
+net.micode.notes:layout/activity_register = 0x7f060002
+net.micode.notes:drawable/edit_blue = 0x7f040007
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050043
+net.micode.notes:string/file_name_txt_format = 0x7f0a0017
+net.micode.notes:string/ticker_fail = 0x7f0a0069
+net.micode.notes:id/gesture_status = 0x7f050017
+net.micode.notes:id/menu_alert = 0x7f05002d
+net.micode.notes:string/menu_font_size = 0x7f0a0030
+net.micode.notes:drawable/edit_title_yellow = 0x7f04000e
+net.micode.notes:string/menu_alert = 0x7f0a0026
+net.micode.notes:id/record_audio_btn = 0x7f050045
+net.micode.notes:id/date = 0x7f05000d
+net.micode.notes:id/ll_font_super = 0x7f05002c
+net.micode.notes:string/success_sync_account = 0x7f0a0064
+net.micode.notes:id/etLoginPassword = 0x7f05000f
+net.micode.notes:id/ll_font_normal = 0x7f05002a
+net.micode.notes:menu/call_record_folder = 0x7f070001
+net.micode.notes:id/ll_font_large = 0x7f050029
+net.micode.notes:id/note_bg_color_selector = 0x7f05003d
+net.micode.notes:id/iv_super_select = 0x7f050028
+net.micode.notes:drawable/search_result = 0x7f040038
+net.micode.notes:id/iv_bg_yellow = 0x7f050023
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0013
+net.micode.notes:id/iv_bg_white_select = 0x7f050022
+net.micode.notes:drawable/widget_4x_blue = 0x7f040042
+net.micode.notes:id/iv_large_select = 0x7f050025
+net.micode.notes:string/menu_font_large = 0x7f0a002e
+net.micode.notes:id/iv_bg_green_select = 0x7f05001e
+net.micode.notes:id/widget_bg_image = 0x7f050051
+net.micode.notes:color/primary_color = 0x7f020004
+net.micode.notes:id/amPm = 0x7f050004
+net.micode.notes:id/iv_bg_green = 0x7f05001d
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:id/iv_small_select = 0x7f050027
+net.micode.notes:id/hour = 0x7f050018
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040036
+net.micode.notes:style/NoteTheme = 0x7f0b0004
+net.micode.notes:id/font_size_selector = 0x7f050015
+net.micode.notes:color/secondary_color = 0x7f020006
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0054
+net.micode.notes:layout/note_gesture_verify = 0x7f060012
+net.micode.notes:id/et_edit_text = 0x7f050013
+net.micode.notes:layout/note_item = 0x7f06000b
+net.micode.notes:drawable/list_white_single = 0x7f04002b
+net.micode.notes:id/etUsername = 0x7f050012
+net.micode.notes:string/hint_foler_name = 0x7f0a0024
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0008
+net.micode.notes:string/folder_exist = 0x7f0a0019
+net.micode.notes:id/ll_font_small = 0x7f05002b
+net.micode.notes:id/etPassword = 0x7f050011
+net.micode.notes:id/etLoginUsername = 0x7f050010
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000b
+net.micode.notes:id/delete = 0x7f05000e
+net.micode.notes:id/btn_set_bg_color = 0x7f05000b
+net.micode.notes:color/button_text_color = 0x7f020002
+net.micode.notes:id/imageView = 0x7f050019
+net.micode.notes:drawable/button_background = 0x7f040002
+net.micode.notes:id/btn_logout = 0x7f050009
+net.micode.notes:id/btnRegister = 0x7f050007
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0052
+net.micode.notes:drawable/menu_move = 0x7f040032
+net.micode.notes:id/btnLogin = 0x7f050006
+net.micode.notes:drawable/widget_4x_white = 0x7f040045
+>>>>>>> a
net.micode.notes:id/account_dialog_subtitle = 0x7f050000
net.micode.notes:id/iv_bg_blue_select = 0x7f050019
net.micode.notes:menu/note_list = 0x7f070003
net.micode.notes:id/account_dialog_title = 0x7f050001
+<<<<<<< HEAD
net.micode.notes:drawable/widget_4x_green = 0x7f040043
net.micode.notes:drawable/widget_2x_yellow = 0x7f040041
net.micode.notes:dimen/text_font_size_large = 0x7f030000
@@ -256,20 +478,109 @@ net.micode.notes:drawable/icon_app = 0x7f040019
net.micode.notes:drawable/font_small = 0x7f040015
net.micode.notes:string/sync_progress_login = 0x7f0a005e
net.micode.notes:array/menu_share_ways = 0x7f010001
+=======
+net.micode.notes:string/gesture_matched = 0x7f0a0020
+net.micode.notes:drawable/widget_4x_green = 0x7f040043
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/tv_alert_date = 0x7f05004a
+net.micode.notes:drawable/widget_2x_red = 0x7f04003f
+net.micode.notes:color/gesture_point_normal = 0x7f020018
+net.micode.notes:drawable/widget_2x_green = 0x7f04003e
+net.micode.notes:drawable/title_bar_bg = 0x7f04003b
+net.micode.notes:plurals/search_results_title = 0x7f080000
+net.micode.notes:dimen/text_font_size_super = 0x7f030004
+net.micode.notes:drawable/selected = 0x7f040039
+net.micode.notes:string/gesture_verify_fail_max = 0x7f0a006e
+net.micode.notes:id/iv_bg_red = 0x7f05001f
+net.micode.notes:drawable/notification = 0x7f040037
+net.micode.notes:id/tv_modified_date = 0x7f05004c
+net.micode.notes:drawable/ic_warning = 0x7f040018
+net.micode.notes:drawable/list_blue_middle = 0x7f04001c
+net.micode.notes:id/menu_delete_remind = 0x7f05002f
+net.micode.notes:drawable/list_red_down = 0x7f040025
+net.micode.notes:drawable/list_red_middle = 0x7f040026
+net.micode.notes:drawable/gesture_button_background = 0x7f040048
+net.micode.notes:id/menu_set_gesture = 0x7f050053
+net.micode.notes:string/menu_title_select_folder = 0x7f0a0042
+net.micode.notes:string/menu_select_all = 0x7f0a0039
+net.micode.notes:drawable/toast_background = 0x7f04003c
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:string/menu_folder_delete = 0x7f0a002c
+net.micode.notes:string/gesture_too_short = 0x7f0a0023
+net.micode.notes:drawable/dropdown_icon = 0x7f040006
+net.micode.notes:string/button_delete = 0x7f0a0007
+net.micode.notes:drawable/new_note_normal = 0x7f040034
+net.micode.notes:drawable/list_yellow_single = 0x7f04002f
+net.micode.notes:id/tv_folder_name = 0x7f05004b
+net.micode.notes:drawable/list_yellow_down = 0x7f04002d
+net.micode.notes:color/gesture_line_normal = 0x7f020013
+net.micode.notes:layout/widget_4x = 0x7f060011
+net.micode.notes:id/et_foler_name = 0x7f050014
+net.micode.notes:drawable/edit_green = 0x7f040008
+net.micode.notes:drawable/clock = 0x7f040004
+net.micode.notes:drawable/list_white_up = 0x7f04002c
+net.micode.notes:id/gesture_overlay = 0x7f050016
+net.micode.notes:layout/dialog_edit_text = 0x7f060005
+net.micode.notes:string/preferences_account_title = 0x7f0a004d
+net.micode.notes:drawable/edit_white = 0x7f04000f
+net.micode.notes:drawable/list_white_middle = 0x7f04002a
+net.micode.notes:color/user_query_highlight = 0x7f02000a
+net.micode.notes:color/text_color_state_list = 0x7f020009
+net.micode.notes:drawable/list_white_down = 0x7f040029
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040046
+net.micode.notes:drawable/list_red_up = 0x7f040028
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000d
+net.micode.notes:drawable/list_blue_down = 0x7f04001b
+net.micode.notes:id/action_select_all = 0x7f050002
+net.micode.notes:drawable/list_green_middle = 0x7f040022
+net.micode.notes:string/menu_delete = 0x7f0a0028
+net.micode.notes:drawable/list_folder = 0x7f04001f
+net.micode.notes:drawable/list_blue_up = 0x7f04001e
+net.micode.notes:string/search_setting_description = 0x7f0a0061
+net.micode.notes:drawable/list_blue_single = 0x7f04001d
+net.micode.notes:string/gesture_forgot_title = 0x7f0a0074
+net.micode.notes:drawable/widget_2x_yellow = 0x7f040041
+net.micode.notes:color/background_color = 0x7f020000
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a003c
+net.micode.notes:drawable/list_red_single = 0x7f040027
+net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004f
+net.micode.notes:layout/widget_2x = 0x7f060010
+net.micode.notes:drawable/list_footer_bg = 0x7f040020
+net.micode.notes:string/preferences_add_account = 0x7f0a004e
+net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
+net.micode.notes:drawable/edit_title_green = 0x7f04000b
+net.micode.notes:drawable/icon_app = 0x7f040019
+net.micode.notes:drawable/font_small = 0x7f040015
+net.micode.notes:string/sync_progress_login = 0x7f0a0066
+net.micode.notes:array/menu_share_ways = 0x7f010001
+net.micode.notes:string/confirm_gesture_pattern = 0x7f0a000a
+>>>>>>> a
net.micode.notes:color/hint_color = 0x7f020003
net.micode.notes:drawable/widget_2x_white = 0x7f040040
net.micode.notes:layout/folder_list_item = 0x7f060006
net.micode.notes:layout/add_account_text = 0x7f060003
+<<<<<<< HEAD
net.micode.notes:id/tv_title = 0x7f05004c
net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
net.micode.notes:drawable/ic_audio = 0x7f040017
net.micode.notes:color/primary_text_dark = 0x7f020004
net.micode.notes:drawable/font_size_selector_bg = 0x7f040014
net.micode.notes:drawable/list_blue_up = 0x7f04001e
+=======
+net.micode.notes:color/gesture_success_color = 0x7f02001a
+net.micode.notes:id/tv_title = 0x7f05004f
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0041
+net.micode.notes:drawable/ic_audio = 0x7f040017
+net.micode.notes:color/primary_text_dark = 0x7f020005
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040014
+net.micode.notes:color/gesture_panel_background = 0x7f020015
+>>>>>>> a
net.micode.notes:drawable/widget_4x_red = 0x7f040044
net.micode.notes:string/call_record_folder_name = 0x7f0a0008
net.micode.notes:drawable/list_green_up = 0x7f040024
net.micode.notes:id/btnBackToLogin = 0x7f050005
+<<<<<<< HEAD
net.micode.notes:string/search_setting_description = 0x7f0a0059
net.micode.notes:drawable/list_blue_single = 0x7f04001d
net.micode.notes:drawable/font_large = 0x7f040012
@@ -296,12 +607,44 @@ net.micode.notes:drawable/menu_delete = 0x7f040031
net.micode.notes:string/search_hint = 0x7f0a0057
net.micode.notes:id/menu_font_size = 0x7f05002e
net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+=======
+net.micode.notes:drawable/font_large = 0x7f040012
+net.micode.notes:id/selection_menu = 0x7f050046
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a0025
+net.micode.notes:id/add_img_btn = 0x7f050003
+net.micode.notes:drawable/delete = 0x7f040005
+net.micode.notes:drawable/edit_yellow = 0x7f040010
+net.micode.notes:id/note_item = 0x7f050040
+net.micode.notes:string/search = 0x7f0a005e
+net.micode.notes:id/cb_edit_item = 0x7f05000c
+net.micode.notes:drawable/edit_title_white = 0x7f04000d
+net.micode.notes:id/note_edit_list = 0x7f05003e
+net.micode.notes:id/iv_alert_icon = 0x7f05001a
+net.micode.notes:drawable/edit_red = 0x7f040009
+net.micode.notes:drawable/edit_title_red = 0x7f04000c
+net.micode.notes:drawable/edit_title_blue = 0x7f04000a
+net.micode.notes:drawable/call_record = 0x7f040003
+net.micode.notes:drawable/list_yellow_up = 0x7f040030
+net.micode.notes:string/error_sync_internal = 0x7f0a0014
+net.micode.notes:drawable/menu_delete = 0x7f040031
+net.micode.notes:string/search_hint = 0x7f0a005f
+net.micode.notes:id/menu_font_size = 0x7f050031
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:string/cancel = 0x7f0a0071
+>>>>>>> a
net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:string/gesture_verify_hint = 0x7f0a0070
net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+<<<<<<< HEAD
+=======
+net.micode.notes:string/gesture_password_set = 0x7f0a0022
+>>>>>>> a
net.micode.notes:drawable/list_background = 0x7f04001a
net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:id/iv_lock_icon = 0x7f050055
+net.micode.notes:string/menu_setting = 0x7f0a003e
net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+<<<<<<< HEAD
net.micode.notes:id/tv_title_bar = 0x7f05004d
net.micode.notes:color/text_color = 0x7f020006
net.micode.notes:layout/note_edit_list_item = 0x7f060009
@@ -309,3 +652,21 @@ net.micode.notes:layout/account_dialog_title = 0x7f060000
net.micode.notes:array/format_for_exported_note = 0x7f010000
net.micode.notes:drawable/list_yellow_middle = 0x7f04002e
net.micode.notes:color/button_color = 0x7f020001
+=======
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0057
+net.micode.notes:id/note_edit_view = 0x7f05003f
+net.micode.notes:drawable/edittext_background = 0x7f040011
+net.micode.notes:string/gesture_instruction = 0x7f0a001f
+net.micode.notes:id/iv_bg_red_select = 0x7f050020
+net.micode.notes:id/tv_title_bar = 0x7f050050
+net.micode.notes:color/text_color = 0x7f020008
+net.micode.notes:id/navigation_bar = 0x7f05003c
+net.micode.notes:layout/note_edit_list_item = 0x7f060009
+net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:array/format_for_exported_note = 0x7f010000
+net.micode.notes:layout/note_gesture_password = 0x7f06000a
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002e
+net.micode.notes:color/button_color = 0x7f020001
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
+net.micode.notes:drawable/list_green_single = 0x7f040023
+>>>>>>> a
diff --git a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
index 4d81ad4..af0fec5 100644
--- a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
+++ b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
@@ -4,6 +4,26 @@ array menu_share_ways
color background_color
color button_color
color button_text_color
+<<<<<<< HEAD
+=======
+color gesture_background
+color gesture_button_background
+color gesture_button_ripple
+color gesture_button_text
+color gesture_error_color
+color gesture_hint_color
+color gesture_icon_color
+color gesture_line_error
+color gesture_line_normal
+color gesture_link_color
+color gesture_panel_background
+color gesture_panel_border
+color gesture_point_error
+color gesture_point_normal
+color gesture_point_selected
+color gesture_success_color
+color gesture_text_color
+>>>>>>> a
color hint_color
color primary_text_dark
color secondary_text_dark
@@ -38,7 +58,15 @@ drawable font_normal
drawable font_size_selector_bg
drawable font_small
drawable font_super
+<<<<<<< HEAD
drawable ic_audio
+=======
+drawable gesture_background
+drawable gesture_button_background
+drawable gesture_panel_background
+drawable ic_audio
+drawable ic_lock_outline
+>>>>>>> a
drawable ic_warning
drawable icon_app
drawable list_background
@@ -94,6 +122,10 @@ id amPm
id btnBackToLogin
id btnLogin
id btnRegister
+<<<<<<< HEAD
+=======
+id btn_confirm
+>>>>>>> a
id btn_logout
id btn_new_note
id btn_set_bg_color
@@ -107,6 +139,10 @@ id etUsername
id et_edit_text
id et_foler_name
id font_size_selector
+<<<<<<< HEAD
+=======
+id gesture_status
+>>>>>>> a
id hour
id imageView
id iv_alert_icon
@@ -121,6 +157,10 @@ id iv_bg_white_select
id iv_bg_yellow
id iv_bg_yellow_select
id iv_large_select
+<<<<<<< HEAD
+=======
+id iv_lock_icon
+>>>>>>> a
id iv_medium_select
id iv_small_select
id iv_super_select
@@ -128,6 +168,10 @@ id ll_font_large
id ll_font_normal
id ll_font_small
id ll_font_super
+<<<<<<< HEAD
+=======
+id lock_pattern_view
+>>>>>>> a
id menu_alert
id menu_delete
id menu_delete_remind
@@ -138,6 +182,10 @@ id menu_new_folder
id menu_new_note
id menu_search
id menu_send_to_desktop
+<<<<<<< HEAD
+=======
+id menu_set_gesture
+>>>>>>> a
id menu_setting
id menu_share
id menu_sync
@@ -159,6 +207,10 @@ id sv_note_edit
id textView
id tv_alert_date
id tv_folder_name
+<<<<<<< HEAD
+=======
+id tv_forgot_pattern
+>>>>>>> a
id tv_modified_date
id tv_name
id tv_time
@@ -176,6 +228,11 @@ layout folder_list_item
layout layout_custom_toast
layout note_edit
layout note_edit_list_item
+<<<<<<< HEAD
+=======
+layout note_gesture_password
+layout note_gesture_verify
+>>>>>>> a
layout note_item
layout note_list
layout note_list_dropdown_menu
@@ -201,6 +258,12 @@ string app_widget2x2
string app_widget4x4
string button_delete
string call_record_folder_name
+<<<<<<< HEAD
+=======
+string cancel
+string confirm_gesture
+string confirm_gesture_pattern
+>>>>>>> a
string datetime_dialog_cancel
string datetime_dialog_ok
string delete_remind_time_message
@@ -221,6 +284,22 @@ string format_datetime_mdhm
string format_exported_file_location
string format_folder_files_count
string format_move_notes_to_folder
+<<<<<<< HEAD
+=======
+string gesture_forgot_message
+string gesture_forgot_pattern
+string gesture_forgot_title
+string gesture_instruction
+string gesture_matched
+string gesture_not_matched
+string gesture_password_set
+string gesture_too_short
+string gesture_verify_error
+string gesture_verify_fail_max
+string gesture_verify_fail_tries
+string gesture_verify_hint
+string gesture_verify_success
+>>>>>>> a
string hint_foler_name
string info_note_enter_desktop
string menu_alert
@@ -246,6 +325,10 @@ string menu_select_all
string menu_select_none
string menu_select_title
string menu_send_to_desktop
+<<<<<<< HEAD
+=======
+string menu_set_gesture
+>>>>>>> a
string menu_setting
string menu_share
string menu_sync
@@ -260,6 +343,10 @@ string notealert_enter
string notealert_ok
string notelist_menu_new
string notelist_string_info
+<<<<<<< HEAD
+=======
+string ok
+>>>>>>> a
string preferences_account_summary
string preferences_account_title
string preferences_add_account
@@ -295,6 +382,10 @@ string ticker_syncing
string widget_havenot_content
string widget_under_visit_mode
style CustomEditTextStyle
+<<<<<<< HEAD
+=======
+style GestureVerifyTheme
+>>>>>>> a
style HighlightTextAppearancePrimary
style HighlightTextAppearanceSecondary
style NoteActionBarStyle
diff --git a/Src/app/build/outputs/apk/debug/output-metadata.json b/Src/app/build/outputs/apk/debug/output-metadata.json
deleted file mode 100644
index b2231b9..0000000
--- a/Src/app/build/outputs/apk/debug/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": 3,
- "artifactType": {
- "type": "APK",
- "kind": "Directory"
- },
- "applicationId": "net.micode.notes",
- "variantName": "debug",
- "elements": [
- {
- "type": "SINGLE",
- "filters": [],
- "attributes": [],
- "versionCode": 1,
- "versionName": "0.1",
- "outputFile": "app-debug.apk"
- }
- ],
- "elementType": "File"
-}
\ No newline at end of file
diff --git a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt
index d895634..1b5fd7c 100644
--- a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,5 +1,6 @@
-- Merging decision tree log ---
manifest
+<<<<<<< HEAD
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
@@ -8,6 +9,16 @@ MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\5
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
+=======
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:2:1-9:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+>>>>>>> a
package
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:4:5-31
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml
@@ -53,7 +64,11 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81
android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78
application
+<<<<<<< HEAD
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-137:19
+=======
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19
+>>>>>>> a
android:label
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41
android:icon
@@ -92,6 +107,7 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45
android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49
+<<<<<<< HEAD
activity#net.micode.notes.ui.NoteEditActivity
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:9-69:20
android:launchMode
@@ -222,6 +238,156 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:9-136:52
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-49
android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-58
+=======
+activity#net.micode.notes.ui.NoteGesturePasswordActivity
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70
+ android:label
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53
+ android:theme
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59
+activity#net.micode.notes.ui.NoteGestureVerifyActivity
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63
+ android:screenOrientation
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49
+ android:windowSoftInputMode
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60
+ android:theme
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-77:20
+ android:launchMode
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-43
+ android:configChanges
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:13-74
+ android:theme
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-45
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:52:13-48
+intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-63:29
+ android:scheme
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:17-38
+ tools:ignore
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:17-47
+action#android.intent.action.VIEW
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-69
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:25-66
+category#android.intent.category.DEFAULT
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73
+data
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78
+ android:mimeType
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75
+intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:64:13-69:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:17-79
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:25-76
+intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:70:13-73:29
+action#android.intent.action.SEARCH
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:17-71
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:25-68
+meta-data#android.app.searchable
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:74:13-76:54
+ android:resource
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:17-51
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:75:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:80:9-83:43
+ android:authorities
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:13-47
+ android:multiprocess
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-40
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:81:13-63
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:86:9-96:20
+ android:label
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:13-50
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:87:13-57
+intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82
+meta-data#android.appwidget.provider
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58
+ android:resource
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:98:9-108:20
+ android:label
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:13-50
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:99:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:9-115:20
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:112:13-114:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:17-79
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:118:9-120:41
+ android:process
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:13-38
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:119:13-61
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:123:9-127:87
+ android:label
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:13-45
+ android:launchMode
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-48
+ android:theme
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-75
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:124:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:130:9-134:72
+ android:label
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:13-54
+ android:launchMode
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-43
+ android:theme
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-60
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:131:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:137:9-139:40
+ android:exported
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:13-37
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:138:13-74
+meta-data#android.app.default_searchable
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:142:9-144:52
+ android:value
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:13-49
+ android:name
+ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58
+>>>>>>> a
uses-sdk
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml
diff --git a/Src/app/src/main/AndroidManifest.xml b/Src/app/src/main/AndroidManifest.xml
index bc713e4..924cb26 100644
--- a/Src/app/src/main/AndroidManifest.xml
+++ b/Src/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
android:label="@string/app_name">
+<<<<<<< HEAD
@@ -38,7 +39,36 @@
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
android:windowSoftInputMode="adjustPan" />
+=======
+
+
+
+
+
+
+>>>>>>> a
+
+
+
+
+
+
>>>>>> a
}
// DataColumns接口：定义数据列
diff --git a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index 71c8826..9a2b6ab 100644
--- a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -20,7 +20,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
private static final String DB_NAME = "note.db";
// 数据库版本号，用于判断数据库结构是否需要升级
+<<<<<<< HEAD
private static final int DB_VERSION = 8;
+=======
+ private static final int DB_VERSION = 9;
+>>>>>>> a
// 表接口，定义了数据库中两个主要表的表名：NOTE和DATA
public interface TABLE {
@@ -66,7 +70,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + // Google任务ID
NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + // 笔记版本号
NoteColumns.IMAGE_PATH + " TEXT," + // 新增列存储图片路径
+<<<<<<< HEAD
NoteColumns.AUDIO_PATH + " TEXT" + //新增列存储音频路径
+=======
+ NoteColumns.AUDIO_PATH + " TEXT," + //新增列存储音频路径
+ NoteColumns.GESTURE_PASSWORD + " TEXT" + // 新增手势密码字段
+>>>>>>> a
")";
// SQL语句：创建DATA表
@@ -409,6 +418,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
if(oldVersion < 8){
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.AUDIO_PATH + " TEXT");
+<<<<<<< HEAD
+=======
+ }
+ if(oldVersion < 9){
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.GESTURE_PASSWORD + " TEXT");
+>>>>>>> a
}
// 如果需要，重新创建触发器
diff --git a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java
index 607cb85..5545a5a 100644
--- a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -748,6 +748,21 @@ public class WorkingNote {
mContext.getContentResolver().update(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), values, null, null);
}
+<<<<<<< HEAD
+=======
+ private String mGesturePassword;
+
+ public String getGesturePassword() {
+ return mGesturePassword;
+ }
+
+ public void setGesturePassword(String gesturePassword) {
+ if (!TextUtils.equals(mGesturePassword, gesturePassword)) {
+ mGesturePassword = gesturePassword;
+ mNote.setNoteValue(NoteColumns.GESTURE_PASSWORD, mGesturePassword);
+ }
+ }
+>>>>>>> a
}
diff --git a/Src/app/src/main/java/net/micode/notes/ui/LockPatternView.java b/Src/app/src/main/java/net/micode/notes/ui/LockPatternView.java
new file mode 100644
index 0000000..3a9be36
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/ui/LockPatternView.java
@@ -0,0 +1,264 @@
+package net.micode.notes.ui;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.DecelerateInterpolator;
+
+import net.micode.notes.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LockPatternView extends View {
+ private static final String TAG = "LockPatternView";
+ private Paint pointPaint;
+ private Paint linePaint;
+ private Paint highlightPaint;
+ private int normalColor;
+ private int selectedColor;
+ private int errorColor;
+ private float pointRadius;
+ private float pointInnerRadius;
+ private boolean isError = false;
+ private ValueAnimator pointAnimator;
+ private Point[][] points = new Point[3][3];
+ private List selectedPoints = new ArrayList<>();
+ private boolean isDrawing = false;
+ private float currentX, currentY;
+ private OnPatternListener patternListener;
+
+ public interface OnPatternListener {
+ void onPatternComplete(String pattern);
+ }
+
+ public LockPatternView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init();
+ }
+
+ private void init() {
+ setLayerType(LAYER_TYPE_SOFTWARE, null);
+
+ // 获取颜色资源
+ normalColor = getResources().getColor(R.color.gesture_point_normal);
+ selectedColor = getResources().getColor(R.color.gesture_point_selected);
+ errorColor = getResources().getColor(R.color.gesture_point_error);
+
+ // 初始化画笔
+ pointPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ pointPaint.setStyle(Paint.Style.STROKE);
+ pointPaint.setStrokeWidth(dpToPx(3));
+
+ linePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ linePaint.setStyle(Paint.Style.STROKE);
+ linePaint.setStrokeWidth(dpToPx(3));
+ linePaint.setStrokeCap(Paint.Cap.ROUND);
+
+ highlightPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ highlightPaint.setStyle(Paint.Style.FILL);
+
+ // 初始化动画
+ setupAnimator();
+ }
+
+ private void setupAnimator() {
+ pointAnimator = ValueAnimator.ofFloat(0f, 1f);
+ pointAnimator.setDuration(300);
+ pointAnimator.setInterpolator(new DecelerateInterpolator());
+ pointAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ float value = (float) animation.getAnimatedValue();
+ pointInnerRadius = pointRadius * 0.3f + (pointRadius * 0.7f * value);
+ invalidate();
+ }
+ });
+ }
+
+ private float dpToPx(float dp) {
+ return dp * getContext().getResources().getDisplayMetrics().density;
+ }
+
+ @Override
+ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+ super.onSizeChanged(w, h, oldw, oldh);
+ float size = Math.min(w, h);
+ pointRadius = size / 12; // 点的大小
+ pointInnerRadius = pointRadius * 0.3f;
+
+ // 修正计算逻辑
+ float padding = size / 6; // 边距
+ float cellWidth = (size - (padding * 2)) / 2; // 这里导致了问题
+
+ // 修改为3x3网格的计算方式
+ float cellSize = (size - (padding * 2)) / 3; // 每个格子的大小
+
+ // 计算9个点的位置
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ float x = padding + j * cellSize + (cellSize / 2); // 加上半个格子大小使点居中
+ float y = padding + i * cellSize + (cellSize / 2);
+ points[i][j] = new Point(x, y);
+ }
+ }
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ // 绘制连线
+ if (selectedPoints.size() > 0) {
+ linePaint.setColor(isError ? errorColor : selectedColor);
+ Path path = new Path();
+ Point first = selectedPoints.get(0);
+ path.moveTo(first.x, first.y);
+
+ for (int i = 1; i < selectedPoints.size(); i++) {
+ Point point = selectedPoints.get(i);
+ path.lineTo(point.x, point.y);
+ }
+
+ if (isDrawing) {
+ path.lineTo(currentX, currentY);
+ }
+
+ canvas.drawPath(path, linePaint);
+ }
+
+ // 绘制所有点
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ Point point = points[i][j];
+ boolean isSelected = selectedPoints.contains(point);
+
+ // 绘制外圈
+ pointPaint.setColor(isSelected ?
+ (isError ? errorColor : selectedColor) : normalColor);
+ canvas.drawCircle(point.x, point.y, pointRadius, pointPaint);
+
+ // 绘制内圈
+ if (isSelected) {
+ highlightPaint.setColor(isSelected ?
+ (isError ? errorColor : selectedColor) : normalColor);
+ canvas.drawCircle(point.x, point.y, pointInnerRadius, highlightPaint);
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (!isEnabled()) {
+ return false;
+ }
+
+ currentX = event.getX();
+ currentY = event.getY();
+
+ switch (event.getAction()) {
+ case MotionEvent.ACTION_DOWN:
+ isDrawing = true;
+ selectedPoints.clear();
+ checkPoint(currentX, currentY);
+ invalidate();
+ return true;
+
+ case MotionEvent.ACTION_MOVE:
+ if (isDrawing) {
+ checkPoint(currentX, currentY);
+ invalidate();
+ }
+ return true;
+
+ case MotionEvent.ACTION_UP:
+ case MotionEvent.ACTION_CANCEL:
+ if (isDrawing) {
+ isDrawing = false;
+ if (patternListener != null && selectedPoints.size() > 0) {
+ patternListener.onPatternComplete(getPatternString());
+ }
+ invalidate();
+ }
+ return true;
+ }
+ return false;
+ }
+
+ private void checkPoint(float x, float y) {
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ Point point = points[i][j];
+ float dx = x - point.x;
+ float dy = y - point.y;
+ float distance = (float) Math.sqrt(dx * dx + dy * dy);
+
+ if (distance < pointRadius && !selectedPoints.contains(point)) {
+ selectedPoints.add(point);
+ }
+ }
+ }
+ }
+
+ private String getPatternString() {
+ StringBuilder sb = new StringBuilder();
+ for (Point point : selectedPoints) {
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ if (points[i][j] == point) {
+ sb.append(i * 3 + j);
+ }
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+ public void showError() {
+ isError = true;
+ pointAnimator.start();
+ postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ isError = false;
+ clearPattern();
+ }
+ }, 1000);
+ }
+ public void showSuccess() {
+ selectedColor = getResources().getColor(R.color.gesture_success_color);
+ invalidate();
+ }
+
+
+ public void clearPattern() {
+ isError = false;
+ selectedPoints.clear();
+ invalidate();
+ }
+
+ public void setPatternListener(OnPatternListener listener) {
+ this.patternListener = listener;
+ }
+
+ private static class Point {
+ float x, y;
+ Point(float x, float y) {
+ this.x = x;
+ this.y = y;
+ }
+ }
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+ int width = getMeasuredWidth();
+ // 确保是正方形
+ setMeasuredDimension(width, width);
+ }
+}
\ No newline at end of file
diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index d4d69af..aa3e48d 100644
--- a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -120,7 +120,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public TextView tvAlertDate; // 显示提醒日期的文本视图
public ImageView ibSetBgColor; // 设置背景颜色的图像视图
}
-
+ private static final int REQUEST_SET_PATTERN = 1001;
+ private static final int REQUEST_VERIFY_PATTERN = 1002;
/**
* 背景选择按钮与其对应选中状态图标的映射。
*/
@@ -235,6 +236,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
finish();
return;
}
+ // 获取便签ID
+ long noteId = getIntent().getLongExtra("note_id", 0);
+
+ // 检查密码
+ checkNotePassword(noteId);
initResources();
//根据id获取添加图片按钮
@@ -458,6 +464,64 @@ public class NoteEditActivity extends Activity implements OnClickListener,
@Override
protected void onResume() {
super.onResume();
+<<<<<<< HEAD
+
+ // 初始化笔记界面
+ initNoteScreen();
+
+ // 获取图片路径并插入图片
+ String imagePath = mWorkingNote.getImagePathFromDatabase();
+ String audioPath = mWorkingNote.getAudioPathFromDatabase();
+ if (imagePath != null) {
+ // 从文件加载图像
+ Bitmap bitmap = mWorkingNote.loadImageFromFile(imagePath);
+ if (bitmap != null) {
+ // 创建一个 ImageSpan
+ ImageSpan imageSpan = new ImageSpan(this, bitmap);
+ SpannableString spannableString = new SpannableString(" "); // 使用占位符
+ spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ // 找到笔记编辑器并插入图片
+ NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
+ int index = noteEditText.getSelectionStart(); // 获取光标位置
+ noteEditText.getEditableText().insert(index, spannableString);
+ } else {
+ Log.e(TAG, "Failed to load image from file: " + imagePath);
+ }
+ }
+ else {
+ Log.e(TAG, "Image path is null. Can't load image.");
+ }
+ }
+ private MediaPlayer mediaPlayer;
+ private void playAudio(String path) {
+ if (mediaPlayer != null) {
+ mediaPlayer.release(); // 释放之前的实例
+ mediaPlayer = null;
+ }
+
+ mediaPlayer = new MediaPlayer();
+ try {
+ mediaPlayer.setDataSource(path); // 设置音频路径
+ mediaPlayer.prepare(); // 准备播放
+ mediaPlayer.start(); // 开始播放
+
+ // 设置播放完成的回调
+ mediaPlayer.setOnCompletionListener(mp -> {
+ mp.release(); // 播放完成时释放资源
+ mediaPlayer = null;
+ });
+ } catch (IOException e) {
+ e.printStackTrace();
+ Toast.makeText(this, "Unable to play audio", Toast.LENGTH_SHORT).show();
+ }
+ }
+=======
+ // 避免重复验证
+ if (!isPatternVerified()) {
+ checkNotePassword(mWorkingNote.getNoteId());
+ }
+>>>>>>> a
// 初始化笔记界面
initNoteScreen();
@@ -509,7 +573,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Toast.makeText(this, "Unable to play audio", Toast.LENGTH_SHORT).show();
}
}
+ private boolean isPatternVerified = false;
+ private boolean isPatternVerified() {
+ return isPatternVerified;
+ }
/**
* 初始化笔记界面的函数。
* 该函数设置笔记编辑器的外观，根据笔记类型切换到相应的模式，设置背景和头部信息，
@@ -904,6 +972,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
// 删除提醒设置
mWorkingNote.setAlertDate(0, false);
break;
+ case R.id.menu_set_gesture:
+ Intent intent = new Intent(this, NoteGesturePasswordActivity.class);
+ intent.putExtra("note_id", mWorkingNote.getNoteId());
+ startActivityForResult(intent, REQUEST_SET_PATTERN);
+ return true;
default:
break;
}
@@ -1484,6 +1557,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
} else {
Log.e(TAG, "Activity result error, requestCode: " + requestCode + ", resultCode: " + resultCode);
+<<<<<<< HEAD
}
}
@@ -1642,4 +1716,216 @@ public class NoteEditActivity extends Activity implements OnClickListener,
+=======
+ }
+ if (requestCode == REQUEST_VERIFY_PATTERN) {
+ // 不要将 RESULT_OK (-1) 视为错误
+ if (resultCode == RESULT_OK) {
+ isPatternVerified = true;
+ Log.d(TAG, "Pattern verification successful");
+ // 继续正常操作
+ return;
+ } else {
+ Log.d(TAG, "Pattern verification failed");
+ finish();
+ return;
+ }
+ }
+
+ // 处理其他 Activity 结果
+ try {
+ super.onActivityResult(requestCode, resultCode, intent);
+ } catch (Exception e) {
+ Log.e(TAG, "Error in super.onActivityResult", e);
+ }
+
+ }
+
+
+ // 获取图片文件的扩展名
+ private String getFileExtension(Uri uri) {
+ String mimeType = getContentResolver().getType(uri);
+ if (mimeType == null) return ".jpg"; // 默认使用jpg格式
+
+ String extension = mimeType.split("/")[1];
+ if (extension.equals("jpeg")) return ".jpg";
+ if (extension.equals("png")) return ".png";
+ if (extension.equals("gif")) return ".gif";
+ // 可以添加更多的图片格式
+ return "." + extension;
+ }
+
+
+ private void updateNoteViewWithImage(String imagePath) {
+ Bitmap bitmap = BitmapFactory.decodeFile(imagePath);
+ ImageSpan imageSpan = new ImageSpan(this, bitmap);
+ SpannableString spannableString = new SpannableString(" "); // 使用空格作为占位符
+ spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ // 将图片插入到EditText中
+ NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
+ int index = noteEditText.getSelectionStart(); // 获取光标所在位置
+ noteEditText.getEditableText().insert(index, spannableString);
+ }
+
+
+ private MediaRecorder mediaRecorder;
+
+ private void startRecordingAudio() {
+ try {
+ audioFilePath = getExternalFilesDir(null).getAbsolutePath() + "/audio_" + System.currentTimeMillis() + ".3gp";
+
+ mediaRecorder = new MediaRecorder();
+ mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+ mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+ mediaRecorder.setOutputFile(audioFilePath);
+ mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+
+ mediaRecorder.prepare();
+ mediaRecorder.start();
+
+ Toast.makeText(this, "Recording started...", Toast.LENGTH_SHORT).show();
+ } catch (IOException e) {
+ e.printStackTrace();
+ Toast.makeText(this, "Recording failed!", Toast.LENGTH_SHORT).show();
+ }
+ }
+
+ private void stopRecordingAudio() {
+ if (mediaRecorder != null) {
+ mediaRecorder.stop();
+ mediaRecorder.release();
+ mediaRecorder = null;
+
+ // 获取音频路径
+ String audioPath = audioFilePath;
+
+ // 插入到光标位置
+ NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
+ int cursorPosition = noteEditText.getSelectionStart(); // 获取光标位置
+ SpannableString spannableString = new SpannableString("[Audio]");
+ spannableString.setSpan(new ImageSpan(this, R.drawable.ic_audio), 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ // 添加播放功能
+ spannableString.setSpan(new ClickableSpan() {
+ @Override
+ public void onClick(View widget) {
+ Log.d("AudioClick", "Audio icon clicked");
+ playAudio(audioPath); // 播放音频
+ }
+ }, 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ Editable editable = noteEditText.getEditableText();
+ editable.insert(cursorPosition, spannableString); // 插入到光标位置
+
+ // 保存音频路径到数据库
+ mWorkingNote.saveAudioPathToDatabase(audioPath);
+ mWorkingNote.saveNote();
+ // 确保编辑器启用点击事件
+ noteEditText.setMovementMethod(LinkMovementMethod.getInstance());
+ }
+ }
+
+
+ private String getRealPathFromURI(Uri contentUri) {
+ Cursor cursor = getContentResolver().query(contentUri, null, null, null, null);
+ if (cursor == null) return contentUri.getPath();
+ cursor.moveToFirst();
+ int idx = cursor.getColumnIndex(MediaStore.Audio.AudioColumns.DATA);
+ String path = cursor.getString(idx);
+ cursor.close();
+ return path;
+ }
+
+ private void startSpeechToText() {
+ if (speechService != null) {
+ speechService.stop(); // 停止之前的语音服务
+ speechService = null;
+ } else {
+ try {
+ Recognizer recognizer = new Recognizer(model, 16000.0f); // 确认模型加载成功
+ speechService = new SpeechService(recognizer, 16000.0f); // 初始化服务
+ Log.d("SpeechService", "Recognizer started");
+ speechService.startListening(new RecognitionListener() {
+ @Override
+ public void onPartialResult(String hypothesis) {
+ }
+
+ @Override
+ public void onResult(String hypothesis) {
+ Log.d("SpeechService", "Final result: " + hypothesis);
+ // 识别完成时，插入文本到光标位置
+ runOnUiThread(() -> {
+ try {
+ JSONObject json = new JSONObject(hypothesis);
+ String text = json.optString("text");
+
+ // 获取光标位置并插入文本
+ int cursorPosition = mNoteEditor.getSelectionStart();
+ Editable editableText = mNoteEditor.getText();
+ editableText.insert(cursorPosition, text + " "); // 插入文字到光标处
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
+ }
+
+ @Override
+ public void onFinalResult(String hypothesis) {
+ // 停止服务
+ speechService = null;
+ }
+
+ @Override
+ public void onError(Exception e) {
+ e.printStackTrace();
+ runOnUiThread(() -> Toast.makeText(NoteEditActivity.this, "Recognition error", Toast.LENGTH_SHORT).show());
+ }
+
+ @Override
+ public void onTimeout() {
+ speechService = null;
+ }
+ });
+ } catch (IOException e) {
+ e.printStackTrace();
+ Toast.makeText(this, "Failed to start recognition", Toast.LENGTH_SHORT).show();
+ }
+ }
+ }
+ private void checkNotePassword(long noteId) {
+ // 如果是新建便签，不需要验证密码
+ if (noteId == 0 || noteId == -1) {
+ return;
+ }
+
+ // 查询便签是否设置了密码
+ Cursor cursor = null;
+ try {
+ cursor = getContentResolver().query(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
+ new String[] { Notes.NoteColumns.GESTURE_PASSWORD },
+ null, null, null);
+
+ if (cursor != null && cursor.moveToFirst()) {
+ String password = cursor.getString(0);
+ // 只有设置了密码的便签才需要验证
+ if (password != null && !password.isEmpty()) {
+ Intent intent = new Intent(this, NoteGestureVerifyActivity.class);
+ intent.putExtra("note_id", noteId);
+ startActivityForResult(intent, REQUEST_VERIFY_PATTERN);
+ }
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "Error checking note password", e);
+ } finally {
+ if (cursor != null) {
+ cursor.close();
+ }
+ }
+ }
+>>>>>>> a
}
+
+
+
diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteGesturePasswordActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteGesturePasswordActivity.java
new file mode 100644
index 0000000..6fedba5
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/ui/NoteGesturePasswordActivity.java
@@ -0,0 +1,98 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+
+public class NoteGesturePasswordActivity extends Activity {
+ private LockPatternView lockPatternView;
+ private TextView gestureStatus;
+ private Button btnConfirm;
+ private String tempPattern;
+ private long noteId;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.note_gesture_password);
+
+ noteId = getIntent().getLongExtra("note_id", -1);
+ if (noteId == -1) {
+ finish();
+ return;
+ }
+
+ initViews();
+ }
+
+ private void initViews() {
+ lockPatternView = (LockPatternView) findViewById(R.id.lock_pattern_view);
+ gestureStatus = (TextView) findViewById(R.id.gesture_status);
+ btnConfirm = (Button) findViewById(R.id.btn_confirm);
+ btnConfirm.setEnabled(false);
+
+ // 修改这部分代码，使用新的接口
+ lockPatternView.setPatternListener(new LockPatternView.OnPatternListener() {
+ @Override
+ public void onPatternComplete(String pattern) {
+ if (pattern.length() < 4) {
+ gestureStatus.setText(R.string.gesture_too_short);
+ return;
+ }
+
+ if (tempPattern == null) {
+ tempPattern = pattern;
+ gestureStatus.setText(R.string.confirm_gesture_pattern);
+ btnConfirm.setEnabled(false);
+ } else {
+ if (tempPattern.equals(pattern)) {
+ btnConfirm.setEnabled(true);
+ gestureStatus.setText(R.string.gesture_matched);
+ } else {
+ tempPattern = null;
+ gestureStatus.setText(R.string.gesture_not_matched);
+ btnConfirm.setEnabled(false);
+ }
+ }
+ }
+ });
+
+ btnConfirm.setOnClickListener(v -> {
+ if (tempPattern != null) {
+ saveGesturePassword(tempPattern);
+ Toast.makeText(this, R.string.gesture_password_set, Toast.LENGTH_SHORT).show();
+ setResult(RESULT_OK);
+ finish();
+ }
+ });
+ }
+
+ private void saveGesturePassword(String pattern) {
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.GESTURE_PASSWORD, pattern);
+ getContentResolver().update(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
+ values, null, null);
+
+ // 添加返回密码到结果Intent
+ Intent resultIntent = new Intent();
+ resultIntent.putExtra("pattern", pattern);
+ setResult(RESULT_OK, resultIntent);
+ finish();
+ }
+
+ @Override
+ public void onBackPressed() {
+ setResult(RESULT_CANCELED);
+ super.onBackPressed();
+ }
+}
\ No newline at end of file
diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteGestureVerifyActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteGestureVerifyActivity.java
new file mode 100644
index 0000000..c7e4758
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/ui/NoteGestureVerifyActivity.java
@@ -0,0 +1,231 @@
+package net.micode.notes.ui;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ContentUris;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+
+public class NoteGestureVerifyActivity extends Activity {
+ private static final String TAG = "NoteGestureVerifyActivity";
+ private static final int MAX_TRIES = 5;
+
+ private LockPatternView lockPatternView;
+ private TextView gestureStatus;
+ private ImageView lockIcon;
+ private TextView forgotPattern;
+ private int currentTries = 0;
+ private String savedPattern;
+ private long noteId;
+ private Handler handler = new Handler();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ // 设置全屏显示
+ getWindow().setFlags(
+ WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ setContentView(R.layout.note_gesture_verify);
+
+ initViews();
+ setupListeners();
+ loadSavedPattern();
+ }
+
+ private void initViews() {
+ lockPatternView = (LockPatternView) findViewById(R.id.lock_pattern_view);
+ gestureStatus = (TextView) findViewById(R.id.gesture_status);
+ lockIcon = (ImageView) findViewById(R.id.iv_lock_icon);
+ forgotPattern = (TextView) findViewById(R.id.tv_forgot_pattern);
+
+ // 设置初始状态
+ updateStatusText(getString(R.string.gesture_verify_hint));
+ }
+
+ private void setupListeners() {
+ lockPatternView.setPatternListener(new LockPatternView.OnPatternListener() {
+ @Override
+ public void onPatternComplete(String pattern) {
+ verifyPattern(pattern);
+ }
+ });
+
+ forgotPattern.setOnClickListener(v -> handleForgotPattern());
+ }
+
+ @SuppressLint("LongLogTag")
+ private void loadSavedPattern() {
+ Cursor cursor = null;
+ try {
+ noteId = getIntent().getLongExtra("note_id", -1);
+ if (noteId == -1) {
+ Log.e(TAG, "Invalid note ID");
+ finishWithError();
+ return;
+ }
+
+ // 从数据库读取手势密码
+ cursor = getContentResolver().query(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
+ new String[]{Notes.NoteColumns.GESTURE_PASSWORD},
+ null, null, null);
+
+ if (cursor != null && cursor.moveToFirst()) {
+ savedPattern = cursor.getString(0);
+ if (savedPattern == null || savedPattern.isEmpty()) {
+ Log.e(TAG, "No pattern set for this note");
+ finishWithSuccess(); // 如果没有设置密码，直接通过验证
+ return;
+ }
+ } else {
+ Log.e(TAG, "Note not found");
+ finishWithError();
+ return;
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "Error loading saved pattern", e);
+ finishWithError();
+ } finally {
+ if (cursor != null) {
+ cursor.close();
+ }
+ }
+ }
+
+ private void verifyPattern(String pattern) {
+ if (pattern.equals(savedPattern)) {
+ showSuccessState();
+ handler.postDelayed(this::finishWithSuccess, 500);
+ } else {
+ showErrorState();
+ }
+ }
+
+ private void showSuccessState() {
+ gestureStatus.setTextColor(getResources().getColor(R.color.gesture_success_color));
+ gestureStatus.setText(R.string.gesture_verify_success);
+ lockIcon.setImageTintList(ColorStateList.valueOf(
+ getResources().getColor(R.color.gesture_success_color)));
+
+ lockPatternView.showSuccess();
+
+ // 添加成功动画效果
+ lockIcon.animate()
+ .scaleX(1.2f)
+ .scaleY(1.2f)
+ .setDuration(200)
+ .withEndAction(() -> {
+ lockIcon.animate()
+ .scaleX(1f)
+ .scaleY(1f)
+ .setDuration(100)
+ .start();
+ })
+ .start();
+ }
+
+ private void showErrorState() {
+ currentTries++;
+ if (currentTries >= MAX_TRIES) {
+ finishWithError();
+ return;
+ }
+
+ gestureStatus.setTextColor(getResources().getColor(R.color.gesture_point_error));
+ gestureStatus.setText(getString(R.string.gesture_verify_error, MAX_TRIES - currentTries));
+ lockIcon.setImageTintList(ColorStateList.valueOf(
+ getResources().getColor(R.color.gesture_point_error)));
+
+ lockPatternView.showError();
+
+ // 添加错误动画效果
+ lockIcon.animate()
+ .translationX(20f)
+ .setDuration(50)
+ .withEndAction(() -> {
+ lockIcon.animate()
+ .translationX(-20f)
+ .setDuration(100)
+ .withEndAction(() -> {
+ lockIcon.animate()
+ .translationX(0f)
+ .setDuration(50)
+ .start();
+ })
+ .start();
+ })
+ .start();
+
+ // 重置状态
+ handler.postDelayed(() -> {
+ if (!isFinishing()) {
+ gestureStatus.setTextColor(getResources().getColor(R.color.gesture_text_color));
+ gestureStatus.setText(R.string.gesture_verify_hint);
+ lockIcon.setImageTintList(ColorStateList.valueOf(
+ getResources().getColor(R.color.gesture_icon_color)));
+ }
+ }, 1000);
+ }
+
+ private void handleForgotPattern() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ .setTitle(R.string.gesture_forgot_title)
+ .setMessage(R.string.gesture_forgot_message)
+ .setPositiveButton(R.string.ok, (dialog, which) -> {
+ // 这里可以添加重置密码的逻辑
+ Toast.makeText(this, "请联系管理员重置密码", Toast.LENGTH_SHORT).show();
+ })
+ .setNegativeButton(R.string.cancel, null);
+
+ AlertDialog dialog = builder.create();
+ dialog.show();
+ }
+
+ private void finishWithSuccess() {
+ setResult(RESULT_OK);
+ finish();
+ overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+ }
+
+ private void finishWithError() {
+ Toast.makeText(this, "验证失败次数过多，请稍后重试", Toast.LENGTH_SHORT).show();
+ setResult(RESULT_CANCELED);
+ finish();
+ overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+ }
+
+ private void updateStatusText(String text) {
+ if (gestureStatus != null) {
+ gestureStatus.setText(text);
+ }
+ }
+
+ @Override
+ public void onBackPressed() {
+ // 返回时取消验证
+ setResult(RESULT_CANCELED);
+ super.onBackPressed();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ if (handler != null) {
+ handler.removeCallbacksAndMessages(null);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/gesture_background.xml b/Src/app/src/main/res/drawable/gesture_background.xml
new file mode 100644
index 0000000..7b83433
--- /dev/null
+++ b/Src/app/src/main/res/drawable/gesture_background.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/gesture_button_background.xml b/Src/app/src/main/res/drawable/gesture_button_background.xml
new file mode 100644
index 0000000..6692a83
--- /dev/null
+++ b/Src/app/src/main/res/drawable/gesture_button_background.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/gesture_panel_background.xml b/Src/app/src/main/res/drawable/gesture_panel_background.xml
new file mode 100644
index 0000000..2e3c374
--- /dev/null
+++ b/Src/app/src/main/res/drawable/gesture_panel_background.xml
@@ -0,0 +1,17 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_lock_outline.xml b/Src/app/src/main/res/drawable/ic_lock_outline.xml
new file mode 100644
index 0000000..b22c676
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_lock_outline.xml
@@ -0,0 +1,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Src/app/src/main/res/layout/note_gesture_password.xml b/Src/app/src/main/res/layout/note_gesture_password.xml
new file mode 100644
index 0000000..1e29afc
--- /dev/null
+++ b/Src/app/src/main/res/layout/note_gesture_password.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Src/app/src/main/res/layout/note_gesture_verify.xml b/Src/app/src/main/res/layout/note_gesture_verify.xml
new file mode 100644
index 0000000..0e0f06f
--- /dev/null
+++ b/Src/app/src/main/res/layout/note_gesture_verify.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Src/app/src/main/res/menu/note_edit.xml b/Src/app/src/main/res/menu/note_edit.xml
index aa8ae0f..5cc7608 100644
--- a/Src/app/src/main/res/menu/note_edit.xml
+++ b/Src/app/src/main/res/menu/note_edit.xml
@@ -48,4 +48,7 @@
- %1$s 条符合“%2$s”的搜索结果
diff --git a/Src/app/src/main/res/values/colors.xml b/Src/app/src/main/res/values/colors.xml
index 371b781..85c7e73 100644
--- a/Src/app/src/main/res/values/colors.xml
+++ b/Src/app/src/main/res/values/colors.xml
@@ -20,5 +20,27 @@
#2196F3
#808080
#000000
+<<<<<<< HEAD
+=======
+
+ #F5F5F5
+ #FFFFFF
+ #E0E0E0
+ #333333
+ #2196F3
+ #FFFFFF
+ #80FFFFFF
+ #E0E0E0
+ #2196F3
+ #F44336
+ #2196F3
+ #F44336
+
+ #2196F3
+ #2196F3
+ #F44336
+ #4CAF50
+ #757575
+>>>>>>> a
diff --git a/Src/app/src/main/res/values/strings.xml b/Src/app/src/main/res/values/strings.xml
index 55df868..62f2f67 100644
--- a/Src/app/src/main/res/values/strings.xml
+++ b/Src/app/src/main/res/values/strings.xml
@@ -120,12 +120,32 @@
Call notes
Input name
+
Searching Notes
Search notes
Text in your notes
Notes
set
cancel
+ 确认
+ 请绘制手势密码
+ 请再次绘制手势密码确认
+ 手势太短，至少需要4个点
+ 手势匹配成功
+ 手势不匹配，请重试
+ 手势密码设置成功
+ 设置手势密码
+ 请绘制手势密码解锁笔记
+ 验证失败，还剩 %d 次机会
+ 验证失败次数过多，笔记已锁定
+
+ 图案错误，还可以尝试%d次
+ 验证成功
+ 忘记密码？
+ 忘记密码
+ 您可以通过其他方式重置密码
+ 确定
+ 取消
- %1$s result for \"%2$s\"
diff --git a/Src/app/src/main/res/values/styles.xml b/Src/app/src/main/res/values/styles.xml
index 5517013..b64065b 100644
--- a/Src/app/src/main/res/values/styles.xml
+++ b/Src/app/src/main/res/values/styles.xml
@@ -73,5 +73,15 @@
- 16sp
- @color/text_color_state_list
- @color/hint_color
+<<<<<<< HEAD
+=======
+
+