main
苏宁韧 7 months ago
commit 1b80de9aef

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="vectorWizard">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="vectorAssetStep">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipartAsset">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="url" value="jar:file:/D:/Android%20Studio/plugins/android/lib/android.jar!/images/material/icons/materialicons/delete/baseline_delete_24.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
<option name="values">
<map>
<entry key="outputName" value="ic_delete" />
<entry key="sourceFile" value="D:\gitnote\notes" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</component>
</project>

@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Mon Dec 30 21:15:33 CST 2024 #Mon Dec 30 21:15:33 CST 2024
======= =======
#Mon Jan 06 19:32:33 CST 2025 #Mon Jan 06 19:32:33 CST 2025
>>>>>>> a >>>>>>> a
=======
#Thu Jan 09 10:35:48 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/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/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 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
@ -80,6 +84,13 @@ net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\gitnote\\note
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_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/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_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
net.micode.notes.app-main-7\:/drawable/ic_delete.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_delete.xml.flat
net.micode.notes.app-main-7\:/drawable/ic_format_bold.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bold.xml.flat
net.micode.notes.app-main-7\:/drawable/ic_format_bullet.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bullet.xml.flat
net.micode.notes.app-main-7\:/drawable/ic_format_color.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_color.xml.flat
net.micode.notes.app-main-7\:/drawable/ic_format_italic.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_italic.xml.flat
net.micode.notes.app-main-7\:/drawable/ic_format_strikethrough.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_strikethrough.xml.flat
net.micode.notes.app-main-7\:/drawable/ic_format_underline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_underline.xml.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 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 >>>>>>> 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/ic_warning.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat
@ -88,10 +99,13 @@ net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\gitnote\\notes\
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat
net.micode.notes.app-main-7\:/layout/activity_user_management.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_user_management.xml.flat
net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
net.micode.notes.app-main-7\:/layout/dialog_add_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_user.xml.flat
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
net.micode.notes.app-main-7\:/layout/item_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_item_user.xml.flat
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/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.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 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

File diff suppressed because one or more lines are too long

@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Tue Dec 31 09:10:17 CST 2024 #Tue Dec 31 09:10:17 CST 2024
======= =======
#Mon Jan 06 20:13:24 CST 2025 #Mon Jan 06 20:13:24 CST 2025
>>>>>>> a >>>>>>> a
=======
#Thu Jan 09 10:35:49 CST 2025
>>>>>>> a
base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex 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.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 base.2=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex

@ -1,4 +1,4 @@
#Mon Dec 30 21:15:41 CST 2024 #Wed Jan 08 10:30:02 CST 2025
base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
path.0=0/classes.dex path.0=0/classes.dex

@ -35,6 +35,7 @@
19 19
20 <application 20 <application
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-137:19 20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-137:19
21 android:debuggable="true" 21 android:debuggable="true"
22 android:icon="@drawable/icon_app" 22 android:icon="@drawable/icon_app"
@ -268,11 +269,15 @@
149</manifest> 149</manifest>
======= =======
20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19 20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19
=======
20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-147:19
>>>>>>> a
21 android:debuggable="true" 21 android:debuggable="true"
22 android:icon="@drawable/icon_app" 22 android:icon="@drawable/icon_app"
22-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42 22-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42
23 android:label="@string/app_name" 23 android:label="@string/app_name" >
23-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41 23-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41
<<<<<<< HEAD
24 android:testOnly="true" > 24 android:testOnly="true" >
25 25
26 <!-- 登录Activity启动器 --> 26 <!-- 登录Activity启动器 -->
@ -517,3 +522,251 @@
157 157
158</manifest> 158</manifest>
>>>>>>> a >>>>>>> a
=======
24
25 <!-- 登录Activity启动器 -->
26 <activity
26-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20
27 android:name="net.micode.notes.login.LoginActivity"
27-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48
28 android:launchMode="singleTop" >
28-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43
29 <intent-filter>
29-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29
30 <action android:name="android.intent.action.MAIN" />
30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69
30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66
31
32 <category android:name="android.intent.category.LAUNCHER" />
32-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77
32-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74
33 </intent-filter>
34 </activity>
35
36 <!-- 注册Activity -->
37 <activity android:name="net.micode.notes.login.RegisterActivity" />
37-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60
37-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57
38 <!-- 主Activity -->
39 <activity
39-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55
40 android:name="net.micode.notes.ui.NotesListActivity"
40-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49
41 android:configChanges="keyboardHidden|orientation|screenSize"
41-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74
42 android:label="@string/app_name"
42-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45
43 android:launchMode="singleTop"
43-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43
44 android:theme="@style/NoteTheme"
44-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45
45 android:windowSoftInputMode="adjustPan" />
45-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52
46 <activity
46-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70
47 android:name="net.micode.notes.ui.NoteGesturePasswordActivity"
47-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59
48 android:label="@string/menu_set_gesture"
48-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53
49 android:theme="@android:style/Theme.Holo.Light.Dialog" />
49-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67
50 <activity
50-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63
51 android:name="net.micode.notes.ui.NoteGestureVerifyActivity"
51-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57
52 android:screenOrientation="portrait"
52-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49
53 android:theme="@style/GestureVerifyTheme"
53-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54
54 android:windowSoftInputMode="stateAlwaysHidden" />
54-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60
55 <!-- 用户管理的Activity -->
56 <activity android:name="net.micode.notes.login.UserManagementActivity" />
56-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-65
56-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:19-63
57 <!-- 编辑笔记的Activity -->
58 <activity
58-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:9-79:20
59 android:name="net.micode.notes.ui.NoteEditActivity"
59-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-48
60 android:configChanges="keyboardHidden|orientation|screenSize"
60-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-74
61 android:launchMode="singleTop"
61-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-43
62 android:theme="@style/NoteTheme" >
62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:13-45
63 <intent-filter android:scheme="http" >
63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:13-65:29
63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-38
64 <action android:name="android.intent.action.VIEW" />
64-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-69
64-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:25-66
65
66 <category android:name="android.intent.category.DEFAULT" />
66-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
66-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
67
68 <data android:mimeType="vnd.android.cursor.item/text_note" />
68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
69 <data android:mimeType="vnd.android.cursor.item/call_note" />
69-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
69-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
70 </intent-filter>
71 <intent-filter>
71-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:66:13-71:29
72 <action android:name="android.intent.action.INSERT_OR_EDIT" />
72-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:17-79
72-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:25-76
73
74 <category android:name="android.intent.category.DEFAULT" />
74-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
74-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
75
76 <data android:mimeType="vnd.android.cursor.item/text_note" />
76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
77 <data android:mimeType="vnd.android.cursor.item/call_note" />
77-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
77-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
78 </intent-filter>
79 <intent-filter>
79-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:72:13-75:29
80 <action android:name="android.intent.action.SEARCH" />
80-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:17-71
80-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:25-68
81
82 <category android:name="android.intent.category.DEFAULT" />
82-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
82-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
83 </intent-filter>
84
85 <meta-data
85-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:13-78:54
86 android:name="android.app.searchable"
86-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:77:17-54
87 android:resource="@xml/searchable" />
87-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:78:17-51
88 </activity>
89
90 <!-- 提供者:用于管理笔记数据 -->
91 <provider
91-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:9-85:43
92 android:name="net.micode.notes.data.NotesProvider"
92-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-63
93 android:authorities="micode_notes"
93-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:84:13-47
94 android:multiprocess="true" />
94-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:85:13-40
95
96 <!-- 小部件提供者 -->
97 <receiver
97-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:9-98:20
98 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
98-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-57
99 android:label="@string/app_widget2x2" >
99-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:13-50
100 <intent-filter>
100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29
101 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84
101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81
102 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
102-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85
102-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82
103 </intent-filter>
104
105 <meta-data
105-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58
106 android:name="android.appwidget.provider"
106-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58
107 android:resource="@xml/widget_2x_info" />
107-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55
108 </receiver>
109 <receiver
109-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:9-110:20
110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
110-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:101:13-57
111 android:label="@string/app_widget4x4" >
111-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:102:13-50
112 <intent-filter>
112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29
113 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84
113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81
114 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
114-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85
114-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82
115 </intent-filter>
116
117 <meta-data
117-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58
118 android:name="android.appwidget.provider"
118-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58
119 android:resource="@xml/widget_4x_info" />
119-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55
120 </receiver>
121
122 <!-- 启动完成时初始化闹钟 -->
123 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
123-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:9-117:20
123-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:19-55
124 <intent-filter>
124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:114:13-116:29
125 <action android:name="android.intent.action.BOOT_COMPLETED" />
125-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:17-79
125-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:25-76
126 </intent-filter>
127 </receiver>
128
129 <!-- 闹钟接收器 -->
130 <receiver
130-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:9-122:41
131 android:name="net.micode.notes.ui.AlarmReceiver"
131-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:121:13-61
132 android:process=":remote" />
132-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:122:13-38
133
134 <!-- 闹钟提醒Activity -->
135 <activity
135-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:9-129:87
136 android:name="net.micode.notes.ui.AlarmAlertActivity"
136-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-50
137 android:label="@string/app_name"
137-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-45
138 android:launchMode="singleInstance"
138-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:128:13-48
139 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
139-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:129:13-75
140
141 <!-- 设置Activity -->
142 <activity
142-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:9-136:72
143 android:name="net.micode.notes.ui.NotesPreferenceActivity"
143-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-71
144 android:label="@string/preferences_title"
144-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-54
145 android:launchMode="singleTop"
145-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-43
146 android:theme="@android:style/Theme.Holo.Light" />
146-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-60
147
148 <!-- 任务同步服务 -->
149 <service
149-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:9-141:40
150 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
150-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:140:13-74
151 android:exported="false" />
151-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:141:13-37
152
153 <!-- 默认搜索设置 -->
154 <meta-data
154-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:9-146:52
155 android:name="android.app.default_searchable"
155-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:145:13-58
156 android:value=".ui.NoteEditActivity" />
156-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:146:13-49
157 </application>
158
159</manifest>
>>>>>>> a

@ -3,30 +3,30 @@
3 package="net.micode.notes.test" > 3 package="net.micode.notes.test" >
4 4
5 <uses-sdk 5 <uses-sdk
5-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:5-74 5-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:5:5-74
6 android:minSdkVersion="21" 6 android:minSdkVersion="21"
6-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:15-41 6-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:5:15-41
7 android:targetSdkVersion="21" /> 7 android:targetSdkVersion="21" />
7-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:42-71 7-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:5:42-71
8 8
9 <instrumentation 9 <instrumentation
9-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:11:5-15:66 9-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:11:5-15:66
10 android:name="android.test.InstrumentationTestRunner" 10 android:name="android.test.InstrumentationTestRunner"
10-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:11:22-75 10-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:11:22-75
11 android:functionalTest="false" 11 android:functionalTest="false"
11-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:14:22-52 11-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:14:22-52
12 android:handleProfiling="false" 12 android:handleProfiling="false"
12-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:13:22-53 12-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:13:22-53
13 android:label="Tests for net.micode.notes" 13 android:label="Tests for net.micode.notes"
13-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:15:22-64 13-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:15:22-64
14 android:targetPackage="net.micode.notes" /> 14 android:targetPackage="net.micode.notes" />
14-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:12:22-62 14-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:12:22-62
15 15
16 <application android:debuggable="true" > 16 <application android:debuggable="true" >
16-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:7:5-9:19 16-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:7:5-9:19
17 <uses-library android:name="android.test.runner" /> 17 <uses-library android:name="android.test.runner" />
17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:8:9-60 17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:8:9-60
17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:8:23-57 17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:8:23-57
18 </application> 18 </application>
19 19
20</manifest> 20</manifest>

