Merge pull request '最终版本' (#34) from dev into main
commit
50ee7a9377
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,12 +1,12 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle: android.arch.core:runtime:1.1.1@aar" external-system-id="GRADLE">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/e5f608aa90757d0971f669fd7153b99d/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,12 +1,12 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" external-system-id="GRADLE">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/AndroidManifest.xml" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/AndroidManifest.xml" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c3e3cad76e89eb4a70294d12d60419dd/transformed/livedata-1.1.1/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,12 +1,12 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" external-system-id="GRADLE">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/9e0dab91aa213f02bf6442f477693ad0/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,12 +1,12 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" external-system-id="GRADLE">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/AndroidManifest.xml" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/dd80ea39f4710fb51c3a701be6319dee/transformed/runtime-1.1.1/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,12 +1,12 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" external-system-id="GRADLE">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ef8a43026c946cb38e6e4cf92e217d98/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
@ -1,12 +1,12 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle: com.android.databinding:viewbinding:7.2.2@aar" external-system-id="GRADLE">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/../../../../../ASSDK/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/AndroidManifest.xml" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/jars/classes.jar!/" />
|
||||
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7c3c35a22a19e4cf64a3746f1513f947/transformed/viewbinding-7.2.2/AndroidManifest.xml" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/../../../../../ASSDK/caches/modules-2/files-2.1/com.android.databinding/viewbinding/7.2.2/45107b3aa49be60cc01d413bc4a3c0c6761d9e4c/viewbinding-7.2.2-sources.jar!/" />
|
||||
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/viewbinding/7.2.2/45107b3aa49be60cc01d413bc4a3c0c6761d9e4c/viewbinding-7.2.2-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_list" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_list.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_list_0" view="FrameLayout"><Expressions/><location startLine="8" startOffset="0" endLine="51" endOffset="13"/></Target><Target id="@+id/tv_title_bar" view="TextView"><Expressions/><location startLine="20" startOffset="8" endLine="29" endOffset="61"/></Target><Target id="@+id/notes_list" view="ListView"><Expressions/><location startLine="32" startOffset="8" endLine="40" endOffset="40"/></Target><Target id="@+id/btn_new_note" view="Button"><Expressions/><location startLine="44" startOffset="4" endLine="50" endOffset="41"/></Target></Targets></Layout>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_list" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_list.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_list_0" view="FrameLayout"><Expressions/><location startLine="8" startOffset="0" endLine="54" endOffset="13"/></Target><Target id="@+id/tv_title_bar" view="TextView"><Expressions/><location startLine="22" startOffset="8" endLine="31" endOffset="61"/></Target><Target id="@+id/notes_list" view="ListView"><Expressions/><location startLine="34" startOffset="8" endLine="42" endOffset="40"/></Target><Target id="@+id/btn_new_note" view="Button"><Expressions/><location startLine="46" startOffset="4" endLine="52" endOffset="41"/></Target></Targets></Layout>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue