Skip to content

add #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xdai2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified soulbook/.gradle/5.4.1/executionHistory/executionHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/executionHistory/executionHistory.lock
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/fileHashes/fileHashes.bin
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/fileHashes/fileHashes.lock
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/javaCompile/classAnalysis.bin
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/javaCompile/javaCompile.lock
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/5.4.1/javaCompile/taskHistory.bin
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.gradle/buildOutputCleanup/outputFiles.bin
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.idea/caches/build_file_checksums.ser
View file
Open in desktop
Binary file not shown.
Binary file modified soulbook/.idea/caches/gradle_models.ser
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions soulbook/.idea/libraries/Gradle__androidx_navigation_navigation_ui_2_0_0_aar.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...book/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,568 changes: 1,158 additions & 410 deletions soulbook/.idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion soulbook/app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
Expand Down Expand Up @@ -90,6 +90,7 @@
</content>
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: com.jayway.android.robotium:robotium-solo:5.3.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
Expand All @@ -100,6 +101,7 @@
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:rules:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
Expand Down
3 changes: 3 additions & 0 deletions soulbook/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'com.google.firebase:firebase-analytics:17.2.0'
implementation 'com.google.firebase:firebase-database:19.1.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.3.1'
//implementation 'com.google.firebase:firebase-admin:6.8.1'

}
Expand Down
3,785 changes: 2,484 additions & 1,301 deletions ...ok/app/build/generated/not_namespaced_r_class_sources/debug/r/com/example/soulbook/R.java
View file
Open in desktop

Large diffs are not rendered by default.