@ -55,6 +55,11 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/GestureVerifyTheme" android:theme="@style/GestureVerifyTheme"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<<<<<<< HEAD
>>>>>>> a
=======
<!-- 用户管理的Activity -->
<activity android:name="net.micode.notes.login.UserManagementActivity" />
>>>>>>> a >>>>>>> a
<!-- 编辑笔记的Activity --> <!-- 编辑笔记的Activity -->
<activity <activity

@ -55,6 +55,11 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/GestureVerifyTheme" android:theme="@style/GestureVerifyTheme"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<<<<<<< HEAD
>>>>>>> a
=======
<!-- 用户管理的Activity -->
<activity android:name="net.micode.notes.login.UserManagementActivity" />
>>>>>>> a >>>>>>> a
<!-- 编辑笔记的Activity --> <!-- 编辑笔记的Activity -->
<activity <activity

@ -56,6 +56,45 @@
} }
] ]
}, },
{
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
},
"to": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "105",
"endLines": "5",
"endColumns": "19",
"endOffsets": "210"
}
},
{
"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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,141,145,-1,-1,-1,142,-1,144,146,143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,4,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7586,7776,-1,-1,-1,7629,-1,7723,7823,7674,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7624,7818,-1,-1,-1,7669,-1,7771,7869,7718,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,125,126,127,128,129,130",
"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,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,1866,1913,1966,2028,2113,2158,2239,2292,2343,2392,2457,2514,2568,2624,2675,2733,2791,2850,2913,2980,3049,3109,3165,3215,3274,3317,3370,3413,3464,3514,3574,3627,3678,3724,3772,3820,3866,3913,3963,4008,4067,4119,4171,4214,4261,4317,4372,4427,4479,4523,4565,4606,4656,4715,4766,4815,4864,4911,4958,5005,5050,5101,5154,5188,5263,5322,5379,5453,5517,5586,5664,5774,5878,5951,6017,6072,6137,6202,6251,6334,6412,6450,6495,6543,6605,6662,6717,6776,6843,6901,6963,7011,7056,7104,7155,7221",
"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,125,126,127,128,129,130",
"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,42,46,52,61,84,44,80,52,50,48,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,1861,1908,1961,2023,2108,2153,2234,2287,2338,2387,2452,2509,2563,2619,2670,2728,2786,2845,2908,2975,3044,3104,3160,3210,3269,3312,3365,3408,3459,3509,3569,3622,3673,3719,3767,3815,3861,3908,3958,4003,4062,4114,4166,4209,4256,4312,4367,4422,4474,4518,4560,4601,4651,4710,4761,4810,4859,4906,4953,5000,5045,5096,5149,5183,5258,5317,5374,5448,5512,5581,5659,5769,5873,5946,6012,6067,6132,6197,6246,6329,6407,6445,6490,6538,6600,6657,6712,6771,6838,6896,6958,7006,7051,7099,7150,7216,7282"
}
}
]
},
{ {
"outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [ "map": [
@ -113,6 +152,7 @@
{ {
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"startLines": "17,19,18,20,21,16", "startLines": "17,19,18,20,21,16",
"startColumns": "4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4",
@ -130,29 +170,39 @@
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "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", "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" "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
=======
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1688,1741,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,57,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1736,1794,-1"
>>>>>>> a
}, },
"to": { "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", "startLines": "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",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "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",
"startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594", "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705",
"endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56", "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,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" "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757"
} }
}, },
{ {
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
"from": { "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", "startLines": "155,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" "startOffsets": "9351,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9063,9253,-1,-1,-1,-1,9106,-1,9200,9300,9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "9755,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9101,9295,-1,-1,-1,-1,9146,-1,9248,9346,9195,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": { "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", "startLines": "42,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,165,166,167,168,169,170,171,172",
"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", "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,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", "startOffsets": "2024,2377,2473,2556,2652,2721,2764,2816,2868,2917,2980,3018,3065,3129,3187,3238,3322,3416,3524,3595,3679,3762,3828,3911,4013,4074,4136,4187,4265,4308,4355,4408,4468,4573,4632,4677,4779,4832,4883,4932,4997,5054,5108,5164,5215,5273,5331,5390,5453,5520,5589,5649,5705,5760,5831,5880,5938,5985,6044,6101,6172,6233,6290,6340,6392,6445,6495,6545,6605,6658,6724,6786,6849,6896,6951,7039,7097,7159,7211,7261,7306,7349,7409,7476,7531,7586,7639,7686,7739,7795,7843,7898,7951,7985,8069,8136,8200,8296,8370,8451,8540,8703,8847,8926,9001,9083,9142,9222,9302,9357,9479,9582,9623,9676,9733,9807,9872,9940,10026,10106,10175,10269,10328,10383,10445,10505,10615",
"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", "endLines": "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,165,166,167,168,169,170,171,172",
"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", "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,42,46,52,59,104,58,44,101,52,50,48,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" "endOffsets": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700"
} }
}, },
{ {
@ -174,20 +224,17 @@
{ {
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
"startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1", "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1", "startOffsets": "-1,-1,-1,-1,-1,-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": { "to": {
"startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216", "startLines": "173,178,185,189,193,197,200,204,208,212,216,220,224",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", "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", "startOffsets": "10705,10983,11390,11598,11809,11974,12134,12317,12502,12687,12890,13096,13279",
"endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219", "endLines": "177,184,188,192,196,199,203,207,211,215,219,223,227",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", "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" "endOffsets": "10978,11385,11593,11804,11969,12129,12312,12497,12682,12885,13091,13274,13475"
} }
}, },
{ {
@ -198,11 +245,15 @@
"startOffsets": "-1,-1,-1,-1,-1" "startOffsets": "-1,-1,-1,-1,-1"
}, },
"to": { "to": {
"startLines": "35,36,37,38,39", "startLines": "37,38,39,40,41",
"startColumns": "4,4,4,4,4", "startColumns": "4,4,4,4,4",
"startOffsets": "1651,1703,1756,1809,1861", "startOffsets": "1762,1814,1867,1920,1972",
"endColumns": "51,52,52,51,51", "endColumns": "51,52,52,51,51",
<<<<<<< HEAD
"endOffsets": "1698,1751,1804,1856,1908" "endOffsets": "1698,1751,1804,1856,1908"
>>>>>>> a
=======
"endOffsets": "1809,1862,1915,1967,2019"
>>>>>>> a >>>>>>> a
} }
} }

@ -24,19 +24,19 @@
{ {
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "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", "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,141,145,-1,-1,-1,142,-1,144,146,143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", "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,4,4,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", "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,7586,7776,-1,-1,-1,7629,-1,7723,7823,7674,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7624,7818,-1,-1,-1,7669,-1,7771,7869,7718,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": { "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", "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,125,126,127,128,129,130",
"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", "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,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", "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,1866,1913,1966,2028,2113,2158,2239,2292,2343,2392,2457,2514,2568,2624,2675,2733,2791,2850,2913,2980,3049,3109,3165,3215,3274,3317,3370,3413,3464,3514,3574,3627,3678,3724,3772,3820,3866,3913,3963,4008,4067,4119,4171,4214,4261,4317,4372,4427,4479,4523,4565,4606,4656,4715,4766,4815,4864,4911,4958,5005,5050,5101,5154,5188,5263,5322,5379,5453,5517,5586,5664,5774,5878,5951,6017,6072,6137,6202,6251,6334,6412,6450,6495,6543,6605,6662,6717,6776,6843,6901,6963,7011,7056,7104,7155,7221",
"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", "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,125,126,127,128,129,130",
"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", "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,42,46,52,61,84,44,80,52,50,48,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" "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,1861,1908,1961,2023,2108,2153,2234,2287,2338,2387,2452,2509,2563,2619,2670,2728,2786,2845,2908,2975,3044,3104,3160,3210,3269,3312,3365,3408,3459,3509,3569,3622,3673,3719,3767,3815,3861,3908,3958,4003,4062,4114,4166,4209,4256,4312,4367,4422,4474,4518,4560,4601,4651,4710,4761,4810,4859,4906,4953,5000,5045,5096,5149,5183,5258,5317,5374,5448,5512,5581,5659,5769,5873,5946,6012,6067,6132,6197,6246,6329,6407,6445,6490,6538,6600,6657,6712,6771,6838,6896,6958,7006,7051,7099,7150,7216,7282"
} }
} }
] ]

@ -6,6 +6,7 @@
{ {
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"startLines": "17,19,18,20,21,16", "startLines": "17,19,18,20,21,16",
"startColumns": "4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4",
@ -158,6 +159,8 @@
{ {
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
=======
>>>>>>> a
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "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", "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" "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
@ -238,6 +241,94 @@
} }
} }
] ]
},
{
"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,42,43,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1688,1741,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,57,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1736,1794,-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,35,36",
"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",
"startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705",
"endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,56",
"endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757"
}
},
{
"source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "155,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "9351,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9063,9253,-1,-1,-1,-1,9106,-1,9200,9300,9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "9755,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9101,9295,-1,-1,-1,-1,9146,-1,9248,9346,9195,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "42,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,165,166,167,168,169,170,171,172",
"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,4,4,4,4,4,4",
"startOffsets": "2024,2377,2473,2556,2652,2721,2764,2816,2868,2917,2980,3018,3065,3129,3187,3238,3322,3416,3524,3595,3679,3762,3828,3911,4013,4074,4136,4187,4265,4308,4355,4408,4468,4573,4632,4677,4779,4832,4883,4932,4997,5054,5108,5164,5215,5273,5331,5390,5453,5520,5589,5649,5705,5760,5831,5880,5938,5985,6044,6101,6172,6233,6290,6340,6392,6445,6495,6545,6605,6658,6724,6786,6849,6896,6951,7039,7097,7159,7211,7261,7306,7349,7409,7476,7531,7586,7639,7686,7739,7795,7843,7898,7951,7985,8069,8136,8200,8296,8370,8451,8540,8703,8847,8926,9001,9083,9142,9222,9302,9357,9479,9582,9623,9676,9733,9807,9872,9940,10026,10106,10175,10269,10328,10383,10445,10505,10615",
"endLines": "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,165,166,167,168,169,170,171,172",
"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,42,46,52,59,104,58,44,101,52,50,48,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": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700"
}
},
{
"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,-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",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "173,178,185,189,193,197,200,204,208,212,216,220,224",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "10705,10983,11390,11598,11809,11974,12134,12317,12502,12687,12890,13096,13279",
"endLines": "177,184,188,192,196,199,203,207,211,215,219,223,227",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "10978,11385,11593,11804,11969,12129,12312,12497,12682,12885,13091,13274,13475"
}
},
{
"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": "37,38,39,40,41",
"startColumns": "4,4,4,4,4",
"startOffsets": "1762,1814,1867,1920,1972",
"endColumns": "51,52,52,51,51",
"endOffsets": "1809,1862,1915,1967,2019"
}
}
]
} }
] ]
} }

