增加了菜单选项功能，增加了闹钟功能

Notes-master2/app/build.gradle

@@ -17,4 +17,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    dependencies {
+        implementation 'com.android.support:appcompat-v7:28.0.0'
+    }
 }

Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu May 11 21:34:16 CST 2023
+#Wed May 24 20:01:26 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat

Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu May 11 21:43:04 CST 2023
+#Wed May 24 20:01:27 CST 2023
 base.0=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -56,221 +56,223 @@
 35
 36    <application
 36-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:36:5-151:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:37:9-42
-39        android:label="@string/app_name"
-39-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:38:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:39:9-52:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:40:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:41:13-74
-44            android:label="@string/app_name"
-44-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:42:13-45
-45            android:launchMode="singleTop"
-45-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:43:13-43
-46            android:theme="@style/NoteTheme"
-46-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:44:13-45
-47            android:uiOptions="splitActionBarWhenNarrow"
-47-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:45:13-57
-48            android:windowSoftInputMode="adjustPan" >
-48-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:46:13-52
-49            <intent-filter>
-49-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:13-51:29
-50                <action android:name="android.intent.action.MAIN" />
-50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:17-69
-50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:25-66
-51
-52                <category android:name="android.intent.category.LAUNCHER" />
-52-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:17-77
-52-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:27-74
-53            </intent-filter>
-54        </activity>
-55        <activity
-55-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:54:9-82:20
-56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:55:13-48
-57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:56:13-74
-58            android:launchMode="singleTop"
-58-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:57:13-43
-59            android:theme="@style/NoteTheme" >
-59-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:58:13-45
-60            <intent-filter android:scheme="http" >
-60-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:13-65:29
-60-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:28-49
-61                <action android:name="android.intent.action.VIEW" />
-61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-69
-61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76
-63-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78
-65-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
+37        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
+37-->[com.android.support:support-compat:28.0.0] D:\tools\gradle\repository\caches\transforms-3\222d3d96047e18a39d15dd7f96eb4869\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
+38        android:debuggable="true"
+39        android:icon="@drawable/icon_app"
+39-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:37:9-42
+40        android:label="@string/app_name"
+40-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:38:9-41
+41        android:testOnly="true" >
+42        <activity
+42-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:39:9-52:20
+43            android:name="net.micode.notes.ui.NotesListActivity"
+43-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:40:13-49
+44            android:configChanges="keyboardHidden|orientation|screenSize"
+44-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:41:13-74
+45            android:label="@string/app_name"
+45-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:42:13-45
+46            android:launchMode="singleTop"
+46-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:43:13-43
+47            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+47-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:44:13-71
+48            android:uiOptions="splitActionBarWhenNarrow"
+48-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:45:13-57
+49            android:windowSoftInputMode="adjustPan" >
+49-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:46:13-52
+50            <intent-filter>
+50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:13-51:29
+51                <action android:name="android.intent.action.MAIN" />
+51-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:17-69
+51-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:25-66
+52
+53                <category android:name="android.intent.category.LAUNCHER" />
+53-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:17-77
+53-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:27-74
+54            </intent-filter>
+55        </activity>
+56        <activity
+56-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:54:9-82:20
+57            android:name="net.micode.notes.ui.NoteEditActivity"
+57-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:55:13-48
+58            android:configChanges="keyboardHidden|orientation|screenSize"
+58-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:56:13-74
+59            android:launchMode="singleTop"
+59-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:57:13-43
+60            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
+60-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:58:13-71
+61            <intent-filter android:scheme="http" >
+61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:13-65:29
+61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:28-49
+62                <action android:name="android.intent.action.VIEW" />
+62-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-69
+62-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:25-66
+63
+64                <category android:name="android.intent.category.DEFAULT" />
+64-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76
+64-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73
+65
+66                <data android:mimeType="vnd.android.cursor.item/text_note" />
 66-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78
 66-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75
-67            </intent-filter>
-68            <intent-filter>
-68-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:13-72:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:17-79
-69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76
-71-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78
-73-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
+67                <data android:mimeType="vnd.android.cursor.item/call_note" />
+67-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78
+67-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75
+68            </intent-filter>
+69            <intent-filter>
+69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:13-72:29
+70                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+70-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:17-79
+70-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:25-76
+71
+72                <category android:name="android.intent.category.DEFAULT" />
+72-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76
+72-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73
+73
+74                <data android:mimeType="vnd.android.cursor.item/text_note" />
 74-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78
 74-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:13-77:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:17-71