9,458 changes: 4,782 additions & 4,676 deletions soulbook/app/build/intermediates/blame/res/debug/multi-v2/debug.json
View file
Open in desktop

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions soulbook/app/build/intermediates/blame/res/debug/multi-v2/values-af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,44 @@
{
"logs": [
{
"outputFile": "D:\\ChasingTime\\soulbook\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
"outputFile": "C:\\Users\\Dante\\Desktop\\ChasingTime\\soulbook\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
"map": [
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\b36c74c92868cc609247d822087e1705\\jetified-play-services-basement-17.0.0\\res\\values-af\\values.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\2096ae993fe88f6bf0abbb66c7c5f686\\jetified-navigation-ui-2.0.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
"endColumns": "201",
"endOffsets": "448"
"startLines": "2,3",
"startColumns": "4,4",
"startOffsets": "55,157",
"endColumns": "101,116",
"endOffsets": "152,269"
},
"to": {
"startLines": "37",
"startLines": "47,48",
"startColumns": "4,4",
"startOffsets": "5462,5564",
"endColumns": "101,116",
"endOffsets": "5559,5676"
}
},
{
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\56b6cdfbd80af409835a31a4470c49f0\\core-1.1.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "3929",
"endColumns": "201",
"endOffsets": "4126"
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "50",
"startColumns": "4",
"startOffsets": "5761",
"endColumns": "100",
"endOffsets": "5857"
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\c6ed24259e187418524151309c91ad64\\play-services-base-17.1.0\\res\\values-af\\values.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\c6ed24259e187418524151309c91ad64\\play-services-base-17.1.0\\res\\values-af\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
"startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
Expand All @@ -38,24 +55,7 @@
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\56b6cdfbd80af409835a31a4470c49f0\\core-1.1.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
"startLines": "50",
"startColumns": "4",
"startOffsets": "5761",
"endColumns": "100",
"endOffsets": "5857"
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\f8ccfb448ba3545203b2c9319e236e39\\appcompat-1.1.0\\res\\values-af\\values-af.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\f8ccfb448ba3545203b2c9319e236e39\\appcompat-1.1.0\\res\\values-af\\values-af.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",
Expand All @@ -72,20 +72,20 @@
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\fd024e7501fdaa9df8bc62842321a697\\jetified-navigation-ui-2.0.0\\res\\values-af\\values-af.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\4e0bf5ceac6c47f2cebbeeee6cfb2dca\\jetified-play-services-basement-17.0.0\\res\\values-af\\values.xml",
"from": {
"startLines": "2,3",
"startColumns": "4,4",
"startOffsets": "55,157",
"endColumns": "101,116",
"endOffsets": "152,269"
"startLines": "4",
"startColumns": "0",
"startOffsets": "247",
"endColumns": "201",
"endOffsets": "448"
},
"to": {
"startLines": "47,48",
"startColumns": "4,4",
"startOffsets": "5462,5564",
"endColumns": "101,116",
"endOffsets": "5559,5676"
"startLines": "37",
"startColumns": "4",
"startOffsets": "3929",
"endColumns": "201",
"endOffsets": "4126"
}
}
]
Expand Down
52 changes: 26 additions & 26 deletions soulbook/app/build/intermediates/blame/res/debug/multi-v2/values-am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"logs": [
{
"outputFile": "D:\\ChasingTime\\soulbook\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
"outputFile": "C:\\Users\\Dante\\Desktop\\ChasingTime\\soulbook\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
"map": [
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\fd024e7501fdaa9df8bc62842321a697\\jetified-navigation-ui-2.0.0\\res\\values-am\\values-am.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\f8ccfb448ba3545203b2c9319e236e39\\appcompat-1.1.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2,3",
"startColumns": "4,4",
"startOffsets": "55,159",
"endColumns": "103,109",
"endOffsets": "154,264"
"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,203,301,407,493,596,713,791,868,959,1051,1143,1237,1338,1431,1526,1619,1710,1801,1880,1980,2080,2176,2278,2378,2477,2627,2723",
"endColumns": "97,97,105,85,102,116,77,76,90,91,91,93,100,92,94,92,90,90,78,99,99,95,101,99,98,149,95,78",
"endOffsets": "198,296,402,488,591,708,786,863,954,1046,1138,1232,1333,1426,1521,1614,1705,1796,1875,1975,2075,2171,2273,2373,2472,2622,2718,2797"
},
"to": {
"startLines": "47,48",
"startColumns": "4,4",
"startOffsets": "5218,5322",
"endColumns": "103,109",
"endOffsets": "5317,5427"
"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,49",
"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,203,301,407,493,596,713,791,868,959,1051,1143,1237,1338,1431,1526,1619,1710,1801,1880,1980,2080,2176,2278,2378,2477,2627,5432",
"endColumns": "97,97,105,85,102,116,77,76,90,91,91,93,100,92,94,92,90,90,78,99,99,95,101,99,98,149,95,78",
"endOffsets": "198,296,402,488,591,708,786,863,954,1046,1138,1232,1333,1426,1521,1614,1705,1796,1875,1975,2075,2171,2273,2373,2472,2622,2718,5506"
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\b36c74c92868cc609247d822087e1705\\jetified-play-services-basement-17.0.0\\res\\values-am\\values.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\4e0bf5ceac6c47f2cebbeeee6cfb2dca\\jetified-play-services-basement-17.0.0\\res\\values-am\\values.xml",
"from": {
"startLines": "4",
"startColumns": "0",
Expand All @@ -38,7 +38,7 @@
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\c6ed24259e187418524151309c91ad64\\play-services-base-17.1.0\\res\\values-am\\values.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\c6ed24259e187418524151309c91ad64\\play-services-base-17.1.0\\res\\values-am\\values.xml",
"from": {
"startLines": "4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20",
"startColumns": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
Expand All @@ -55,7 +55,7 @@
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\56b6cdfbd80af409835a31a4470c49f0\\core-1.1.0\\res\\values-am\\values-am.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\56b6cdfbd80af409835a31a4470c49f0\\core-1.1.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2",
"startColumns": "4",
Expand All @@ -72,20 +72,20 @@
}
},
{
"source": "C:\\Users\\tszw-pc\\.gradle\\caches\\transforms-2\\files-2.1\\f8ccfb448ba3545203b2c9319e236e39\\appcompat-1.1.0\\res\\values-am\\values-am.xml",
"source": "C:\\Users\\Dante\\.gradle\\caches\\transforms-2\\files-2.1\\2096ae993fe88f6bf0abbb66c7c5f686\\jetified-navigation-ui-2.0.0\\res\\values-am\\values-am.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,203,301,407,493,596,713,791,868,959,1051,1143,1237,1338,1431,1526,1619,1710,1801,1880,1980,2080,2176,2278,2378,2477,2627,2723",
"endColumns": "97,97,105,85,102,116,77,76,90,91,91,93,100,92,94,92,90,90,78,99,99,95,101,99,98,149,95,78",
"endOffsets": "198,296,402,488,591,708,786,863,954,1046,1138,1232,1333,1426,1521,1614,1705,1796,1875,1975,2075,2171,2273,2373,2472,2622,2718,2797"
"startLines": "2,3",
"startColumns": "4,4",
"startOffsets": "55,159",
"endColumns": "103,109",
"endOffsets": "154,264"
},
"to": {
"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,49",
"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,203,301,407,493,596,713,791,868,959,1051,1143,1237,1338,1431,1526,1619,1710,1801,1880,1980,2080,2176,2278,2378,2477,2627,5432",
"endColumns": "97,97,105,85,102,116,77,76,90,91,91,93,100,92,94,92,90,90,78,99,99,95,101,99,98,149,95,78",
"endOffsets": "198,296,402,488,591,708,786,863,954,1046,1138,1232,1333,1426,1521,1614,1705,1796,1875,1975,2075,2171,2273,2373,2472,2622,2718,5506"
"startLines": "47,48",
"startColumns": "4,4",
"startOffsets": "5218,5322",
"endColumns": "103,109",
"endOffsets": "5317,5427"
}
}
]
Expand Down
Loading