@ -156,11 +156,19 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", "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" "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:\\layout_dialog_add_user.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_add_user.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
>>>>>>> a >>>>>>> a
}, },
{
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_bold.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_bold.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
@ -207,6 +215,7 @@
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", "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" "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
@ -219,6 +228,12 @@
"merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", "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" "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_ic_format_italic.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_italic.xml"
},
{
>>>>>>> a
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
}, },
@ -242,6 +257,10 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_verify.xml.flat", "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" "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:\\drawable_ic_format_strikethrough.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_strikethrough.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
@ -255,6 +274,14 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
}, },
{
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_item_user.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\item_user.xml"
},
{
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
@ -283,6 +310,10 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", "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" "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_ic_format_bullet.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_bullet.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
@ -312,6 +343,10 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\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_ic_delete.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_delete.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
@ -342,15 +377,12 @@
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
>>>>>>> a >>>>>>> a
}, },
{
"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": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_register.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_register.xml"
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/note_list.xml" "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
@ -359,6 +391,12 @@
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", "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" "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:\\drawable_ic_lock_outline.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_lock_outline.xml"
},
{
>>>>>>> a
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
}, },
@ -399,6 +437,10 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\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:\\layout_activity_user_management.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_user_management.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
@ -649,10 +691,6 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_toast_background.xml.flat", "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" "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", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
@ -665,6 +703,10 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", "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" "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_ic_format_color.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_color.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edittext_background.xml.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edittext_background.xml"
@ -694,6 +736,10 @@
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", "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" "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_ic_format_underline.xml.flat",
"source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_underline.xml"
},
{ {
"merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", "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" "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"

@ -55,6 +55,11 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/GestureVerifyTheme" android:theme="@style/GestureVerifyTheme"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<<<<<<< HEAD
>>>>>>> a
=======
<!-- 用户管理的Activity -->
<activity android:name="net.micode.notes.login.UserManagementActivity" />
>>>>>>> a >>>>>>> a
<!-- 编辑笔记的Activity --> <!-- 编辑笔记的Activity -->
<activity <activity

@ -4,6 +4,7 @@ int color background_color 0x7f020000
int color button_color 0x7f020001 int color button_color 0x7f020001
int color button_text_color 0x7f020002 int color button_text_color 0x7f020002
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
int color hint_color 0x7f020003 int color hint_color 0x7f020003
int color primary_text_dark 0x7f020004 int color primary_text_dark 0x7f020004
int color secondary_text_dark 0x7f020005 int color secondary_text_dark 0x7f020005
@ -35,6 +36,33 @@ int color text_color 0x7f020008
int color text_color_state_list 0x7f020009 int color text_color_state_list 0x7f020009
int color user_query_highlight 0x7f02000a int color user_query_highlight 0x7f02000a
>>>>>>> a >>>>>>> a
=======
int color gesture_background 0x7f020003
int color gesture_button_background 0x7f020004
int color gesture_button_ripple 0x7f020005
int color gesture_button_text 0x7f020006
int color gesture_error_color 0x7f020007
int color gesture_hint_color 0x7f020008
int color gesture_icon_color 0x7f020009
int color gesture_line_error 0x7f02000a
int color gesture_line_normal 0x7f02000b
int color gesture_link_color 0x7f02000c
int color gesture_panel_background 0x7f02000d
int color gesture_panel_border 0x7f02000e
int color gesture_point_error 0x7f02000f
int color gesture_point_normal 0x7f020010
int color gesture_point_selected 0x7f020011
int color gesture_success_color 0x7f020012
int color gesture_text_color 0x7f020013
int color hint_color 0x7f020014
int color primary_text_dark 0x7f020015
int color secondary_text_dark 0x7f020016
int color text_color 0x7f020017
int color text_color_state_list 0x7f020018
int color toolbar_background 0x7f020019
int color toolbar_button_selected 0x7f02001a
int color user_query_highlight 0x7f02001b
>>>>>>> a
int dimen text_font_size_large 0x7f030000 int dimen text_font_size_large 0x7f030000
int dimen text_font_size_medium 0x7f030001 int dimen text_font_size_medium 0x7f030001
int dimen text_font_size_normal 0x7f030002 int dimen text_font_size_normal 0x7f030002
@ -64,6 +92,7 @@ int drawable font_size_selector_bg 0x7f040014
int drawable font_small 0x7f040015 int drawable font_small 0x7f040015
int drawable font_super 0x7f040016 int drawable font_super 0x7f040016
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
int drawable ic_audio 0x7f040017 int drawable ic_audio 0x7f040017
======= =======
int drawable gesture_background 0x7f040047 int drawable gesture_background 0x7f040047
@ -119,6 +148,67 @@ int drawable widget_4x_green 0x7f040043
int drawable widget_4x_red 0x7f040044 int drawable widget_4x_red 0x7f040044
int drawable widget_4x_white 0x7f040045 int drawable widget_4x_white 0x7f040045
int drawable widget_4x_yellow 0x7f040046 int drawable widget_4x_yellow 0x7f040046
=======
int drawable gesture_background 0x7f040017
int drawable gesture_button_background 0x7f040018
int drawable gesture_panel_background 0x7f040019
int drawable ic_audio 0x7f04001a
int drawable ic_delete 0x7f04001b
int drawable ic_format_bold 0x7f04001c
int drawable ic_format_bullet 0x7f04001d
int drawable ic_format_color 0x7f04001e
int drawable ic_format_italic 0x7f04001f
int drawable ic_format_strikethrough 0x7f040020
int drawable ic_format_underline 0x7f040021
int drawable ic_lock_outline 0x7f040022
int drawable ic_warning 0x7f040023
int drawable icon_app 0x7f040024
int drawable list_background 0x7f040025
int drawable list_blue_down 0x7f040026
int drawable list_blue_middle 0x7f040027
int drawable list_blue_single 0x7f040028
int drawable list_blue_up 0x7f040029
int drawable list_folder 0x7f04002a
int drawable list_footer_bg 0x7f04002b
int drawable list_green_down 0x7f04002c
int drawable list_green_middle 0x7f04002d
int drawable list_green_single 0x7f04002e
int drawable list_green_up 0x7f04002f
int drawable list_red_down 0x7f040030
int drawable list_red_middle 0x7f040031
int drawable list_red_single 0x7f040032
int drawable list_red_up 0x7f040033
int drawable list_white_down 0x7f040034
int drawable list_white_middle 0x7f040035
int drawable list_white_single 0x7f040036
int drawable list_white_up 0x7f040037
int drawable list_yellow_down 0x7f040038
int drawable list_yellow_middle 0x7f040039
int drawable list_yellow_single 0x7f04003a
int drawable list_yellow_up 0x7f04003b
int drawable menu_delete 0x7f04003c
int drawable menu_move 0x7f04003d
int drawable new_note 0x7f04003e
int drawable new_note_normal 0x7f04003f
int drawable new_note_pressed 0x7f040040
int drawable note_edit_color_selector_panel 0x7f040041
int drawable notification 0x7f040042
int drawable search_result 0x7f040043
int drawable selected 0x7f040044
int drawable title_alert 0x7f040045
int drawable title_bar_bg 0x7f040046
int drawable toast_background 0x7f040047
int drawable widget_2x_blue 0x7f040048
int drawable widget_2x_green 0x7f040049
int drawable widget_2x_red 0x7f04004a
int drawable widget_2x_white 0x7f04004b
int drawable widget_2x_yellow 0x7f04004c
int drawable widget_4x_blue 0x7f04004d
int drawable widget_4x_green 0x7f04004e
int drawable widget_4x_red 0x7f04004f
int drawable widget_4x_white 0x7f040050
int drawable widget_4x_yellow 0x7f040051
>>>>>>> a
int id account_dialog_subtitle 0x7f050000 int id account_dialog_subtitle 0x7f050000
int id account_dialog_title 0x7f050001 int id account_dialog_title 0x7f050001
int id action_select_all 0x7f050002 int id action_select_all 0x7f050002
@ -128,6 +218,7 @@ int id btnBackToLogin 0x7f050005
int id btnLogin 0x7f050006 int id btnLogin 0x7f050006
int id btnRegister 0x7f050007 int id btnRegister 0x7f050007
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
int id btn_logout 0x7f050008 int id btn_logout 0x7f050008
int id btn_new_note 0x7f050009 int id btn_new_note 0x7f050009
int id btn_set_bg_color 0x7f05000a int id btn_set_bg_color 0x7f05000a
@ -309,6 +400,128 @@ int layout settings_header 0x7f06000f
int layout widget_2x 0x7f060010 int layout widget_2x 0x7f060010
int layout widget_4x 0x7f060011 int layout widget_4x 0x7f060011
>>>>>>> a >>>>>>> a
=======
int id btn_add_user 0x7f050008
int id btn_bold 0x7f050009
int id btn_bullet 0x7f05000a
int id btn_confirm 0x7f05000b
int id btn_confirm_add_user 0x7f05000c
int id btn_delete_image 0x7f05000d
int id btn_delete_user 0x7f05000e
int id btn_italic 0x7f05000f
int id btn_logout 0x7f050010
int id btn_new_note 0x7f050011
int id btn_set_bg_color 0x7f050012
int id btn_strikethrough 0x7f050013
int id btn_text_color 0x7f050014
int id btn_underline 0x7f050015
int id cb_edit_item 0x7f050016
int id date 0x7f050017
int id delete 0x7f050018
int id dialog_title 0x7f050019
int id etLoginPassword 0x7f05001a
int id etLoginUsername 0x7f05001b
int id etPassword 0x7f05001c
int id etUsername 0x7f05001d
int id et_edit_text 0x7f05001e
int id et_foler_name 0x7f05001f
int id font_size_selector 0x7f050020
int id gesture_status 0x7f050021
int id hour 0x7f050022
int id imageView 0x7f050023
int id input_password 0x7f050024
int id input_username 0x7f050025
int id iv_alert_icon 0x7f050026
int id iv_bg_blue 0x7f050027
int id iv_bg_blue_select 0x7f050028
int id iv_bg_green 0x7f050029
int id iv_bg_green_select 0x7f05002a
int id iv_bg_red 0x7f05002b
int id iv_bg_red_select 0x7f05002c
int id iv_bg_white 0x7f05002d
int id iv_bg_white_select 0x7f05002e
int id iv_bg_yellow 0x7f05002f
int id iv_bg_yellow_select 0x7f050030
int id iv_large_select 0x7f050031
int id iv_lock_icon 0x7f050032
int id iv_medium_select 0x7f050033
int id iv_small_select 0x7f050034
int id iv_super_select 0x7f050035
int id list_view_users 0x7f050036
int id ll_font_large 0x7f050037
int id ll_font_normal 0x7f050038
int id ll_font_small 0x7f050039
int id ll_font_super 0x7f05003a
int id lock_pattern_view 0x7f05003b
int id menu_alert 0x7f05003c
int id menu_delete 0x7f05003d
int id menu_delete_remind 0x7f05003e
int id menu_export_text 0x7f05003f
int id menu_font_size 0x7f050040
int id menu_list_mode 0x7f050041
int id menu_manage_users 0x7f050042
int id menu_new_folder 0x7f050043
int id menu_new_note 0x7f050044
int id menu_search 0x7f050045
int id menu_send_to_desktop 0x7f050046
int id menu_set_gesture 0x7f050047
int id menu_setting 0x7f050048
int id menu_share 0x7f050049
int id menu_sync 0x7f05004a
int id minute 0x7f05004b
int id move 0x7f05004c
int id navigation_bar 0x7f05004d
int id note_bg_color_selector 0x7f05004e
int id note_edit_list 0x7f05004f
int id note_edit_view 0x7f050050
int id note_item 0x7f050051
int id note_title 0x7f050052
int id notes_list 0x7f050053
int id prefenerece_sync_status_textview 0x7f050054
int id preference_sync_button 0x7f050055
int id record_audio_btn 0x7f050056
int id selection_menu 0x7f050057
int id speech_to_text_btn 0x7f050058
int id sv_note_edit 0x7f050059
int id textView 0x7f05005a
int id text_username 0x7f05005b
int id title_user_management 0x7f05005c
int id toolbar 0x7f05005d
int id tvLoginTitle 0x7f05005e
int id tvRegisterTitle 0x7f05005f
int id tv_alert_date 0x7f050060
int id tv_folder_name 0x7f050061
int id tv_forgot_pattern 0x7f050062
int id tv_modified_date 0x7f050063
int id tv_name 0x7f050064
int id tv_time 0x7f050065
int id tv_title 0x7f050066
int id tv_title_bar 0x7f050067
int id widget_bg_image 0x7f050068
int id widget_text 0x7f050069
int layout account_dialog_title 0x7f060000
int layout activity_login 0x7f060001
int layout activity_register 0x7f060002
int layout activity_user_management 0x7f060003
int layout add_account_text 0x7f060004
int layout datetime_picker 0x7f060005
int layout dialog_add_user 0x7f060006
int layout dialog_edit_text 0x7f060007
int layout folder_list_item 0x7f060008
int layout item_user 0x7f060009
int layout layout_custom_toast 0x7f06000a
int layout note_edit 0x7f06000b
int layout note_edit_list_item 0x7f06000c
int layout note_gesture_password 0x7f06000d
int layout note_gesture_verify 0x7f06000e
int layout note_item 0x7f06000f
int layout note_list 0x7f060010
int layout note_list_dropdown_menu 0x7f060011
int layout note_list_footer 0x7f060012
int layout settings_header 0x7f060013
int layout widget_2x 0x7f060014
int layout widget_4x 0x7f060015
>>>>>>> a
int menu call_note_edit 0x7f070000 int menu call_note_edit 0x7f070000
int menu call_record_folder 0x7f070001 int menu call_record_folder 0x7f070001
int menu note_edit 0x7f070002 int menu note_edit 0x7f070002
@ -328,6 +541,7 @@ int string app_widget4x4 0x7f0a0006
int string button_delete 0x7f0a0007 int string button_delete 0x7f0a0007
int string call_record_folder_name 0x7f0a0008 int string call_record_folder_name 0x7f0a0008
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
int string datetime_dialog_cancel 0x7f0a0009 int string datetime_dialog_cancel 0x7f0a0009
int string datetime_dialog_ok 0x7f0a000a int string datetime_dialog_ok 0x7f0a000a
int string delete_remind_time_message 0x7f0a000b int string delete_remind_time_message 0x7f0a000b
@ -548,6 +762,138 @@ int style TextAppearancePrimaryItem 0x7f0b0008
int style TextAppearanceSecondaryItem 0x7f0b0009 int style TextAppearanceSecondaryItem 0x7f0b0009
int style TextAppearanceSuper 0x7f0b000a int style TextAppearanceSuper 0x7f0b000a
int style TextAppearanceUnderMenuIcon 0x7f0b000b int style TextAppearanceUnderMenuIcon 0x7f0b000b
=======
int string cancel 0x7f0a0009
int string confirm_gesture 0x7f0a000a
int string confirm_gesture_pattern 0x7f0a000b
int string datetime_dialog_cancel 0x7f0a000c
int string datetime_dialog_ok 0x7f0a000d
int string delete_remind_time_message 0x7f0a000e
int string error_note_empty_for_clock 0x7f0a000f
int string error_note_empty_for_send_to_desktop 0x7f0a0010
int string error_note_not_exist 0x7f0a0011
int string error_sdcard_export 0x7f0a0012
int string error_sdcard_unmounted 0x7f0a0013
int string error_sync_cancelled 0x7f0a0014
int string error_sync_internal 0x7f0a0015
int string error_sync_network 0x7f0a0016
int string failed_sdcard_export 0x7f0a0017
int string file_name_txt_format 0x7f0a0018
int string file_path 0x7f0a0019
int string folder_exist 0x7f0a001a
int string format_bold 0x7f0a001b
int string format_bullet 0x7f0a001c
int string format_date_ymd 0x7f0a001d
int string format_datetime_mdhm 0x7f0a001e
int string format_exported_file_location 0x7f0a001f
int string format_folder_files_count 0x7f0a0020
int string format_italic 0x7f0a0021
int string format_move_notes_to_folder 0x7f0a0022
int string format_strikethrough 0x7f0a0023
int string format_text_color 0x7f0a0024
int string format_underline 0x7f0a0025
int string gesture_forgot_message 0x7f0a0026
int string gesture_forgot_pattern 0x7f0a0027
int string gesture_forgot_title 0x7f0a0028
int string gesture_instruction 0x7f0a0029
int string gesture_matched 0x7f0a002a
int string gesture_not_matched 0x7f0a002b
int string gesture_password_set 0x7f0a002c
int string gesture_too_short 0x7f0a002d
int string gesture_verify_error 0x7f0a002e
int string gesture_verify_fail_max 0x7f0a002f
int string gesture_verify_fail_tries 0x7f0a0030
int string gesture_verify_hint 0x7f0a0031
int string gesture_verify_success 0x7f0a0032
int string hint_foler_name 0x7f0a0033
int string info_note_enter_desktop 0x7f0a0034
int string menu_alert 0x7f0a0035
int string menu_create_folder 0x7f0a0036
int string menu_delete 0x7f0a0037
int string menu_deselect_all 0x7f0a0038
int string menu_export_text 0x7f0a0039
int string menu_folder_change_name 0x7f0a003a
int string menu_folder_delete 0x7f0a003b
int string menu_folder_view 0x7f0a003c
int string menu_font_large 0x7f0a003d
int string menu_font_normal 0x7f0a003e
int string menu_font_size 0x7f0a003f
int string menu_font_small 0x7f0a0040
int string menu_font_super 0x7f0a0041
int string menu_list_mode 0x7f0a0042
int string menu_move 0x7f0a0043
int string menu_move_parent_folder 0x7f0a0044
int string menu_normal_mode 0x7f0a0045
int string menu_remove_remind 0x7f0a0046
int string menu_search 0x7f0a0047
int string menu_select_all 0x7f0a0048
int string menu_select_none 0x7f0a0049
int string menu_select_title 0x7f0a004a
int string menu_send_to_desktop 0x7f0a004b
int string menu_set_gesture 0x7f0a004c
int string menu_setting 0x7f0a004d
int string menu_share 0x7f0a004e
int string menu_sync 0x7f0a004f
int string menu_sync_cancel 0x7f0a0050
int string menu_title_select_folder 0x7f0a0051
int string note_alert_expired 0x7f0a0052
int string note_link_email 0x7f0a0053
int string note_link_other 0x7f0a0054
int string note_link_tel 0x7f0a0055
int string note_link_web 0x7f0a0056
int string notealert_enter 0x7f0a0057
int string notealert_ok 0x7f0a0058
int string notelist_menu_new 0x7f0a0059
int string notelist_string_info 0x7f0a005a
int string ok 0x7f0a005b
int string preferences_account_summary 0x7f0a005c
int string preferences_account_title 0x7f0a005d
int string preferences_add_account 0x7f0a005e
int string preferences_bg_random_appear_title 0x7f0a005f
int string preferences_button_sync_cancel 0x7f0a0060
int string preferences_button_sync_immediately 0x7f0a0061
int string preferences_dialog_change_account_title 0x7f0a0062
int string preferences_dialog_change_account_warn_msg 0x7f0a0063
int string preferences_dialog_select_account_tips 0x7f0a0064
int string preferences_dialog_select_account_title 0x7f0a0065
int string preferences_last_sync_time 0x7f0a0066
int string preferences_last_sync_time_format 0x7f0a0067
int string preferences_menu_cancel 0x7f0a0068
int string preferences_menu_change_account 0x7f0a0069
int string preferences_menu_remove_account 0x7f0a006a
int string preferences_title 0x7f0a006b
int string preferences_toast_cannot_change_account 0x7f0a006c
int string preferences_toast_success_set_accout 0x7f0a006d
int string search 0x7f0a006e
int string search_hint 0x7f0a006f
int string search_label 0x7f0a0070
int string search_setting_description 0x7f0a0071
int string set_remind_time_message 0x7f0a0072
int string success_sdcard_export 0x7f0a0073
int string success_sync_account 0x7f0a0074
int string sync_progress_init_list 0x7f0a0075
int string sync_progress_login 0x7f0a0076
int string sync_progress_syncing 0x7f0a0077
int string ticker_cancel 0x7f0a0078
int string ticker_fail 0x7f0a0079
int string ticker_success 0x7f0a007a
int string ticker_syncing 0x7f0a007b
int string widget_havenot_content 0x7f0a007c
int string widget_under_visit_mode 0x7f0a007d
int style CustomEditTextStyle 0x7f0b0000
int style GestureVerifyTheme 0x7f0b0001
int style HighlightTextAppearancePrimary 0x7f0b0002
int style HighlightTextAppearanceSecondary 0x7f0b0003
int style NoteActionBarStyle 0x7f0b0004
int style NoteTheme 0x7f0b0005
int style TextAppearanceLarge 0x7f0b0006
int style TextAppearanceMedium 0x7f0b0007
int style TextAppearanceNormal 0x7f0b0008
int style TextAppearancePrimaryItem 0x7f0b0009
int style TextAppearanceSecondaryItem 0x7f0b000a
int style TextAppearanceSuper 0x7f0b000b
int style TextAppearanceUnderMenuIcon 0x7f0b000c
>>>>>>> a
int xml preferences 0x7f0c0000 int xml preferences 0x7f0c0000
int xml searchable 0x7f0c0001 int xml searchable 0x7f0c0001
int xml widget_2x_info 0x7f0c0002 int xml widget_2x_info 0x7f0c0002

@ -1,6 +1,18 @@
net.micode.notes:string/gesture_verify_success = 0x7f0a0076 net.micode.notes:layout/activity_user_management = 0x7f060013
net.micode.notes:color/gesture_link_color = 0x7f020014 net.micode.notes:id/menu_manage_users = 0x7f050063
net.micode.notes:id/list_view_users = 0x7f050062
net.micode.notes:id/input_username = 0x7f050061
net.micode.notes:id/input_password = 0x7f050060
net.micode.notes:id/btn_add_user = 0x7f05005e
net.micode.notes:string/format_move_notes_to_folder = 0x7f0a0022
net.micode.notes:style/TextAppearanceLarge = 0x7f0b0006
net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0060
net.micode.notes:string/preferences_menu_change_account = 0x7f0a0069
net.micode.notes:style/NoteActionBarStyle = 0x7f0b0004
net.micode.notes:string/menu_create_folder = 0x7f0a0036
net.micode.notes:id/menu_share = 0x7f050041
net.micode.notes:layout/layout_custom_toast = 0x7f060007 net.micode.notes:layout/layout_custom_toast = 0x7f060007
<<<<<<< HEAD
net.micode.notes:color/gesture_button_ripple = 0x7f02000d net.micode.notes:color/gesture_button_ripple = 0x7f02000d
net.micode.notes:string/gesture_verify_error = 0x7f0a0075 net.micode.notes:string/gesture_verify_error = 0x7f0a0075
net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a006f net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a006f
@ -661,12 +673,388 @@ net.micode.notes:id/iv_bg_red_select = 0x7f050020
net.micode.notes:id/tv_title_bar = 0x7f050050 net.micode.notes:id/tv_title_bar = 0x7f050050
net.micode.notes:color/text_color = 0x7f020008 net.micode.notes:color/text_color = 0x7f020008
net.micode.notes:id/navigation_bar = 0x7f05003c net.micode.notes:id/navigation_bar = 0x7f05003c
=======
net.micode.notes:string/menu_move = 0x7f0a0043
net.micode.notes:menu/note_edit = 0x7f070002
net.micode.notes:string/preferences_menu_remove_account = 0x7f0a006a
net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0063
net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0002
net.micode.notes:string/menu_sync = 0x7f0a004f
net.micode.notes:layout/dialog_edit_text = 0x7f060005
net.micode.notes:string/sync_progress_syncing = 0x7f0a0077
net.micode.notes:string/menu_deselect_all = 0x7f0a0038
net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0065
net.micode.notes:string/format_folder_files_count = 0x7f0a0020
net.micode.notes:string/delete_remind_time_message = 0x7f0a000e
net.micode.notes:style/TextAppearanceNormal = 0x7f0b0008
net.micode.notes:layout/add_account_text = 0x7f060003
net.micode.notes:string/preferences_title = 0x7f0a006b
net.micode.notes:string/format_underline = 0x7f0a0025
net.micode.notes:id/tv_folder_name = 0x7f050055
net.micode.notes:string/search_label = 0x7f0a0070
net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000c
net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b000a
net.micode.notes:string/notelist_menu_new = 0x7f0a0059
net.micode.notes:menu/sub_folder = 0x7f070006
net.micode.notes:string/menu_share = 0x7f0a004e
net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0003
net.micode.notes:string/ticker_cancel = 0x7f0a0078
net.micode.notes:string/ok = 0x7f0a005b
net.micode.notes:string/notealert_ok = 0x7f0a0058
net.micode.notes:string/app_widget4x4 = 0x7f0a0006
net.micode.notes:string/note_link_web = 0x7f0a0056
net.micode.notes:string/note_link_tel = 0x7f0a0055
net.micode.notes:id/widget_text = 0x7f05005d
net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a006c
net.micode.notes:string/note_link_email = 0x7f0a0053
net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000f
net.micode.notes:string/menu_list_mode = 0x7f0a0042
net.micode.notes:string/note_alert_expired = 0x7f0a0052
net.micode.notes:string/note_link_other = 0x7f0a0054
net.micode.notes:string/file_path = 0x7f0a0019
net.micode.notes:string/format_strikethrough = 0x7f0a0023
net.micode.notes:string/ticker_syncing = 0x7f0a007b
net.micode.notes:string/menu_export_text = 0x7f0a0039
net.micode.notes:layout/activity_login = 0x7f060001
net.micode.notes:layout/note_list = 0x7f06000d
net.micode.notes:string/menu_set_gesture = 0x7f0a004c
net.micode.notes:xml/widget_4x_info = 0x7f0c0003
net.micode.notes:string/menu_normal_mode = 0x7f0a0045
net.micode.notes:style/TextAppearanceMedium = 0x7f0b0007
net.micode.notes:string/menu_select_none = 0x7f0a0049
net.micode.notes:id/menu_send_to_desktop = 0x7f05003e
net.micode.notes:string/widget_under_visit_mode = 0x7f0a007d
net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a006d
net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a0030
net.micode.notes:string/gesture_verify_error = 0x7f0a002e
net.micode.notes:id/btn_set_bg_color = 0x7f05000f
net.micode.notes:string/menu_folder_change_name = 0x7f0a003a
net.micode.notes:string/gesture_forgot_pattern = 0x7f0a0027
net.micode.notes:string/menu_remove_remind = 0x7f0a0046
net.micode.notes:string/menu_move_parent_folder = 0x7f0a0044
net.micode.notes:string/format_italic = 0x7f0a0021
net.micode.notes:string/success_sdcard_export = 0x7f0a0073
net.micode.notes:string/notelist_string_info = 0x7f0a005a
net.micode.notes:string/format_datetime_mdhm = 0x7f0a001e
net.micode.notes:string/format_date_ymd = 0x7f0a001d
net.micode.notes:string/format_bullet = 0x7f0a001c
net.micode.notes:string/datetime_dialog_ok = 0x7f0a000d
net.micode.notes:layout/note_edit = 0x7f060008
net.micode.notes:id/notes_list = 0x7f05004b
net.micode.notes:string/widget_havenot_content = 0x7f0a007c
net.micode.notes:string/confirm_gesture = 0x7f0a000a
net.micode.notes:xml/preferences = 0x7f0c0000
net.micode.notes:string/gesture_not_matched = 0x7f0a002b
net.micode.notes:string/failed_sdcard_export = 0x7f0a0017
net.micode.notes:id/tv_title_bar = 0x7f05005b
net.micode.notes:string/notealert_enter = 0x7f0a0057
net.micode.notes:string/error_note_not_exist = 0x7f0a0011
net.micode.notes:id/menu_new_folder = 0x7f05003b
net.micode.notes:string/set_remind_time_message = 0x7f0a0072
net.micode.notes:string/error_sync_network = 0x7f0a0016
net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0013
net.micode.notes:id/speech_to_text_btn = 0x7f050050
net.micode.notes:string/app_widget2x2 = 0x7f0a0005
net.micode.notes:string/menu_select_title = 0x7f0a004a
net.micode.notes:string/alert_title_delete = 0x7f0a0003
net.micode.notes:string/gesture_verify_success = 0x7f0a0032
net.micode.notes:xml/widget_2x_info = 0x7f0c0002
net.micode.notes:layout/datetime_picker = 0x7f060004
net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
net.micode.notes:string/sync_progress_init_list = 0x7f0a0075
net.micode.notes:string/format_exported_file_location = 0x7f0a001f
net.micode.notes:string/menu_font_normal = 0x7f0a003e
net.micode.notes:raw/introduction = 0x7f090000
net.micode.notes:menu/note_list_dropdown = 0x7f070004
net.micode.notes:string/app_name = 0x7f0a0004
net.micode.notes:menu/note_list = 0x7f070003
net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000
net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a005f
net.micode.notes:layout/widget_2x = 0x7f060011
net.micode.notes:id/etLoginUsername = 0x7f050017
net.micode.notes:string/format_bold = 0x7f0a001b
net.micode.notes:string/ticker_success = 0x7f0a007a
net.micode.notes:layout/note_gesture_password = 0x7f06000a
>>>>>>> a
net.micode.notes:layout/note_edit_list_item = 0x7f060009 net.micode.notes:layout/note_edit_list_item = 0x7f060009
net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:layout/account_dialog_title = 0x7f060000
net.micode.notes:array/format_for_exported_note = 0x7f010000 net.micode.notes:layout/folder_list_item = 0x7f060006
net.micode.notes:layout/note_gesture_password = 0x7f06000a net.micode.notes:string/menu_search = 0x7f0a0047
net.micode.notes:drawable/list_yellow_middle = 0x7f04002e net.micode.notes:id/tv_modified_date = 0x7f050057
net.micode.notes:color/button_color = 0x7f020001 net.micode.notes:id/tv_forgot_pattern = 0x7f050056
net.micode.notes:color/gesture_icon_color = 0x7f020009
net.micode.notes:id/menu_search = 0x7f05003d
net.micode.notes:id/tv_name = 0x7f050058
net.micode.notes:id/toolbar = 0x7f050053
net.micode.notes:string/menu_font_super = 0x7f0a0041
net.micode.notes:id/textView = 0x7f050052
net.micode.notes:string/error_sdcard_export = 0x7f0a0012
net.micode.notes:id/preference_sync_button = 0x7f05004d
net.micode.notes:id/menu_list_mode = 0x7f05003a
net.micode.notes:id/iv_medium_select = 0x7f05002d
net.micode.notes:id/menu_export_text = 0x7f050038
net.micode.notes:string/menu_folder_view = 0x7f0a003c
net.micode.notes:id/menu_delete = 0x7f050036
net.micode.notes:layout/activity_register = 0x7f060002
net.micode.notes:drawable/edit_blue = 0x7f040007
net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05004c
net.micode.notes:id/menu_alert = 0x7f050035
net.micode.notes:string/menu_font_size = 0x7f0a003f
net.micode.notes:drawable/edit_title_yellow = 0x7f04000e
net.micode.notes:string/menu_alert = 0x7f0a0035
net.micode.notes:id/lock_pattern_view = 0x7f050034
net.micode.notes:style/GestureVerifyTheme = 0x7f0b0001
net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0010
net.micode.notes:id/record_audio_btn = 0x7f05004e
net.micode.notes:id/date = 0x7f050014
net.micode.notes:id/ll_font_super = 0x7f050033
net.micode.notes:string/success_sync_account = 0x7f0a0074
net.micode.notes:id/etLoginPassword = 0x7f050016
net.micode.notes:id/ll_font_normal = 0x7f050031
net.micode.notes:menu/call_record_folder = 0x7f070001
net.micode.notes:id/ll_font_large = 0x7f050030
net.micode.notes:string/gesture_forgot_message = 0x7f0a0026
net.micode.notes:drawable/list_green_down = 0x7f04002c
net.micode.notes:id/menu_new_note = 0x7f05003c
net.micode.notes:id/iv_lock_icon = 0x7f05002c
net.micode.notes:dimen/text_font_size_medium = 0x7f030001
net.micode.notes:string/menu_setting = 0x7f0a004d
net.micode.notes:id/iv_bg_yellow = 0x7f050029
net.micode.notes:string/error_sync_cancelled = 0x7f0a0014
net.micode.notes:id/iv_bg_white_select = 0x7f050028
net.micode.notes:drawable/widget_4x_blue = 0x7f04004d
net.micode.notes:id/iv_large_select = 0x7f05002b
net.micode.notes:string/menu_font_large = 0x7f0a003d
net.micode.notes:id/iv_bg_green_select = 0x7f050024
net.micode.notes:id/widget_bg_image = 0x7f05005c
net.micode.notes:id/amPm = 0x7f050004
net.micode.notes:id/iv_bg_green = 0x7f050023
net.micode.notes:layout/settings_header = 0x7f060010
net.micode.notes:id/iv_bg_blue = 0x7f050021
net.micode.notes:drawable/new_note_pressed = 0x7f040040
net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040041
net.micode.notes:id/hour = 0x7f05001e
net.micode.notes:style/NoteTheme = 0x7f0b0005
net.micode.notes:layout/dialog_add_user = 0x7f060014
net.micode.notes:id/font_size_selector = 0x7f05001c
net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0064
net.micode.notes:layout/note_gesture_verify = 0x7f06000b
net.micode.notes:id/btn_bullet = 0x7f050009
net.micode.notes:id/et_edit_text = 0x7f05001a
net.micode.notes:string/hint_foler_name = 0x7f0a0033
net.micode.notes:id/etUsername = 0x7f050019
net.micode.notes:string/folder_exist = 0x7f0a001a
net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0009
net.micode.notes:id/ll_font_small = 0x7f050032
net.micode.notes:id/etPassword = 0x7f050018
net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000c
net.micode.notes:id/delete = 0x7f050015
net.micode.notes:string/search = 0x7f0a006e
net.micode.notes:id/cb_edit_item = 0x7f050013
net.micode.notes:string/gesture_forgot_title = 0x7f0a0028
net.micode.notes:drawable/widget_2x_yellow = 0x7f04004c
net.micode.notes:id/btn_text_color = 0x7f050011
net.micode.notes:id/imageView = 0x7f05001f
net.micode.notes:color/button_text_color = 0x7f020002
net.micode.notes:id/btn_strikethrough = 0x7f050010
net.micode.notes:id/menu_font_size = 0x7f050039
net.micode.notes:string/search_hint = 0x7f0a006f
net.micode.notes:id/btn_bold = 0x7f050008
net.micode.notes:id/btn_new_note = 0x7f05000e
net.micode.notes:layout/note_list_footer = 0x7f06000f
net.micode.notes:drawable/list_red_single = 0x7f040032
net.micode.notes:string/menu_send_to_desktop = 0x7f0a004b
net.micode.notes:id/btn_delete_image = 0x7f05000b
net.micode.notes:id/btn_confirm = 0x7f05000a
net.micode.notes:id/btnRegister = 0x7f050007
net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0062
net.micode.notes:drawable/menu_move = 0x7f04003d
net.micode.notes:drawable/widget_4x_white = 0x7f040050
net.micode.notes:id/btnLogin = 0x7f050006
net.micode.notes:id/selection_menu = 0x7f05004f
net.micode.notes:string/info_note_enter_desktop = 0x7f0a0034
net.micode.notes:id/add_img_btn = 0x7f050003
net.micode.notes:id/account_dialog_title = 0x7f050001
net.micode.notes:id/account_dialog_subtitle = 0x7f050000
net.micode.notes:id/iv_bg_blue_select = 0x7f050022
net.micode.notes:color/gesture_panel_background = 0x7f02000d
net.micode.notes:drawable/widget_4x_red = 0x7f04004f
net.micode.notes:string/gesture_matched = 0x7f0a002a
net.micode.notes:drawable/widget_4x_green = 0x7f04004e
net.micode.notes:drawable/widget_2x_red = 0x7f04004a
net.micode.notes:color/gesture_point_normal = 0x7f020010
net.micode.notes:drawable/widget_2x_green = 0x7f040049
net.micode.notes:id/tv_time = 0x7f050059
net.micode.notes:drawable/widget_2x_blue = 0x7f040048
net.micode.notes:drawable/title_bar_bg = 0x7f040046
net.micode.notes:id/note_title = 0x7f05004a
net.micode.notes:drawable/title_alert = 0x7f040045
net.micode.notes:plurals/search_results_title = 0x7f080000
net.micode.notes:dimen/text_font_size_super = 0x7f030004
net.micode.notes:drawable/selected = 0x7f040044
net.micode.notes:id/iv_super_select = 0x7f05002f
net.micode.notes:drawable/search_result = 0x7f040043
net.micode.notes:string/menu_title_select_folder = 0x7f0a0051
net.micode.notes:string/menu_select_all = 0x7f0a0048
net.micode.notes:drawable/toast_background = 0x7f040047
net.micode.notes:drawable/gesture_button_background = 0x7f040018
net.micode.notes:id/menu_set_gesture = 0x7f05003f
net.micode.notes:string/gesture_instruction = 0x7f0a0029
net.micode.notes:id/iv_bg_red_select = 0x7f050026
net.micode.notes:id/sv_note_edit = 0x7f050051
net.micode.notes:drawable/new_note = 0x7f04003e
net.micode.notes:drawable/list_yellow_single = 0x7f04003a
net.micode.notes:drawable/list_yellow_down = 0x7f040038
net.micode.notes:layout/widget_4x = 0x7f060012
net.micode.notes:color/gesture_line_normal = 0x7f02000b
net.micode.notes:id/et_foler_name = 0x7f05001b
net.micode.notes:drawable/edit_green = 0x7f040008
net.micode.notes:drawable/clock = 0x7f040004
net.micode.notes:drawable/list_white_up = 0x7f040037
net.micode.notes:layout/note_item = 0x7f06000c
net.micode.notes:drawable/list_white_single = 0x7f040036
net.micode.notes:color/text_color_state_list = 0x7f020018
net.micode.notes:color/user_query_highlight = 0x7f02001b
net.micode.notes:drawable/list_white_down = 0x7f040034
net.micode.notes:drawable/widget_4x_yellow = 0x7f040051
net.micode.notes:drawable/list_red_up = 0x7f040033
net.micode.notes:drawable/list_green_middle = 0x7f04002d
net.micode.notes:string/menu_delete = 0x7f0a0037
net.micode.notes:drawable/list_folder = 0x7f04002a
net.micode.notes:drawable/list_blue_up = 0x7f040029
net.micode.notes:string/search_setting_description = 0x7f0a0071
net.micode.notes:drawable/list_blue_single = 0x7f040028
net.micode.notes:drawable/ic_warning = 0x7f040023
net.micode.notes:drawable/list_blue_middle = 0x7f040027
net.micode.notes:color/gesture_point_error = 0x7f02000f
net.micode.notes:string/gesture_password_set = 0x7f0a002c
net.micode.notes:drawable/list_background = 0x7f040025
net.micode.notes:drawable/icon_app = 0x7f040024
net.micode.notes:id/btn_italic = 0x7f05000c
net.micode.notes:id/btn_underline = 0x7f050012
net.micode.notes:drawable/font_super = 0x7f040016
net.micode.notes:id/menu_sync = 0x7f050042
net.micode.notes:drawable/ic_format_underline = 0x7f040021
net.micode.notes:drawable/call_record = 0x7f040003
net.micode.notes:drawable/ic_lock_outline = 0x7f040022
net.micode.notes:string/menu_font_small = 0x7f0a0040
net.micode.notes:drawable/ic_format_strikethrough = 0x7f040020
net.micode.notes:drawable/font_normal = 0x7f040013
net.micode.notes:id/minute = 0x7f050043
net.micode.notes:string/gesture_verify_hint = 0x7f0a0031
net.micode.notes:dimen/text_font_size_normal = 0x7f030002
net.micode.notes:drawable/ic_delete = 0x7f04001b
net.micode.notes:style/TextAppearanceSuper = 0x7f0b000b
net.micode.notes:menu/call_note_edit = 0x7f070000
net.micode.notes:color/secondary_text_dark = 0x7f020016
net.micode.notes:id/move = 0x7f050044
net.micode.notes:id/iv_bg_yellow_select = 0x7f05002a
net.micode.notes:color/gesture_error_color = 0x7f020007
net.micode.notes:drawable/gesture_panel_background = 0x7f040019
net.micode.notes:drawable/font_small = 0x7f040015
net.micode.notes:string/menu_sync_cancel = 0x7f0a0050
net.micode.notes:drawable/ic_audio = 0x7f04001a
net.micode.notes:id/text_username = 0x7f050064
net.micode.notes:color/primary_text_dark = 0x7f020015
net.micode.notes:drawable/font_size_selector_bg = 0x7f040014
net.micode.notes:string/call_record_folder_name = 0x7f0a0008
net.micode.notes:drawable/list_green_up = 0x7f04002f
net.micode.notes:id/btnBackToLogin = 0x7f050005
net.micode.notes:color/gesture_link_color = 0x7f02000c
net.micode.notes:drawable/font_large = 0x7f040012
net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0067
net.micode.notes:id/note_edit_view = 0x7f050048
net.micode.notes:drawable/edittext_background = 0x7f040011
net.micode.notes:drawable/delete = 0x7f040005
net.micode.notes:drawable/edit_yellow = 0x7f040010
net.micode.notes:id/note_item = 0x7f050049
net.micode.notes:menu/note_list_options = 0x7f070005
net.micode.notes:id/iv_small_select = 0x7f05002e
net.micode.notes:color/gesture_panel_border = 0x7f02000e
net.micode.notes:string/preferences_account_title = 0x7f0a005d
net.micode.notes:drawable/list_white_middle = 0x7f040035
net.micode.notes:drawable/edit_white = 0x7f04000f
net.micode.notes:drawable/edit_title_white = 0x7f04000d
net.micode.notes:string/button_delete = 0x7f0a0007
net.micode.notes:drawable/new_note_normal = 0x7f04003f
net.micode.notes:xml/searchable = 0x7f0c0001
net.micode.notes:string/menu_folder_delete = 0x7f0a003b
net.micode.notes:string/gesture_too_short = 0x7f0a002d
net.micode.notes:drawable/dropdown_icon = 0x7f040006
net.micode.notes:drawable/list_yellow_up = 0x7f04003b
net.micode.notes:id/note_bg_color_selector = 0x7f050046
net.micode.notes:drawable/list_footer_bg = 0x7f04002b
net.micode.notes:drawable/edit_title_green = 0x7f04000b
net.micode.notes:string/preferences_add_account = 0x7f0a005e
net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
net.micode.notes:color/gesture_hint_color = 0x7f020008
net.micode.notes:string/cancel = 0x7f0a0009
net.micode.notes:dimen/text_font_size_small = 0x7f030003
net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0061
net.micode.notes:drawable/ic_format_italic = 0x7f04001f
net.micode.notes:string/gesture_verify_fail_max = 0x7f0a002f
net.micode.notes:id/iv_bg_red = 0x7f050025
net.micode.notes:drawable/notification = 0x7f040042
net.micode.notes:id/tv_alert_date = 0x7f050054
net.micode.notes:dimen/text_font_size_large = 0x7f030000
net.micode.notes:layout/item_user = 0x7f060015
net.micode.notes:color/toolbar_button_selected = 0x7f02001a
net.micode.notes:drawable/ic_format_color = 0x7f04001e
net.micode.notes:color/toolbar_background = 0x7f020019
net.micode.notes:drawable/edit_title_red = 0x7f04000c
net.micode.notes:id/note_edit_list = 0x7f050047
net.micode.notes:id/iv_alert_icon = 0x7f050020
net.micode.notes:drawable/edit_red = 0x7f040009
net.micode.notes:color/text_color = 0x7f020017
net.micode.notes:id/menu_setting = 0x7f050040
net.micode.notes:string/preferences_menu_cancel = 0x7f0a0068
net.micode.notes:drawable/ic_format_bullet = 0x7f04001d
net.micode.notes:id/iv_bg_white = 0x7f050027
net.micode.notes:id/btn_delete_user = 0x7f05005f
net.micode.notes:drawable/gesture_background = 0x7f040017
net.micode.notes:id/btn_logout = 0x7f05000d
net.micode.notes:drawable/button_background = 0x7f040002
net.micode.notes:string/preferences_last_sync_time = 0x7f0a0066
net.micode.notes:color/gesture_button_background = 0x7f020004
net.micode.notes:color/gesture_text_color = 0x7f020013
net.micode.notes:id/action_select_all = 0x7f050002
net.micode.notes:color/gesture_point_selected = 0x7f020011
net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000e
net.micode.notes:drawable/list_blue_down = 0x7f040026
net.micode.notes:drawable/list_red_middle = 0x7f040031
net.micode.notes:drawable/list_red_down = 0x7f040030
net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
<<<<<<< HEAD
net.micode.notes:drawable/list_green_single = 0x7f040023 net.micode.notes:drawable/list_green_single = 0x7f040023
>>>>>>> a >>>>>>> a
=======
net.micode.notes:drawable/list_green_single = 0x7f04002e
net.micode.notes:string/format_text_color = 0x7f0a0024
net.micode.notes:id/tv_title = 0x7f05005a
net.micode.notes:color/gesture_success_color = 0x7f020012
net.micode.notes:string/preferences_account_summary = 0x7f0a005c
net.micode.notes:color/gesture_line_error = 0x7f02000a
net.micode.notes:array/format_for_exported_note = 0x7f010000
net.micode.notes:drawable/ic_format_bold = 0x7f04001c
net.micode.notes:color/gesture_background = 0x7f020003
net.micode.notes:string/ticker_fail = 0x7f0a0079
net.micode.notes:string/file_name_txt_format = 0x7f0a0018
net.micode.notes:id/gesture_status = 0x7f05001d
net.micode.notes:color/gesture_button_text = 0x7f020006
net.micode.notes:color/gesture_button_ripple = 0x7f020005
net.micode.notes:string/error_sync_internal = 0x7f0a0015
net.micode.notes:drawable/menu_delete = 0x7f04003c
net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
net.micode.notes:id/menu_delete_remind = 0x7f050037
net.micode.notes:drawable/widget_2x_white = 0x7f04004b
net.micode.notes:string/confirm_gesture_pattern = 0x7f0a000b
net.micode.notes:color/hint_color = 0x7f020014
net.micode.notes:string/sync_progress_login = 0x7f0a0076
net.micode.notes:array/menu_share_ways = 0x7f010001
net.micode.notes:drawable/edit_title_blue = 0x7f04000a
net.micode.notes:id/navigation_bar = 0x7f050045
net.micode.notes:color/background_color = 0x7f020000
net.micode.notes:drawable/list_yellow_middle = 0x7f040039
net.micode.notes:color/button_color = 0x7f020001
>>>>>>> a

@ -29,6 +29,8 @@ color primary_text_dark
color secondary_text_dark color secondary_text_dark
color text_color color text_color
color text_color_state_list color text_color_state_list
color toolbar_background
color toolbar_button_selected
color user_query_highlight color user_query_highlight
dimen text_font_size_large dimen text_font_size_large
dimen text_font_size_medium dimen text_font_size_medium
@ -65,6 +67,13 @@ drawable gesture_background
drawable gesture_button_background drawable gesture_button_background
drawable gesture_panel_background drawable gesture_panel_background
drawable ic_audio drawable ic_audio
drawable ic_delete
drawable ic_format_bold
drawable ic_format_bullet
drawable ic_format_color
drawable ic_format_italic
drawable ic_format_strikethrough
drawable ic_format_underline
drawable ic_lock_outline drawable ic_lock_outline
>>>>>>> a >>>>>>> a
drawable ic_warning drawable ic_warning
@ -123,15 +132,30 @@ id btnBackToLogin
id btnLogin id btnLogin
id btnRegister id btnRegister
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
id btn_confirm
>>>>>>> a
======= =======
id btn_add_user
id btn_bold
id btn_bullet
id btn_confirm id btn_confirm
id btn_confirm_add_user
id btn_delete_image
id btn_delete_user
id btn_italic
>>>>>>> a >>>>>>> a
id btn_logout id btn_logout
id btn_new_note id btn_new_note
id btn_set_bg_color id btn_set_bg_color
id btn_strikethrough
id btn_text_color
id btn_underline
id cb_edit_item id cb_edit_item
id date id date
id delete id delete
id dialog_title
id etLoginPassword id etLoginPassword
id etLoginUsername id etLoginUsername
id etPassword id etPassword
@ -145,6 +169,8 @@ id gesture_status
>>>>>>> a >>>>>>> a
id hour id hour
id imageView id imageView
id input_password
id input_username
id iv_alert_icon id iv_alert_icon
id iv_bg_blue id iv_bg_blue
id iv_bg_blue_select id iv_bg_blue_select
@ -164,6 +190,7 @@ id iv_lock_icon
id iv_medium_select id iv_medium_select
id iv_small_select id iv_small_select
id iv_super_select id iv_super_select
id list_view_users
id ll_font_large id ll_font_large
id ll_font_normal id ll_font_normal
id ll_font_small id ll_font_small
@ -178,6 +205,7 @@ id menu_delete_remind
id menu_export_text id menu_export_text
id menu_font_size id menu_font_size
id menu_list_mode id menu_list_mode
id menu_manage_users
id menu_new_folder id menu_new_folder
id menu_new_note id menu_new_note
id menu_search id menu_search
@ -205,6 +233,11 @@ id selection_menu
id speech_to_text_btn id speech_to_text_btn
id sv_note_edit id sv_note_edit
id textView id textView
id text_username
id title_user_management
id toolbar
id tvLoginTitle
id tvRegisterTitle
id tv_alert_date id tv_alert_date
id tv_folder_name id tv_folder_name
<<<<<<< HEAD <<<<<<< HEAD
@ -221,10 +254,13 @@ id widget_text
layout account_dialog_title layout account_dialog_title
layout activity_login layout activity_login
layout activity_register layout activity_register
layout activity_user_management
layout add_account_text layout add_account_text
layout datetime_picker layout datetime_picker
layout dialog_add_user
layout dialog_edit_text layout dialog_edit_text
layout folder_list_item layout folder_list_item
layout item_user
layout layout_custom_toast layout layout_custom_toast
layout note_edit layout note_edit
layout note_edit_list_item layout note_edit_list_item
@ -279,13 +315,22 @@ string failed_sdcard_export
string file_name_txt_format string file_name_txt_format
string file_path string file_path
string folder_exist string folder_exist
string format_bold
string format_bullet
string format_date_ymd string format_date_ymd
string format_datetime_mdhm string format_datetime_mdhm
string format_exported_file_location string format_exported_file_location
string format_folder_files_count string format_folder_files_count
string format_italic
string format_move_notes_to_folder string format_move_notes_to_folder
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
string format_strikethrough
string format_text_color
string format_underline
>>>>>>> a
string gesture_forgot_message string gesture_forgot_message
string gesture_forgot_pattern string gesture_forgot_pattern
string gesture_forgot_title string gesture_forgot_title

@ -0,0 +1,20 @@
{
"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"
}

@ -1,6 +1,7 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
ADDED 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-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
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
@ -18,6 +19,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-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
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
=======
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148: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-148:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
>>>>>>> a >>>>>>> a
package package
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:4:5-31 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:4:5-31
@ -65,9 +76,13 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78
application application
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< 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-137:19
======= =======
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19
>>>>>>> a
=======
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-147:19
>>>>>>> a >>>>>>> a
android:label android:label
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41
@ -257,137 +272,145 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57
activity#net.micode.notes.login.UserManagementActivity
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-65
android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:19-63
activity#net.micode.notes.ui.NoteEditActivity activity#net.micode.notes.ui.NoteEditActivity
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-77:20 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:9-79:20
android:launchMode android:launchMode
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-43 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-43
android:configChanges android:configChanges
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:13-74 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-74
android:theme android:theme
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-45 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:13-45
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:52:13-48 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:54: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 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 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:13-65:29
android:scheme android:scheme
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:17-38 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-38
tools:ignore tools:ignore
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:17-47 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-47
action#android.intent.action.VIEW action#android.intent.action.VIEW
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-69 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-69
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:25-66 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:25-66
category#android.intent.category.DEFAULT category#android.intent.category.DEFAULT
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
data data
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
android:mimeType android:mimeType
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:63: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 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 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT action#android.intent.action.INSERT_OR_EDIT
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:17-79 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:17-79
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:25-76 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT 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 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:72:13-75:29
action#android.intent.action.SEARCH action#android.intent.action.SEARCH
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:17-71 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:17-71
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:25-68 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:25-68
meta-data#android.app.searchable meta-data#android.app.searchable
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:74:13-76:54 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:13-78:54
android:resource android:resource
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:17-51 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:78:17-51
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:75:17-54 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:77:17-54
provider#net.micode.notes.data.NotesProvider provider#net.micode.notes.data.NotesProvider
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:80:9-83:43 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:9-85:43
android:authorities android:authorities
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:13-47 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:84:13-47
android:multiprocess android:multiprocess
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-40 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:85:13-40
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:81:13-63 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x receiver#net.micode.notes.widget.NoteWidgetProvider_2x
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:86:9-96:20 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:9-98:20
android:label android:label
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:13-50 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:13-50
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:87:13-57 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE 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 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29
action#android.appwidget.action.APPWIDGET_UPDATE action#android.appwidget.action.APPWIDGET_UPDATE
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED action#android.appwidget.action.APPWIDGET_DELETED
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82
meta-data#android.appwidget.provider meta-data#android.appwidget.provider
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58
android:resource android:resource
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x receiver#net.micode.notes.widget.NoteWidgetProvider_4x
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:98:9-108:20 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:9-110:20
android:label android:label
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:13-50 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:102:13-50
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:99:13-57 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:101:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver receiver#net.micode.notes.ui.AlarmInitReceiver
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:9-115:20 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:9-117:20
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:19-55 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED intent-filter#action:name:android.intent.action.BOOT_COMPLETED
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:112:13-114:29 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:114:13-116:29
action#android.intent.action.BOOT_COMPLETED action#android.intent.action.BOOT_COMPLETED
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:17-79 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:17-79
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:25-76 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:25-76
receiver#net.micode.notes.ui.AlarmReceiver receiver#net.micode.notes.ui.AlarmReceiver
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:118:9-120:41 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:9-122:41
android:process android:process
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:13-38 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:122:13-38
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:119:13-61 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:121:13-61
activity#net.micode.notes.ui.AlarmAlertActivity activity#net.micode.notes.ui.AlarmAlertActivity
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:123:9-127:87 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:9-129:87
android:label android:label
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:13-45 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-45
android:launchMode android:launchMode
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-48 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:128:13-48
android:theme android:theme
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-75 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:129:13-75
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:124:13-50 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity activity#net.micode.notes.ui.NotesPreferenceActivity
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:130:9-134:72 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:9-136:72
android:label android:label
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:13-54 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-54
android:launchMode android:launchMode
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-43 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-43
android:theme android:theme
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-60 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-60
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:131:13-71 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:137:9-139:40 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:9-141:40
android:exported android:exported
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:13-37 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:141:13-37
android:name android:name
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:138:13-74 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:140:13-74
meta-data#android.app.default_searchable meta-data#android.app.default_searchable
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:142:9-144:52 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:9-146:52
android:value android:value
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:13-49 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:146:13-49
android:name android:name
<<<<<<< HEAD
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58
>>>>>>> a >>>>>>> a
=======
ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:145:13-58
>>>>>>> a
uses-sdk 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 reason: use-sdk injection requested
INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml

@ -69,6 +69,8 @@
android:theme="@style/GestureVerifyTheme" android:theme="@style/GestureVerifyTheme"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:windowSoftInputMode="stateAlwaysHidden" /> android:windowSoftInputMode="stateAlwaysHidden" />
<!-- 用户管理的Activity -->
<activity android:name=".login.UserManagementActivity"/>
<!-- 编辑笔记的Activity --> <!-- 编辑笔记的Activity -->
<activity <activity
android:name=".ui.NoteEditActivity" android:name=".ui.NoteEditActivity"

@ -7,6 +7,7 @@ package net.micode.notes.data;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log; import android.util.Log;
@ -69,10 +70,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 原始父ID NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 原始父ID
NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + // Google任务ID NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + // Google任务ID
NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + // 笔记版本号 NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + // 笔记版本号
<<<<<<< HEAD
NoteColumns.IMAGE_PATH + " TEXT," + // 新增列存储图片路径 NoteColumns.IMAGE_PATH + " TEXT," + // 新增列存储图片路径
<<<<<<< HEAD <<<<<<< HEAD
NoteColumns.AUDIO_PATH + " TEXT" + //新增列存储音频路径 NoteColumns.AUDIO_PATH + " TEXT" + //新增列存储音频路径
======= =======
=======
NoteColumns.IMAGE_PATH + " TEXT DEFAULT NULL," + // 新增列存储图片路径
>>>>>>> a
NoteColumns.AUDIO_PATH + " TEXT," + //新增列存储音频路径 NoteColumns.AUDIO_PATH + " TEXT," + //新增列存储音频路径
NoteColumns.GESTURE_PASSWORD + " TEXT" + // 新增手势密码字段 NoteColumns.GESTURE_PASSWORD + " TEXT" + // 新增手势密码字段
>>>>>>> a >>>>>>> a
@ -411,7 +416,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
createUserTable(db); // 确保调用创建用户表的方法 createUserTable(db); // 确保调用创建用户表的方法
} }
if (oldVersion < 6) { // 增加照片路径新列 if (oldVersion < 6) { // 增加照片路径新列
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.IMAGE_PATH + " TEXT"); db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.IMAGE_PATH + " TEXT DEFAULT NULL");
} }
if(oldVersion < 7){ if(oldVersion < 7){
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.USER_ID + "INTEGER NOT NULL DEFAULT -1"); db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.USER_ID + "INTEGER NOT NULL DEFAULT -1");
@ -486,5 +491,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0"); + " INTEGER NOT NULL DEFAULT 0");
} }
public Cursor getAllUsers() {
SQLiteDatabase db = this.getReadableDatabase();
return db.query(TABLE.USER, null, null, null, null, null, null);
}
public long addUser(String username, String password) {
SQLiteDatabase db = this.getWritableDatabase();
ContentValues values = new ContentValues();
values.put(TABLE.USERNAME_COLUMN, username);
values.put(TABLE.PASSWORD_COLUMN, password);
return db.insert(TABLE.USER, null, values);
}
public int deleteUser(String username) {
SQLiteDatabase db = this.getWritableDatabase();
return db.delete(TABLE.USER, TABLE.USERNAME_COLUMN + "=?", new String[]{username});
}
} }