-77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76
-79-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:79:13-81:54
-83                android:name="android.app.searchable"
-83-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:80:17-54
-84                android:resource="@xml/searchable" />
-84-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:81:17-51
-85        </activity>
-86
-87        <provider
-87-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:9-88:43
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-63
-89            android:authorities="micode_notes"
-89-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-47
-90            android:exported="true"
-90-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-36
-91            android:multiprocess="true" />
-91-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:88:13-40
-92
-93        <receiver
-93-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:9-102:20
-94            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-94-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-57
-95            android:label="@string/app_widget2x2" >
-95-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-50
-96            <intent-filter>
-96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
-97                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
-97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
-98                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
-98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
-99                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
-99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
-100            </intent-filter>
-101
-102            <meta-data
-102-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
-103                android:name="android.appwidget.provider"
-103-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
-104                android:resource="@xml/widget_2x_info" />
-104-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
-105        </receiver>
-106        <receiver
-106-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:9-116:20
-107            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-107-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-57
-108            android:label="@string/app_widget4x4" >
-108-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:105:13-50
-109            <intent-filter>
-109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
-110                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
-110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
-111                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
-111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
-112                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
-112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
-113            </intent-filter>
-114
-115            <meta-data
-115-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
-116                android:name="android.appwidget.provider"
-116-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
-117                android:resource="@xml/widget_4x_info" />
-117-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
-118        </receiver>
-119        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:9-122:20
-119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:19-55
-120            <intent-filter>
-120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:13-121:29
-121                <action android:name="android.intent.action.BOOT_COMPLETED" />
-121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:17-79
-121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:25-76
-122            </intent-filter>
-123        </receiver>
-124        <receiver
-124-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:9-127:20
-125            android:name="net.micode.notes.ui.AlarmReceiver"
-125-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-61
-126            android:process=":remote" >
-126-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:126:13-38
-127        </receiver>
-128
-129        <activity
-129-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:9-134:20
-130            android:name="net.micode.notes.ui.AlarmAlertActivity"
-130-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-50
-131            android:label="@string/app_name"
-131-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-45
-132            android:launchMode="singleInstance"
-132-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-48
-133            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-133-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:133:13-75
-134        </activity>
-135        <activity
-135-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:9-141:20
-136            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-136-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-71
-137            android:label="@string/preferences_title"
-137-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-54
-138            android:launchMode="singleTop"
-138-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-43
-139            android:theme="@android:style/Theme.Holo.Light" >
-139-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:140:13-60
-140        </activity>
-141
-142        <service
-142-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:9-146:19
-143            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-143-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-74
-144            android:exported="false" >
-144-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:145:13-37
-145        </service>
-146
-147        <meta-data
-147-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:9-150:52
-148            android:name="android.app.default_searchable"
-148-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-58
-149            android:value=".ui.NoteEditActivity" />
-149-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:150:13-49
-150    </application>
-151
-152</manifest>
+75                <data android:mimeType="vnd.android.cursor.item/call_note" />
+75-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78
+75-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75
+76            </intent-filter>
+77            <intent-filter>
+77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:13-77:29
+78                <action android:name="android.intent.action.SEARCH" />
+78-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:17-71
+78-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:25-68
+79
+80                <category android:name="android.intent.category.DEFAULT" />
+80-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76
+80-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73
+81            </intent-filter>
+82
+83            <meta-data
+83-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:79:13-81:54
+84                android:name="android.app.searchable"
+84-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:80:17-54
+85                android:resource="@xml/searchable" />
+85-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:81:17-51
+86        </activity>
+87
+88        <provider
+88-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:9-88:43
+89            android:name="net.micode.notes.data.NotesProvider"
+89-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-63
+90            android:authorities="micode_notes"
+90-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-47
+91            android:exported="true"
+91-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-36
+92            android:multiprocess="true" />
+92-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:88:13-40
+93
+94        <receiver
+94-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:9-102:20
+95            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+95-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-57
+96            android:label="@string/app_widget2x2" >
+96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-50
+97            <intent-filter>
+97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
+98                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
+98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
+99                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
+99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
+100                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+100-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
+100-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
+101            </intent-filter>
+102
+103            <meta-data
+103-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
+104                android:name="android.appwidget.provider"
+104-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
+105                android:resource="@xml/widget_2x_info" />
+105-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
+106        </receiver>
+107        <receiver
+107-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:9-116:20
+108            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+108-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-57
+109            android:label="@string/app_widget4x4" >
+109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:105:13-50
+110            <intent-filter>
+110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29
+111                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84
+111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81
+112                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85
+112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82
+113                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+113-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85
+113-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82
+114            </intent-filter>
+115
+116            <meta-data
+116-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58
+117                android:name="android.appwidget.provider"
+117-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58
+118                android:resource="@xml/widget_4x_info" />
+118-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55
+119        </receiver>
+120        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:9-122:20
+120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:19-55
+121            <intent-filter>
+121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:13-121:29
+122                <action android:name="android.intent.action.BOOT_COMPLETED" />
+122-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:17-79
+122-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:25-76
+123            </intent-filter>
+124        </receiver>
+125        <receiver
+125-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:9-127:20
+126            android:name="net.micode.notes.ui.AlarmReceiver"
+126-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-61
+127            android:process=":remote" >
+127-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:126:13-38
+128        </receiver>
+129
+130        <activity
+130-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:9-134:20
+131            android:name="net.micode.notes.ui.AlarmAlertActivity"
+131-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-50
+132            android:label="@string/app_name"
+132-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-45
+133            android:launchMode="singleInstance"
+133-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-48
+134            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+134-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:133:13-75
+135        </activity>
+136        <activity
+136-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:9-141:20
+137            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+137-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-71
+138            android:label="@string/preferences_title"
+138-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-54
+139            android:launchMode="singleTop"
+139-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-43
+140            android:theme="@android:style/Theme.Holo.Light" >
+140-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:140:13-60
+141        </activity>
+142
+143        <service
+143-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:9-146:19
+144            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+144-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-74
+145            android:exported="false" >
+145-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:145:13-37
+146        </service>
+147
+148        <meta-data
+148-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:9-150:52
+149            android:name="android.app.default_searchable"
+149-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-58
+150            android:value=".ui.NoteEditActivity" />
+150-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:150:13-49
+151    </application>
+152
+153</manifest>

Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
         android:debuggable="true"
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
@@ -43,7 +44,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
@@ -56,7 +57,7 @@
             android:name="net.micode.notes.ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
             <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 

Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
         android:debuggable="true"
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
@@ -43,7 +44,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
@@ -56,7 +57,7 @@
             android:name="net.micode.notes.ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
             <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />
 

Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json

