Merge pull request '版本控制' (#15) from master into dev
commit
ba0e2d0da8
@ -0,0 +1,293 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AndroidLayouts">
|
||||
<shared>
|
||||
<config />
|
||||
</shared>
|
||||
</component>
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="NONE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2531eea7-ec98-43ef-9f7f-09fe1004db56" name="变更" comment="庞浩的注释">
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/checksums.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/md5-checksums.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/sha1-checksums.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/dependencies-accessors/gc.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/executionHistory/executionHistory.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/fileChanges/last-build.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/fileHashes/fileHashes.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/gc.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/checksums/checksums.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/checksums/md5-checksums.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/checksums/sha1-checksums.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/dependencies-accessors/gc.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/executionHistory/executionHistory.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/executionHistory/executionHistory.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileChanges/last-build.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileHashes/fileHashes.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileHashes/resourceHashesCache.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/gc.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/buildOutputCleanup/cache.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/file-system.probe" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.gradle/vcs-1/gc.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/.gitignore" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/compiler.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/deploymentTargetDropDown.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/gradle.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/jarRepositories.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/misc.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/modules.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.androidTest.iml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.iml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.main.iml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.unitTest.iml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/.idea/vcs.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/build.gradle" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/gradlew" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/gradlew.bat" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/import-summary.txt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/local.properties" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/minote.iml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/settings.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.androidTest.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.main.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.unitTest.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/gradlew" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/gradlew.bat" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/import-summary.txt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/minote.iml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\庞浩的电脑\.android\avd\Pixel_3_API_22.avd]" />
|
||||
<component name="ExternalProjectsData">
|
||||
<projectState path="$PROJECT_DIR$">
|
||||
<ProjectState />
|
||||
</projectState>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
</component>
|
||||
<component name="ProjectId" id="2O5GlHnjCn5qBz61G2RsTAQaajO" />
|
||||
<component name="ProjectLevelVcsManager">
|
||||
<ConfirmationsSetting value="2" id="Add" />
|
||||
</component>
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"ASKED_ADD_EXTERNAL_FILES": "true",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||
"cidr.known.project.marker": "true",
|
||||
"last_opened_file_path": "D:/softwareengineering/Notes-master",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.17",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "preferences.customizations"
|
||||
}
|
||||
}</component>
|
||||
<component name="RunManager" selected="Android App.app">
|
||||
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
|
||||
<module name="minote.app.main" />
|
||||
<option name="DEPLOY" value="true" />
|
||||
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
|
||||
<option name="DEPLOY_AS_INSTANT" value="false" />
|
||||
<option name="ARTIFACT_NAME" value="" />
|
||||
<option name="PM_INSTALL_OPTIONS" value="" />
|
||||
<option name="ALL_USERS" value="false" />
|
||||
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
|
||||
<option name="CLEAR_APP_STORAGE" value="false" />
|
||||
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
|
||||
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
|
||||
<option name="MODE" value="default_activity" />
|
||||
<option name="CLEAR_LOGCAT" value="false" />
|
||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
|
||||
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
|
||||
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
|
||||
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
|
||||
<option name="DEBUGGER_TYPE" value="Auto" />
|
||||
<Auto>
|
||||
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
|
||||
<option name="SHOW_STATIC_VARS" value="true" />
|
||||
<option name="WORKING_DIR" value="" />
|
||||
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
|
||||
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
|
||||
</Auto>
|
||||
<Hybrid>
|
||||
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
|
||||
<option name="SHOW_STATIC_VARS" value="true" />
|
||||
<option name="WORKING_DIR" value="" />
|
||||
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
|
||||
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
|
||||
</Hybrid>
|
||||
<Java />
|
||||
<Native>
|
||||
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
|
||||
<option name="SHOW_STATIC_VARS" value="true" />
|
||||
<option name="WORKING_DIR" value="" />
|
||||
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
|
||||
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
|
||||
</Native>
|
||||
<Profilers>
|
||||
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
|
||||
<option name="STARTUP_PROFILING_ENABLED" value="false" />
|
||||
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
|
||||
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
|
||||
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
|
||||
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
|
||||
</Profilers>
|
||||
<option name="DEEP_LINK" value="" />
|
||||
<option name="ACTIVITY_CLASS" value="" />
|
||||
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
|
||||
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
|
||||
<method v="2">
|
||||
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="D:/softwareengineering/minote/app/build.gradle" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
|
||||
<ExternalSystemSettings>
|
||||
<option name="executionName" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$/app/build.gradle" />
|
||||
<option name="externalSystemIdString" value="GRADLE" />
|
||||
<option name="scriptParameters" />
|
||||
<option name="taskDescriptions">
|
||||
<list />
|
||||
</option>
|
||||
<option name="taskNames">
|
||||
<list />
|
||||
</option>
|
||||
<option name="vmOptions" />
|
||||
</ExternalSystemSettings>
|
||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
||||
<DebugAllEnabled>false</DebugAllEnabled>
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Gradle.D:/softwareengineering/minote/app/build.gradle" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="默认任务">
|
||||
<changelist id="2531eea7-ec98-43ef-9f7f-09fe1004db56" name="变更" comment="" />
|
||||
<created>1680843179165</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1680843179165</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="更新">
|
||||
<created>1680848243607</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1680848243608</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="注释">
|
||||
<created>1680850445899</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1680850445899</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="注释">
|
||||
<created>1680942675194</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1680942675194</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="庞浩的注释">
|
||||
<created>1680942721752</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1680942721752</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="庞浩的注释">
|
||||
<created>1681292428634</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1681292428635</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="庞浩的注释">
|
||||
<created>1681312464473</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1681312464473</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="7" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="master" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<MESSAGE value="更新" />
|
||||
<MESSAGE value="注释" />
|
||||
<MESSAGE value="庞浩的注释" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="庞浩的注释" />
|
||||
</component>
|
||||
</project>
|
||||
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.
@ -0,0 +1,2 @@
|
||||
#Thu Apr 13 13:41:37 CST 2023
|
||||
gradle.version=7.5
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
# 默认忽略的文件
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="11" />
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<targetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="QUICK_BOOT_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="VIRTUAL_DEVICE_PATH" />
|
||||
<value value="C:\Users\蔡玉祥\.android\avd\Resizable_Experimental_API_UpsideDownCake.avd" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</targetSelectedWithDropDown>
|
||||
<<<<<<< HEAD:.idea/deploymentTargetDropDown.xml
|
||||
<timeTargetWasSelectedWithDropDown value="2023-04-07T06:44:46.634860500Z" />
|
||||
=======
|
||||
<timeTargetWasSelectedWithDropDown value="2023-04-07T06:36:29.852905700Z" />
|
||||
>>>>>>> master:src/.idea/deploymentTargetDropDown.xml
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="Embedded JDK" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/app" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="BintrayJCenter" />
|
||||
<option name="name" value="BintrayJCenter" />
|
||||
<option name="url" value="https://jcenter.bintray.com/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="Google" />
|
||||
<option name="name" value="Google" />
|
||||
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/gitProject.iml" filepath="$PROJECT_DIR$/.idea/modules/gitProject.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.androidTest.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.main.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.unitTest.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app:androidTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<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$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/androidTest" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" />
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="minote.app.main" scope="TEST" />
|
||||
</component>
|
||||
<component name="TestModuleProperties" production-module="minote.app.main" />
|
||||
</module>
|
||||
@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="minote" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":app" />
|
||||
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
|
||||
<option name="LAST_KNOWN_AGP_VERSION" value="7.4.2" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<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$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app">
|
||||
<excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@ -0,0 +1,40 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app:main" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<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$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/main">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app:unitTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<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$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugUnitTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/test" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/testDebug" />
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="minote.app.main" scope="TEST" />
|
||||
</component>
|
||||
<component name="TestModuleProperties" production-module="minote.app.main" />
|
||||
</module>
|
||||
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@ -0,0 +1,20 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 33
|
||||
buildToolsVersion "33.0.2"
|
||||
useLibrary 'org.apache.http.legacy'
|
||||
|
||||
defaultConfig {
|
||||
applicationId "net.micode.notes"
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 14
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package net.micode.notes;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String APPLICATION_ID = "net.micode.notes";
|
||||
public static final String BUILD_TYPE = "debug";
|
||||
public static final int VERSION_CODE = 1;
|
||||
public static final String VERSION_NAME = "0.1";
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
{}
|
||||
Binary file not shown.
@ -0,0 +1,20 @@
|
||||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "APK",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "net.micode.notes",
|
||||
"variantName": "debug",
|
||||
"elements": [
|
||||
{
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 1,
|
||||
"versionName": "0.1",
|
||||
"outputFile": "app-debug.apk"
|
||||
}
|
||||
],
|
||||
"elementType": "File"
|
||||
}
|
||||
@ -0,0 +1,2 @@
|
||||
#- File Locator -
|
||||
listingFile=../../apk/debug/output-metadata.json
|
||||
@ -0,0 +1,2 @@
|
||||
appMetadataVersion=1.1
|
||||
androidGradlePluginVersion=7.4.2
|
||||
@ -0,0 +1,10 @@
|
||||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "COMPATIBLE_SCREEN_MANIFEST",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "net.micode.notes",
|
||||
"variantName": "debug",
|
||||
"elements": []
|
||||
}
|
||||
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.
@ -0,0 +1 @@
|
||||
4
|
||||
Binary file not shown.
@ -0,0 +1,96 @@
|
||||
#Thu Apr 13 13:41:58 CST 2023
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
|
||||
net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
|
||||
net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
|
||||
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
|
||||
net.micode.notes.app-main-7\:/raw/introduction=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\app\src\main\assets"/><source path="D:\softwareengineering\minote\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\app\src\debug\assets"/></dataSet></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softwareengineering\minote\app\src\debug\shaders"/></dataSet></merger>
|
||||
@ -0,0 +1,4 @@
|
||||
#Thu Apr 13 13:42:23 CST 2023
|
||||
base.0=D\:\\softwareengineering\\minote\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
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