@ -0,0 +1,69 @@
package net.micode.notes.login;
import android.content.Context;
import android.database.Cursor;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import net.micode.notes.R;
import net.micode.notes.data.NotesDatabaseHelper;
public class UserListAdapter extends BaseAdapter {
private Context context;
private Cursor cursor;
private NotesDatabaseHelper dbHelper;
public UserListAdapter(Context context, Cursor cursor, NotesDatabaseHelper dbHelper) {
this.context = context;
this.cursor = cursor;
this.dbHelper = dbHelper;
}
@Override
public int getCount() {
return cursor.getCount();
}
@Override
public Object getItem(int position) {
cursor.moveToPosition(position);
return cursor;
}
@Override
public long getItemId(int position) {
cursor.moveToPosition(position);
return cursor.getLong(cursor.getColumnIndex("id"));
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = LayoutInflater.from(context).inflate(R.layout.item_user, parent, false);
}
TextView usernameTextView = (TextView) convertView.findViewById(R.id.text_username);
Button deleteButton = (Button) convertView.findViewById(R.id.btn_delete_user);
if (cursor.moveToPosition(position)) {
String username = cursor.getString(cursor.getColumnIndex("username"));
usernameTextView.setText(username);
deleteButton.setOnClickListener(v -> {
dbHelper.deleteUser(username);
Toast.makeText(context, "用户已删除", Toast.LENGTH_SHORT).show();
cursor.requery(); // 刷新数据
notifyDataSetChanged(); // 更新列表
});
}
return convertView;
}
}