@@ -3,6 +3,23 @@
         {
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
             "map": [
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\222d3d96047e18a39d15dd7f96eb4869\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "100",
+                        "endOffsets": "151"
+                    },
+                    "to": {
+                        "startLines": "124",
+                        "startColumns": "4",
+                        "startOffsets": "8005",
+                        "endColumns": "100",
+                        "endOffsets": "8101"
+                    }
+                },
                 {
                     "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
@@ -33,12 +50,29 @@
                         "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665",
+                        "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
                         "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+                        "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726"
+                    }
+                },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\4a288c2e0b4e80163f908c9a00135d0d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+                        "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",
+                        "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
+                        "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+                        "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
+                    },
+                    "to": {
+                        "startLines": "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,121",
+                        "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",
+                        "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,7808",
+                        "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+                        "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,7881"
                     }
                 }
             ]

Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json

@@ -3,6 +3,23 @@
         {
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
             "map": [
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\222d3d96047e18a39d15dd7f96eb4869\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+                    "from": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "55",
+                        "endColumns": "100",
+                        "endOffsets": "151"
+                    },
+                    "to": {
+                        "startLines": "124",
+                        "startColumns": "4",
+                        "startOffsets": "8012",
+                        "endColumns": "100",
+                        "endOffsets": "8108"
+                    }
+                },
                 {
                     "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
@@ -14,12 +31,29 @@
                         "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6121,6170,6217,6264,6311,6356,6407,6460,6535,6594,6651,6725,6789,6858,6936,7046,7150,7223,7289,7344,7409,7474,7523,7606,7684,7722,7767,7893,7955,8113,8168,8227,8294,8352,8414,8462,8507,8555,8606,8672",
+                        "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
                         "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+                        "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6116,6165,6212,6259,6306,6351,6402,6455,6530,6589,6646,6720,6784,6853,6931,7041,7145,7218,7284,7339,7404,7469,7518,7601,7679,7717,7762,7810,7950,8007,8163,8222,8289,8347,8409,8457,8502,8550,8601,8667,8733"
+                    }
+                },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\4a288c2e0b4e80163f908c9a00135d0d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+                        "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",
+                        "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
+                        "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+                        "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
+                    },
+                    "to": {
+                        "startLines": "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,121",
+                        "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",
+                        "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,7815",
+                        "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+                        "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,7888"
                     }
                 },
                 {

Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -2,6 +2,140 @@
     "logs": [
         {
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "map": [
+                {
+                    "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8119,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8523,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "14501,17612,17708,17791,17887,17956,17999,18051,18103,18152,18215,18273,18324,18408,18502,18610,18681,18765,18848,18914,18997,19099,19160,19222,19273,19351,19404,19464,19569,19628,19730,19785,19856,19905,19963,20010,20069,20126,20197,20258,20315,20365,20417,20470,20520,20570,20630,20683,20749,20811,20874,20921,20976,21064,21122,21184,21234,21279,21322,21382,21449,21504,21559,21612,21659,21712,21768,21816,21871,21924,22008,22075,22139,22235,22309,22390,22479,22642,22786,22865,22940,23022,23081,23161,23241,23296,23418,23521,23562,23615,23725,23799,23935,24003,24089,24169,24238,24332,24391,24446,24508,24568,24678",
+                        "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "14849,17703,17786,17882,17951,17994,18046,18098,18147,18210,18268,18319,18403,18497,18605,18676,18760,18843,18909,18992,19094,19155,19217,19268,19346,19399,19459,19564,19623,19725,19780,19851,19900,19958,20005,20064,20121,20192,20253,20310,20360,20412,20465,20515,20565,20625,20678,20744,20806,20869,20916,20971,21059,21117,21179,21229,21274,21317,21377,21444,21499,21554,21607,21654,21707,21763,21811,21866,21919,22003,22070,22134,22230,22304,22385,22474,22637,22781,22860,22935,23017,23076,23156,23236,23291,23413,23516,23557,23610,23667,23794,23859,23998,24084,24164,24233,24327,24386,24441,24503,24563,24673,24763"
+                    }
+                },
+                {
+                    "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\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": "189,190,191,192,193",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "12570,12622,12675,12728,12780",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "12617,12670,12723,12775,12827"
+                    }
+                },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\4a288c2e0b4e80163f908c9a00135d0d\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,868,894,1062,1088,1119,1127,1133,1147,1169,1174,1179,1189,1198,1207,1211,1218,1226,1233,1234,1243,1246,1249,1253,1257,1261,1264,1265,1269,1273,1283,1288,1295,1301,1302,1305,1309,1314,1316,1318,1321,1324,1326,1330,1333,1340,1343,1346,1350,1352,1356,1358,1360,1362,1366,1374,1382,1394,1400,1409,1412,1423,1426,1431,1432,1452,1510,1569,1570,1580,1589,1590,1592,1596,1599,1602,1605,1608,1611,1614,1617,1621,1624,1627,1630,1634,1637,1641,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1667,1669,1670,1671,1672,1673,1674,1675,1676,1678,1679,1681,1682,1684,1686,1687,1689,1690,1691,1692,1693,1694,1696,1697,1698,1699,1700,1712,1714,1716,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1765,1767,1771,1775,1776,1777,1778,1779,1780,1781,1782,1784,1786,1788,1790,1792,1793,1794,1795,1797,1799,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1815,1816,1817,1818,1820,1822,1823,1825,1826,1828,1830,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1845,1846,1847,1848,1850,1851,1852,1853,1854,1856,1858,1860,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875",
+                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1614,1691,1769,1875,1981,2060,2140,2197,2255,2329,2404,2469,2535,2595,2656,2728,2801,2868,2936,2995,3054,3113,3172,3231,3285,3339,3392,3446,3500,3554,3740,3814,3893,3966,4040,4111,4183,4255,4328,4385,4443,4516,4590,4664,4739,4811,4884,4954,5025,5085,5203,5272,5341,5411,5485,5561,5625,5702,5778,5855,5920,5989,6066,6141,6210,6278,6355,6421,6482,6579,6644,6713,6812,6883,6942,7000,7057,7116,7180,7251,7323,7395,7467,7539,7606,7674,7742,7801,7864,7928,8018,8109,8169,8235,8302,8368,8438,8502,8555,8668,8726,8789,8854,8919,8994,9067,9139,9188,9249,9310,9371,9433,9497,9561,9625,9690,9753,9813,9874,9940,9999,10059,10121,10192,10252,10808,10894,10981,11071,11158,11246,11328,11411,11501,12832,12884,12942,12987,13053,13117,13174,13231,13433,13490,13538,13587,13638,13742,13789,13838,14156,14188,14252,14314,14374,14854,14928,14998,15076,15130,15200,15285,15333,15379,15450,15528,15606,15678,15752,15826,15900,15980,16053,16122,16194,16271,16332,16395,16461,16525,16596,16659,16724,16788,16849,16910,16962,17035,17109,17178,17253,17327,17401,17542,23672,24768,24846,24936,25024,25120,25210,25792,25881,26128,26409,26661,26946,27339,27816,28038,28260,28536,28763,28993,29223,29453,29683,29910,30329,30555,30980,31210,31638,31857,32140,32348,32479,32706,33132,33357,33784,34005,34430,34550,34826,35127,35451,35742,36056,36193,36324,36429,36671,36838,37042,37250,37521,37633,37745,37850,37967,38181,38327,38467,38553,38901,38989,39235,39653,39902,39984,40082,40674,40774,41026,41450,41705,41799,41888,42125,44149,44391,44493,44746,46902,57031,58547,68775,70303,72060,72686,73106,74167,75432,75688,75924,76471,76965,77570,77768,78348,78912,79287,79405,79943,80100,80296,80569,80825,80995,81136,81200,81482,81768,82444,82708,83046,83399,83493,83679,83985,84247,84372,84499,84738,84949,85068,85261,85438,85893,86074,86196,86455,86568,86755,86857,86964,87093,87368,87876,88372,89249,89543,90113,90262,90994,91166,91502,91594,92654,96936,101361,101423,102001,102585,102676,102789,103018,103178,103330,103501,103667,103836,104003,104166,104409,104579,104752,104923,105197,105396,105601,105931,106015,106111,106207,106305,106405,106507,106609,106711,106813,106915,107015,107111,107223,107352,107475,107606,107737,107835,107949,108043,108183,108317,108413,108525,108625,108741,108837,108949,109049,109189,109325,109489,109619,109777,109927,110068,110212,110347,110459,110609,110737,110865,111001,111133,111263,111393,111505,112403,112549,112693,114177,114243,114333,114409,114513,114603,114705,114813,114921,115021,115101,115193,115291,115401,115479,115585,115677,115781,115891,116013,116176,116333,116413,116513,116603,116713,116807,116913,117005,117105,117217,117331,117447,117563,117657,117771,117883,117985,118105,118227,118309,118413,118533,118659,118757,118851,118939,119051,119167,119289,119401,119576,119692,119778,119870,119982,120106,120173,120299,120367,120495,120639,120767,120836,120931,121046,121159,121258,121367,121478,121589,121690,121795,121895,122025,122116,122239,122333,122445,122531,122635,122731,122819,122937,123041,123145,123271,123359,123467,123567,123657,123767,123851,123953,124037,124091,124155,124261,124371,124455",
+                        "endLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,867,893,1061,1087,1118,1126,1132,1146,1168,1173,1178,1188,1197,1206,1210,1217,1225,1232,1233,1242,1245,1248,1252,1256,1260,1263,1264,1268,1272,1282,1287,1294,1300,1301,1304,1308,1313,1315,1317,1320,1323,1325,1329,1332,1339,1342,1345,1349,1351,1355,1357,1359,1361,1365,1373,1381,1393,1399,1408,1411,1422,1425,1430,1431,1436,1509,1568,1569,1579,1588,1589,1591,1595,1598,1601,1604,1607,1610,1613,1616,1620,1623,1626,1629,1633,1636,1640,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1666,1668,1669,1670,1671,1672,1673,1674,1675,1677,1678,1680,1681,1683,1685,1686,1688,1689,1690,1691,1692,1693,1695,1696,1697,1698,1699,1700,1713,1715,1717,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1759,1760,1761,1762,1763,1764,1766,1770,1774,1775,1776,1777,1778,1779,1780,1781,1783,1785,1787,1789,1791,1792,1793,1794,1796,1798,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1814,1815,1816,1817,1819,1821,1822,1824,1825,1827,1829,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1844,1845,1846,1847,1849,1850,1851,1852,1853,1855,1857,1859,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875",
+                        "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119",
+                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1686,1764,1870,1976,2055,2135,2192,2250,2324,2399,2464,2530,2590,2651,2723,2796,2863,2931,2990,3049,3108,3167,3226,3280,3334,3387,3441,3495,3549,3603,3809,3888,3961,4035,4106,4178,4250,4323,4380,4438,4511,4585,4659,4734,4806,4879,4949,5020,5080,5141,5267,5336,5406,5480,5556,5620,5697,5773,5850,5915,5984,6061,6136,6205,6273,6350,6416,6477,6574,6639,6708,6807,6878,6937,6995,7052,7111,7175,7246,7318,7390,7462,7534,7601,7669,7737,7796,7859,7923,8013,8104,8164,8230,8297,8363,8433,8497,8550,8663,8721,8784,8849,8914,8989,9062,9134,9183,9244,9305,9366,9428,9492,9556,9620,9685,9748,9808,9869,9935,9994,10054,10116,10187,10247,10315,10889,10976,11066,11153,11241,11323,11406,11496,11587,12879,12937,12982,13048,13112,13169,13226,13280,13485,13533,13582,13633,13667,13784,13833,13879,14183,14247,14309,14369,14426,14923,14993,15071,15125,15195,15280,15328,15374,15445,15523,15601,15673,15747,15821,15895,15975,16048,16117,16189,16266,16327,16390,16456,16520,16591,16654,16719,16783,16844,16905,16957,17030,17104,17173,17248,17322,17396,17537,17607,23720,24841,24931,25019,25115,25205,25787,25876,26123,26404,26656,26941,27334,27811,28033,28255,28531,28758,28988,29218,29448,29678,29905,30324,30550,30975,31205,31633,31852,32135,32343,32474,32701,33127,33352,33779,34000,34425,34545,34821,35122,35446,35737,36051,36188,36319,36424,36666,36833,37037,37245,37516,37628,37740,37845,37962,38176,38322,38462,38548,38896,38984,39230,39648,39897,39979,40077,40669,40769,41021,41445,41700,41794,41883,42120,44144,44386,44488,44741,46897,57026,58542,68770,70298,72055,72681,73101,74162,75427,75683,75919,76466,76960,77565,77763,78343,78907,79282,79400,79938,80095,80291,80564,80820,80990,81131,81195,81477,81763,82439,82703,83041,83394,83488,83674,83980,84242,84367,84494,84733,84944,85063,85256,85433,85888,86069,86191,86450,86563,86750,86852,86959,87088,87363,87871,88367,89244,89538,90108,90257,90989,91161,91497,91589,91867,96931,101356,101418,101996,102580,102671,102784,103013,103173,103325,103496,103662,103831,103998,104161,104404,104574,104747,104918,105192,105391,105596,105926,106010,106106,106202,106300,106400,106502,106604,106706,106808,106910,107010,107106,107218,107347,107470,107601,107732,107830,107944,108038,108178,108312,108408,108520,108620,108736,108832,108944,109044,109184,109320,109484,109614,109772,109922,110063,110207,110342,110454,110604,110732,110860,110996,111128,111258,111388,111500,111640,112544,112688,112826,114238,114328,114404,114508,114598,114700,114808,114916,115016,115096,115188,115286,115396,115474,115580,115672,115776,115886,116008,116171,116328,116408,116508,116598,116708,116802,116908,117000,117100,117212,117326,117442,117558,117652,117766,117878,117980,118100,118222,118304,118408,118528,118654,118752,118846,118934,119046,119162,119284,119396,119571,119687,119773,119865,119977,120101,120168,120294,120362,120490,120634,120762,120831,120926,121041,121154,121253,121362,121473,121584,121685,121790,121890,122020,122111,122234,122328,122440,122526,122630,122726,122814,122932,123036,123140,123266,123354,123462,123562,123652,123762,123846,123948,124032,124086,124150,124256,124366,124450,124570"
+                    }
+                },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\320d88fd95f589b47fc113114402e012\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "12,1878",
+                        "startColumns": "4,4",
+                        "startOffsets": "420,124714",
+                        "endLines": "12,1880",
+                        "endColumns": "60,12",
+                        "endOffsets": "476,124854"
+                    }
+                },
+                {
+                    "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\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:\\tools\\gradle\\repository\\caches\\transforms-3\\222d3d96047e18a39d15dd7f96eb4869\\transformed\\support-compat-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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",
+                        "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"
+                    },
+                    "to": {
+                        "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1701,1702,1706,1707,1711,1876,1877",
+                        "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",
+                        "startOffsets": "3608,3677,10320,10390,10458,10530,10600,10661,10735,11592,11653,11714,11776,11840,11902,11963,12031,12131,12191,12257,12330,12399,12456,12508,13285,13357,13672,13707,13884,13934,13995,14052,14086,14121,14431,23864,111645,111762,111963,112073,112274,124575,124647",
+                        "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1701,1705,1706,1710,1711,1876,1877",
+                        "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66",
+                        "endOffsets": "3672,3735,10385,10453,10525,10595,10656,10730,10803,11648,11709,11771,11835,11897,11958,12026,12126,12186,12252,12325,12394,12451,12503,12565,13352,13428,13702,13737,13929,13990,14047,14081,14116,14151,14496,23930,111757,111958,112068,112269,112398,124642,124709"
+                    }
+                },
+                {
+                    "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "82",
+                        "startColumns": "4",
+                        "startOffsets": "5146",
+                        "endColumns": "56",
+                        "endOffsets": "5198"
+                    }
+                },
+                {
+                    "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "1437,1441,1445,1449,1718,1722,1726,1730,1734,1738,1742",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "91872,92076,92287,92494,112831,113014,113199,113384,113587,113793,113976",
+                        "endLines": "1440,1444,1448,1451,1721,1725,1729,1733,1737,1741,1745",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "92071,92282,92489,92649,113009,113194,113379,113582,113788,113971,114172"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
             "map": [
                 {
                     "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
@@ -14,12 +148,12 @@
                         "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "startOffsets": "14501,17612,17708,17791,17887,17956,17999,18051,18103,18152,18215,18273,18324,18408,18502,18610,18681,18765,18848,18914,18997,19099,19160,19222,19273,19351,19404,19464,19569,19628,19730,19785,19856,19905,19963,20010,20069,20126,20197,20258,20315,20365,20417,20470,20520,20570,20630,20683,20749,20811,20874,20921,20976,21064,21122,21184,21234,21279,21322,21382,21449,21504,21559,21612,21659,21712,21768,21816,21871,21924,22008,22075,22139,22235,22309,22390,22479,22642,22786,22865,22940,23022,23081,23161,23241,23296,23418,23521,23562,23615,23725,23799,23935,24003,24089,24169,24238,24332,24391,24446,24508,24568,24678",
+                        "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
                         "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                        "endOffsets": "14849,17703,17786,17882,17951,17994,18046,18098,18147,18210,18268,18319,18403,18497,18605,18676,18760,18843,18909,18992,19094,19155,19217,19268,19346,19399,19459,19564,19623,19725,19780,19851,19900,19958,20005,20064,20121,20192,20253,20310,20360,20412,20465,20515,20565,20625,20678,20744,20806,20869,20916,20971,21059,21117,21179,21229,21274,21317,21377,21444,21499,21554,21607,21654,21707,21763,21811,21866,21919,22003,22070,22134,22230,22304,22385,22474,22637,22781,22860,22935,23017,23076,23156,23236,23291,23413,23516,23557,23610,23667,23794,23859,23998,24084,24164,24233,24327,24386,24441,24503,24563,24673,24763"
                     }
                 },
                 {
@@ -32,11 +166,49 @@
                         "endOffsets": "811,864,917,969,759"
                     },
                     "to": {
-                        "startLines": "13,14,15,16,17",
+                        "startLines": "189,190,191,192,193",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
+                        "startOffsets": "12570,12622,12675,12728,12780",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
+                        "endOffsets": "12617,12670,12723,12775,12827"
+                    }
+                },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\4a288c2e0b4e80163f908c9a00135d0d\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "2,3,4,5,6,7,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294",
+                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437",
+                        "endLines": "2,3,4,5,6,7,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302",
+                        "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
+                        "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
+                    },
+                    "to": {
+                        "startLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,868,894,1062,1088,1119,1127,1133,1147,1169,1174,1179,1189,1198,1207,1211,1218,1226,1233,1234,1243,1246,1249,1253,1257,1261,1264,1265,1269,1273,1283,1288,1295,1301,1302,1305,1309,1314,1316,1318,1321,1324,1326,1330,1333,1340,1343,1346,1350,1352,1356,1358,1360,1362,1366,1374,1382,1394,1400,1409,1412,1423,1426,1431,1432,1452,1510,1569,1570,1580,1589,1590,1592,1596,1599,1602,1605,1608,1611,1614,1617,1621,1624,1627,1630,1634,1637,1641,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1667,1669,1670,1671,1672,1673,1674,1675,1676,1678,1679,1681,1682,1684,1686,1687,1689,1690,1691,1692,1693,1694,1696,1697,1698,1699,1700,1712,1714,1716,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1765,1767,1771,1775,1776,1777,1778,1779,1780,1781,1782,1784,1786,1788,1790,1792,1793,1794,1795,1797,1799,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1815,1816,1817,1818,1820,1822,1823,1825,1826,1828,1830,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1845,1846,1847,1848,1850,1851,1852,1853,1854,1856,1858,1860,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1881,1956,1959,1962,1965,1979,1985,1995,2011,2017,2027,2056,2083,2092,2121,2464,2475,2591,2700,2724,2730,2736,2757,2881,2901,2907,2911,2917,2952,2964,2980,2984,3050,3065,3116,3128,3154",
+                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1614,1691,1769,1875,1981,2060,2140,2197,2255,2329,2404,2469,2535,2595,2656,2728,2801,2868,2936,2995,3054,3113,3172,3231,3285,3339,3392,3446,3500,3554,3740,3814,3893,3966,4040,4111,4183,4255,4328,4385,4443,4516,4590,4664,4739,4811,4884,4954,5025,5085,5203,5272,5341,5411,5485,5561,5625,5702,5778,5855,5920,5989,6066,6141,6210,6278,6355,6421,6482,6579,6644,6713,6812,6883,6942,7000,7057,7116,7180,7251,7323,7395,7467,7539,7606,7674,7742,7801,7864,7928,8018,8109,8169,8235,8302,8368,8438,8502,8555,8668,8726,8789,8854,8919,8994,9067,9139,9188,9249,9310,9371,9433,9497,9561,9625,9690,9753,9813,9874,9940,9999,10059,10121,10192,10252,10808,10894,10981,11071,11158,11246,11328,11411,11501,12832,12884,12942,12987,13053,13117,13174,13231,13433,13490,13538,13587,13638,13742,13789,13838,14156,14188,14252,14314,14374,14854,14928,14998,15076,15130,15200,15285,15333,15379,15450,15528,15606,15678,15752,15826,15900,15980,16053,16122,16194,16271,16332,16395,16461,16525,16596,16659,16724,16788,16849,16910,16962,17035,17109,17178,17253,17327,17401,17542,23672,24768,24846,24936,25024,25120,25210,25792,25881,26128,26409,26661,26946,27339,27816,28038,28260,28536,28763,28993,29223,29453,29683,29910,30329,30555,30980,31210,31638,31857,32140,32348,32479,32706,33132,33357,33784,34005,34430,34550,34826,35127,35451,35742,36056,36193,36324,36429,36671,36838,37042,37250,37521,37633,37745,37850,37967,38181,38327,38467,38553,38901,38989,39235,39653,39902,39984,40082,40674,40774,41026,41450,41705,41799,41888,42125,44149,44391,44493,44746,46902,57031,58547,68775,70303,72060,72686,73106,74167,75432,75688,75924,76471,76965,77570,77768,78348,78912,79287,79405,79943,80100,80296,80569,80825,80995,81136,81200,81482,81768,82444,82708,83046,83399,83493,83679,83985,84247,84372,84499,84738,84949,85068,85261,85438,85893,86074,86196,86455,86568,86755,86857,86964,87093,87368,87876,88372,89249,89543,90113,90262,90994,91166,91502,91594,92654,96936,101361,101423,102001,102585,102676,102789,103018,103178,103330,103501,103667,103836,104003,104166,104409,104579,104752,104923,105197,105396,105601,105931,106015,106111,106207,106305,106405,106507,106609,106711,106813,106915,107015,107111,107223,107352,107475,107606,107737,107835,107949,108043,108183,108317,108413,108525,108625,108741,108837,108949,109049,109189,109325,109489,109619,109777,109927,110068,110212,110347,110459,110609,110737,110865,111001,111133,111263,111393,111505,112403,112549,112693,114177,114243,114333,114409,114513,114603,114705,114813,114921,115021,115101,115193,115291,115401,115479,115585,115677,115781,115891,116013,116176,116333,116413,116513,116603,116713,116807,116913,117005,117105,117217,117331,117447,117563,117657,117771,117883,117985,118105,118227,118309,118413,118533,118659,118757,118851,118939,119051,119167,119289,119401,119576,119692,119778,119870,119982,120106,120173,120299,120367,120495,120639,120767,120836,120931,121046,121159,121258,121367,121478,121589,121690,121795,121895,122025,122116,122239,122333,122445,122531,122635,122731,122819,122937,123041,123145,123271,123359,123467,123567,123657,123767,123851,123953,124037,124091,124155,124261,124371,124455,124859,127475,127593,127708,127788,128149,128382,128899,129324,129502,129786,131130,132491,132879,133957,143475,143821,149841,153597,154348,154610,154810,155189,159467,160073,160302,160453,160668,161751,162063,162474,162601,165627,166228,168149,168489,169800",
+                        "endLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,867,893,1061,1087,1118,1126,1132,1146,1168,1173,1178,1188,1197,1206,1210,1217,1225,1232,1233,1242,1245,1248,1252,1256,1260,1263,1264,1268,1272,1282,1287,1294,1300,1301,1304,1308,1313,1315,1317,1320,1323,1325,1329,1332,1339,1342,1345,1349,1351,1355,1357,1359,1361,1365,1373,1381,1393,1399,1408,1411,1422,1425,1430,1431,1436,1509,1568,1569,1579,1588,1589,1591,1595,1598,1601,1604,1607,1610,1613,1616,1620,1623,1626,1629,1633,1636,1640,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1666,1668,1669,1670,1671,1672,1673,1674,1675,1677,1678,1680,1681,1683,1685,1686,1688,1689,1690,1691,1692,1693,1695,1696,1697,1698,1699,1700,1713,1715,1717,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1759,1760,1761,1762,1763,1764,1766,1770,1774,1775,1776,1777,1778,1779,1780,1781,1783,1785,1787,1789,1791,1792,1793,1794,1796,1798,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1814,1815,1816,1817,1819,1821,1822,1824,1825,1827,1829,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1844,1845,1846,1847,1849,1850,1851,1852,1853,1855,1857,1859,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1955,1958,1961,1964,1978,1984,1994,2010,2016,2026,2055,2082,2091,2120,2463,2467,2500,2608,2723,2729,2735,2756,2880,2900,2906,2910,2916,2951,2963,2979,2983,3049,3064,3115,3127,3153,3160",
+                        "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
+                        "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1686,1764,1870,1976,2055,2135,2192,2250,2324,2399,2464,2530,2590,2651,2723,2796,2863,2931,2990,3049,3108,3167,3226,3280,3334,3387,3441,3495,3549,3603,3809,3888,3961,4035,4106,4178,4250,4323,4380,4438,4511,4585,4659,4734,4806,4879,4949,5020,5080,5141,5267,5336,5406,5480,5556,5620,5697,5773,5850,5915,5984,6061,6136,6205,6273,6350,6416,6477,6574,6639,6708,6807,6878,6937,6995,7052,7111,7175,7246,7318,7390,7462,7534,7601,7669,7737,7796,7859,7923,8013,8104,8164,8230,8297,8363,8433,8497,8550,8663,8721,8784,8849,8914,8989,9062,9134,9183,9244,9305,9366,9428,9492,9556,9620,9685,9748,9808,9869,9935,9994,10054,10116,10187,10247,10315,10889,10976,11066,11153,11241,11323,11406,11496,11587,12879,12937,12982,13048,13112,13169,13226,13280,13485,13533,13582,13633,13667,13784,13833,13879,14183,14247,14309,14369,14426,14923,14993,15071,15125,15195,15280,15328,15374,15445,15523,15601,15673,15747,15821,15895,15975,16048,16117,16189,16266,16327,16390,16456,16520,16591,16654,16719,16783,16844,16905,16957,17030,17104,17173,17248,17322,17396,17537,17607,23720,24841,24931,25019,25115,25205,25787,25876,26123,26404,26656,26941,27334,27811,28033,28255,28531,28758,28988,29218,29448,29678,29905,30324,30550,30975,31205,31633,31852,32135,32343,32474,32701,33127,33352,33779,34000,34425,34545,34821,35122,35446,35737,36051,36188,36319,36424,36666,36833,37037,37245,37516,37628,37740,37845,37962,38176,38322,38462,38548,38896,38984,39230,39648,39897,39979,40077,40669,40769,41021,41445,41700,41794,41883,42120,44144,44386,44488,44741,46897,57026,58542,68770,70298,72055,72681,73101,74162,75427,75683,75919,76466,76960,77565,77763,78343,78907,79282,79400,79938,80095,80291,80564,80820,80990,81131,81195,81477,81763,82439,82703,83041,83394,83488,83674,83980,84242,84367,84494,84733,84944,85063,85256,85433,85888,86069,86191,86450,86563,86750,86852,86959,87088,87363,87871,88367,89244,89538,90108,90257,90989,91161,91497,91589,91867,96931,101356,101418,101996,102580,102671,102784,103013,103173,103325,103496,103662,103831,103998,104161,104404,104574,104747,104918,105192,105391,105596,105926,106010,106106,106202,106300,106400,106502,106604,106706,106808,106910,107010,107106,107218,107347,107470,107601,107732,107830,107944,108038,108178,108312,108408,108520,108620,108736,108832,108944,109044,109184,109320,109484,109614,109772,109922,110063,110207,110342,110454,110604,110732,110860,110996,111128,111258,111388,111500,111640,112544,112688,112826,114238,114328,114404,114508,114598,114700,114808,114916,115016,115096,115188,115286,115396,115474,115580,115672,115776,115886,116008,116171,116328,116408,116508,116598,116708,116802,116908,117000,117100,117212,117326,117442,117558,117652,117766,117878,117980,118100,118222,118304,118408,118528,118654,118752,118846,118934,119046,119162,119284,119396,119571,119687,119773,119865,119977,120101,120168,120294,120362,120490,120634,120762,120831,120926,121041,121154,121253,121362,121473,121584,121685,121790,121890,122020,122111,122234,122328,122440,122526,122630,122726,122814,122932,123036,123140,123266,123354,123462,123562,123652,123762,123846,123948,124032,124086,124150,124256,124366,124450,124570,127470,127588,127703,127783,128144,128377,128894,129319,129497,129781,131125,132486,132874,133952,143470,143605,145109,150408,154343,154605,154805,155184,159462,160068,160297,160448,160663,161746,162058,162469,162596,165622,166223,168144,168484,169795,169998"
+                    }
+                },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\320d88fd95f589b47fc113114402e012\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "2,102,3,13",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "55,5935,116,724",
+                        "endLines": "2,104,12,101",
+                        "endColumns": "60,12,24,24",
+                        "endOffsets": "111,6075,719,5930"
+                    },
+                    "to": {
+                        "startLines": "12,1878,2501,2507",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "420,124714,145114,145325",
+                        "endLines": "12,1880,2506,2590",
+                        "endColumns": "60,12,24,24",
+                        "endOffsets": "476,124854,145320,149836"
                     }
                 },
                 {
@@ -58,6 +230,25 @@
                         "endOffsets": "295,415"
                     }
                 },
