Compare commits
No commits in common. 'master' and 'zym' have entirely different histories.
|
Before Width: | Height: | Size: 260 B After Width: | Height: | Size: 260 B |
|
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 286 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 320 B After Width: | Height: | Size: 320 B |
|
Before Width: | Height: | Size: 153 B After Width: | Height: | Size: 153 B |
|
Before Width: | Height: | Size: 181 B After Width: | Height: | Size: 181 B |
|
Before Width: | Height: | Size: 617 B After Width: | Height: | Size: 617 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 154 B After Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 247 B After Width: | Height: | Size: 247 B |
|
Before Width: | Height: | Size: 849 B After Width: | Height: | Size: 849 B |
|
Before Width: | Height: | Size: 233 B After Width: | Height: | Size: 233 B |
|
Before Width: | Height: | Size: 270 B After Width: | Height: | Size: 270 B |
|
Before Width: | Height: | Size: 378 B After Width: | Height: | Size: 378 B |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 404 B After Width: | Height: | Size: 404 B |
|
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 514 B |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 588 B After Width: | Height: | Size: 588 B |
|
Before Width: | Height: | Size: 537 B After Width: | Height: | Size: 537 B |
|
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 653 B |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 760 B After Width: | Height: | Size: 760 B |
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\363d498352dbe394a4c2ee8b7d5219bb\\navigation-ui-1.0.0\\res\\values-ar\\values-ar.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-as\\values-as.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-az\\values-az.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-da\\values-da.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-el\\values-el.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\0a6322d192fdfe18b2f8cfa16184d23a\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\363d498352dbe394a4c2ee8b7d5219bb\\navigation-ui-1.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\363d498352dbe394a4c2ee8b7d5219bb\\navigation-ui-1.0.0\\res\\values-es\\values-es.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\d361875a0d27f2539b74283b5047326b\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml",
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "E:\\zym\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
|
||||
"outputFile": "E:\\Notes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "C:\\Users\\smith\\.gradle\\caches\\transforms-2\\files-2.1\\363d498352dbe394a4c2ee8b7d5219bb\\navigation-ui-1.0.0\\res\\values-eu\\values-eu.xml",
|
||||