@ -0,0 +1,73 @@
package net.micode.notes.login;
import android.app.Activity;
import android.app.AlertDialog;
import android.database.Cursor;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.Toast;
import net.micode.notes.R;
import net.micode.notes.data.NotesDatabaseHelper;
public class UserManagementActivity extends Activity {
private NotesDatabaseHelper dbHelper;
private ListView userListView;
private UserListAdapter userListAdapter;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_management);
dbHelper = new NotesDatabaseHelper(this);
userListView = (ListView) findViewById(R.id.list_view_users);
loadUsers();
findViewById(R.id.btn_add_user).setOnClickListener(v -> showAddUserDialog());
}
private void loadUsers() {
Cursor cursor = dbHelper.getAllUsers();
userListAdapter = new UserListAdapter(this, cursor, dbHelper);
userListView.setAdapter(userListAdapter);
}
private void showAddUserDialog() {
View view = LayoutInflater.from(this).inflate(R.layout.dialog_add_user, null);
EditText usernameInput = (EditText) view.findViewById(R.id.input_username);
EditText passwordInput = (EditText) view.findViewById(R.id.input_password);
new AlertDialog.Builder(this)
.setTitle("添加用户")
.setView(view)
.setPositiveButton("添加", (dialog, which) -> {
String username = usernameInput.getText().toString();
String password = passwordInput.getText().toString();
if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
Toast.makeText(this, "用户名和密码不能为空", Toast.LENGTH_SHORT).show();
} else {
long result = dbHelper.addUser(username, password);
if (result != -1) {
Toast.makeText(this, "用户添加成功", Toast.LENGTH_SHORT).show();
loadUsers();
} else {
Toast.makeText(this, "添加失败,用户名可能已存在", Toast.LENGTH_SHORT).show();
}
}
})
.setNegativeButton("取消", null)
.show();
}
}