+                {
+                    "source": "D:\\tools\\gradle\\repository\\caches\\transforms-3\\222d3d96047e18a39d15dd7f96eb4869\\transformed\\support-compat-28.0.0\\res\\values\\values.xml",
+                    "from": {
+                        "startLines": "2,3,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,171,172,176,177,178,6,13,56,88,125",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348",
+                        "endLines": "2,3,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,170,171,175,176,177,178,12,55,87,124,131",
+                        "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
+                        "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720"
+                    },
+                    "to": {
+                        "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1701,1702,1706,1707,1711,1876,1877,2468,2609,2640,2661,2694",
+                        "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",
+                        "startOffsets": "3608,3677,10320,10390,10458,10530,10600,10661,10735,11592,11653,11714,11776,11840,11902,11963,12031,12131,12191,12257,12330,12399,12456,12508,13285,13357,13672,13707,13884,13934,13995,14052,14086,14121,14431,23864,111645,111762,111963,112073,112274,124575,124647,143610,150413,152067,152748,153430",
+                        "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1701,1705,1706,1710,1711,1876,1877,2474,2639,2660,2693,2699",
+                        "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
+                        "endOffsets": "3672,3735,10385,10453,10525,10595,10656,10730,10803,11648,11709,11771,11835,11897,11958,12026,12126,12186,12252,12325,12394,12451,12503,12565,13352,13428,13702,13737,13929,13990,14047,14081,14116,14151,14496,23930,111757,111958,112068,112269,112398,124642,124709,143816,152062,152743,153425,153592"
+                    }
+                },
                 {
                     "source": "D:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
@@ -68,11 +259,11 @@
                         "endOffsets": "764"
                     },
                     "to": {
-                        "startLines": "12",
+                        "startLines": "82",
                         "startColumns": "4",
-                        "startOffsets": "420",
+                        "startOffsets": "5146",
                         "endColumns": "56",
-                        "endOffsets": "472"
+                        "endOffsets": "5198"
                     }
                 },
                 {
@@ -86,12 +277,12 @@
                         "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "1437,1441,1445,1449,1718,1722,1726,1730,1734,1738,1742",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "91872,92076,92287,92494,112831,113014,113199,113384,113587,113793,113976",
+                        "endLines": "1440,1444,1448,1451,1721,1725,1729,1733,1737,1741,1745",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "endOffsets": "92071,92282,92489,92649,113009,113194,113379,113582,113788,113971,114172"
                     }
                 }
             ]

Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

@@ -131,10 +131,6 @@
         "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
         "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
-    },
     {
         "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
         "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
@@ -175,6 +171,10 @@
         "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
         "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.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:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
         "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"

Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
         android:debuggable="true"
         android:icon="@drawable/icon_app"
         android:label="@string/app_name"
@@ -43,7 +44,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
@@ -56,7 +57,7 @@
             android:name="net.micode.notes.ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
             <intent-filter android:scheme="http" >
                 <action android:name="android.intent.action.VIEW" />