Merge pull request '第八次合并' (#8) from dev into master
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 494 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 21 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 380 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 2.3 MiB |
|
After Width: | Height: | Size: 1.6 MiB |
|
After Width: | Height: | Size: 523 KiB |
|
After Width: | Height: | Size: 610 KiB |
@ -0,0 +1,3 @@
|
||||
[LocalizedFileNames]
|
||||
Screenrecorder-2023-06-06-14-59-49-758.mp4=@Screenrecorder-2023-06-06-14-59-49-758.mp4,0
|
||||
Screenrecorder-2023-06-06-14-47-44-302.mp4=@Screenrecorder-2023-06-06-14-47-44-302.mp4,0
|
||||
@ -0,0 +1,10 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package net.micode.notes.test;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String APPLICATION_ID = "net.micode.notes.test";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
{}
|
||||
@ -0,0 +1,2 @@
|
||||
#- File Locator -
|
||||
listingFile=../../../outputs/apk/androidTest/debug/output-metadata.json
|
||||
@ -0,0 +1 @@
|
||||
6
|
||||
@ -0,0 +1 @@
|
||||
#Tue Jun 06 12:19:48 CST 2023
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\res"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\rs\androidTest\debug"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\res"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\rs\androidTest\debug"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\assets"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\assets"/></dataSet></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\androidTestDebug\shaders"/></dataSet></merger>
|
||||
@ -1,4 +1,4 @@
|
||||
#Tue Jun 06 12:12:53 CST 2023
|
||||
#Wed Jun 07 12:31:53 CST 2023
|
||||
base.0=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
#Tue Jun 06 12:19:51 CST 2023
|
||||
base.0=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||