@ -16,6 +16,8 @@
package net.micode.notes.model; package net.micode.notes.model;
import static java.sql.Types.NULL;
import android.content.ContentProviderOperation; import android.content.ContentProviderOperation;
import android.content.ContentProviderResult; import android.content.ContentProviderResult;
import android.content.ContentUris; import android.content.ContentUris;
@ -61,7 +63,7 @@ public class Note {
Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
long noteId = 0; long noteId;
try { try {
noteId = Long.valueOf(uri.getPathSegments().get(1)); noteId = Long.valueOf(uri.getPathSegments().get(1));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {

@ -76,6 +76,7 @@ public class WorkingNote {
// 标记笔记是否被删除 // 标记笔记是否被删除
private boolean mIsDeleted; private boolean mIsDeleted;
// 笔记设置变化监听器 // 笔记设置变化监听器
private NoteSettingChangedListener mNoteSettingStatusListener; private NoteSettingChangedListener mNoteSettingStatusListener;
@ -268,6 +269,24 @@ public class WorkingNote {
// 创建一个新的 WorkingNote 实例指定所属文件夹ID // 创建一个新的 WorkingNote 实例指定所属文件夹ID
WorkingNote note = new WorkingNote(context, folderId); WorkingNote note = new WorkingNote(context, folderId);
// 获取当前用户的 userId
SharedPreferences prefs = context.getSharedPreferences("user_session", Context.MODE_PRIVATE);
int userId = prefs.getInt("user_id", -1);
if (userId == -1) {
Log.e(TAG, "无法创建新便签:用户未登录");
return null; // 用户未登录,返回 null
}
// 在创建实例时生成新的 noteId
long noteId = Note.getNewNoteId(context, folderId, userId);
if (noteId <= 0) {
Log.e(TAG, "无法创建新便签noteId 无效");
return null; // 生成 noteId 失败,返回 null
}
// 设置 noteId 和其他属性
note.mNoteId = noteId;
// 设置笔记的默认背景颜色 // 设置笔记的默认背景颜色
note.setBgColorId(defaultBgColorId); note.setBgColorId(defaultBgColorId);
@ -276,7 +295,6 @@ public class WorkingNote {
// 设置与笔记关联的小部件类型 // 设置与笔记关联的小部件类型
note.setWidgetType(widgetType); note.setWidgetType(widgetType);
// 返回初始化好的空笔记对象 // 返回初始化好的空笔记对象
return note; return note;
} }
@ -306,22 +324,25 @@ public class WorkingNote {
if (isWorthSaving()) { if (isWorthSaving()) {
// 检查笔记是否已存在于数据库中 // 检查笔记是否已存在于数据库中
if (!existInDatabase()) { if (!existInDatabase()) {
// 获取当前登录用户的 user_id // 如果笔记已经在创建时生成了 noteId不再重复生成
SharedPreferences prefs = mContext.getSharedPreferences("user_session", Context.MODE_PRIVATE); if (mNoteId <= 0) {
// 获取当前登录用户的 user_id
SharedPreferences prefs = mContext.getSharedPreferences("user_session", Context.MODE_PRIVATE);
int userId = prefs.getInt("user_id", -1); // -1 表示未登录 int userId = prefs.getInt("user_id", -1); // -1 表示未登录
Log.d("WorkingNote", "Saving note with userId: " + userId); Log.d("WorkingNote", "Saving note with userId: " + userId);
if (userId == -1) { if (userId == -1) {
Log.e(TAG, "无法保存笔记,因为用户未登录"); Log.e(TAG, "无法保存笔记,因为用户未登录");
return false; // 未登录时不保存 return false; // 未登录时不保存
} }
// 如果笔记不在数据库中为该笔记生成一个新的ID并关联 user_id mNoteId = Note.getNewNoteId(mContext, mFolderId, userId);
if ((mNoteId = Note.getNewNoteId(mContext, mFolderId, userId)) == 0) { // 如果笔记不在数据库中为该笔记生成一个新的ID并关联 user_id
// 若生成新ID失败记录日志并返回 false 表示保存失败 if (mNoteId <= 0) {
Log.e(TAG, "创建新便签失败:" + mNoteId); Log.e(TAG, "创建新便签失败:" + mNoteId);
return false; return false;
}
} }
} }
@ -717,13 +738,27 @@ public class WorkingNote {
} }
return null; return null;
} }
public void deleteImagePathFromDatabase() {
// 清除 IMAGE_PATH 列中存储的路径
mNote.setNoteValue(NoteColumns.IMAGE_PATH, null);
mNote.syncNote(mContext, mNoteId);
}
public Bitmap loadImageFromFile(String imagePath) { public Bitmap loadImageFromFile(String imagePath) {
File imgFile = new File(imagePath); if (TextUtils.isEmpty(imagePath)) {
if (imgFile.exists()) { Log.e(TAG, "Image path is empty or null");
return BitmapFactory.decodeFile(imgFile.getAbsolutePath()); return null;
} }
return null;
File imageFile = new File(imagePath);
if (!imageFile.exists()) {
Log.e(TAG, "Image file does not exist: " + imagePath);
return null;
}
return BitmapFactory.decodeFile(imagePath);
} }
// 获取音频路径 // 获取音频路径
public String getAudioPathFromDatabase() { public String getAudioPathFromDatabase() {
Cursor cursor = mContext.getContentResolver().query( Cursor cursor = mContext.getContentResolver().query(
@ -762,6 +797,20 @@ public class WorkingNote {
mNote.setNoteValue(NoteColumns.GESTURE_PASSWORD, mGesturePassword); mNote.setNoteValue(NoteColumns.GESTURE_PASSWORD, mGesturePassword);
} }
} }
<<<<<<< HEAD
>>>>>>> a
=======
// 添加方法,将 HTML 格式的内容保存到数据库
public void setRichTextContent(String htmlContent) {
if (!TextUtils.equals(mContent, htmlContent)) {
mContent = htmlContent;
mNote.setTextData(DataColumns.CONTENT, mContent); // 保存 HTML 格式的内容
}
}
// 从数据库加载富文本内容
public String getRichTextContent() {
return mContent; // 从数据库中获取 HTML 格式的内容
}
>>>>>>> a >>>>>>> a
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save