Merge pull request '第七次合并' (#7) from dev into master
commit
727e13cea0
@ -1,133 +0,0 @@
|
|||||||
### AndroidStudio ###
|
|
||||||
# Covers files to be ignored for android development using Android Studio.
|
|
||||||
|
|
||||||
# Built application files
|
|
||||||
*.apk
|
|
||||||
*.ap_
|
|
||||||
*.aab
|
|
||||||
|
|
||||||
# Files for the ART/Dalvik VM
|
|
||||||
*.dex
|
|
||||||
|
|
||||||
# Java class files
|
|
||||||
*.class
|
|
||||||
|
|
||||||
# Generated files
|
|
||||||
bin/
|
|
||||||
gen/
|
|
||||||
out/
|
|
||||||
|
|
||||||
# Gradle files
|
|
||||||
.gradle
|
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
|
|
||||||
# Signing files
|
|
||||||
.signing/
|
|
||||||
|
|
||||||
# Local configuration file (sdk path, etc)
|
|
||||||
local.properties
|
|
||||||
|
|
||||||
# Proguard folder generated by Eclipse
|
|
||||||
proguard/
|
|
||||||
|
|
||||||
# Log Files
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Android Studio
|
|
||||||
/*/build/
|
|
||||||
/*/local.properties
|
|
||||||
/*/out
|
|
||||||
/*/*/build
|
|
||||||
/*/*/production
|
|
||||||
captures/
|
|
||||||
.navigation/
|
|
||||||
*.ipr
|
|
||||||
*~
|
|
||||||
*.swp
|
|
||||||
|
|
||||||
# Keystore files
|
|
||||||
*.jks
|
|
||||||
*.keystore
|
|
||||||
|
|
||||||
# Google Services (e.g. APIs or Firebase)
|
|
||||||
# google-services.json
|
|
||||||
|
|
||||||
# Android Patch
|
|
||||||
gen-external-apklibs
|
|
||||||
|
|
||||||
# External native build folder generated in Android Studio 2.2 and later
|
|
||||||
.externalNativeBuild
|
|
||||||
|
|
||||||
# NDK
|
|
||||||
obj/
|
|
||||||
|
|
||||||
# IntelliJ IDEA
|
|
||||||
*.iml
|
|
||||||
*.iws
|
|
||||||
/out/
|
|
||||||
|
|
||||||
# User-specific configurations
|
|
||||||
.idea/caches/
|
|
||||||
.idea/libraries/
|
|
||||||
.idea/shelf/
|
|
||||||
.idea/workspace.xml
|
|
||||||
.idea/tasks.xml
|
|
||||||
.idea/.name
|
|
||||||
.idea/compiler.xml
|
|
||||||
.idea/copyright/profiles_settings.xml
|
|
||||||
.idea/encodings.xml
|
|
||||||
.idea/misc.xml
|
|
||||||
.idea/modules.xml
|
|
||||||
.idea/scopes/scope_settings.xml
|
|
||||||
.idea/dictionaries
|
|
||||||
.idea/vcs.xml
|
|
||||||
.idea/jsLibraryMappings.xml
|
|
||||||
.idea/datasources.xml
|
|
||||||
.idea/dataSources.ids
|
|
||||||
.idea/sqlDataSources.xml
|
|
||||||
.idea/dynamic.xml
|
|
||||||
.idea/uiDesigner.xml
|
|
||||||
.idea/assetWizardSettings.xml
|
|
||||||
.idea/gradle.xml
|
|
||||||
.idea/jarRepositories.xml
|
|
||||||
.idea/navEditor.xml
|
|
||||||
|
|
||||||
# Legacy Eclipse project files
|
|
||||||
.classpath
|
|
||||||
.project
|
|
||||||
.cproject
|
|
||||||
.settings/
|
|
||||||
|
|
||||||
# Mobile Tools for Java (J2ME)
|
|
||||||
.mtj.tmp/
|
|
||||||
|
|
||||||
# Package Files #
|
|
||||||
*.war
|
|
||||||
*.ear
|
|
||||||
|
|
||||||
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
|
|
||||||
hs_err_pid*
|
|
||||||
|
|
||||||
## Plugin-specific files:
|
|
||||||
|
|
||||||
# mpeltonen/sbt-idea plugin
|
|
||||||
.idea_modules/
|
|
||||||
|
|
||||||
# JIRA plugin
|
|
||||||
atlassian-ide-plugin.xml
|
|
||||||
|
|
||||||
# Mongo Explorer plugin
|
|
||||||
.idea/mongoSettings.xml
|
|
||||||
|
|
||||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
|
||||||
com_crashlytics_export_strings.xml
|
|
||||||
crashlytics.properties
|
|
||||||
crashlytics-build.properties
|
|
||||||
fabric.properties
|
|
||||||
|
|
||||||
### AndroidStudio Patch ###
|
|
||||||
|
|
||||||
!/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
# End of https://www.toptal.com/developers/gitignore/api/androidstudio
|
|
||||||
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 @@
|
|||||||
|
#Sun Jun 04 16:38:18 CST 2023
|
||||||
|
gradle.version=7.5
|
||||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="WizardSettings">
|
||||||
|
<option name="children">
|
||||||
|
<map>
|
||||||
|
<entry key="imageWizard">
|
||||||
|
<value>
|
||||||
|
<PersistentState />
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<bytecodeTargetLevel target="11" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -1,17 +0,0 @@
|
|||||||
<?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\asus\.android\avd\Pixel_6_Pro_API_33.avd" />
|
|
||||||
</Key>
|
|
||||||
</deviceKey>
|
|
||||||
</Target>
|
|
||||||
</targetSelectedWithDropDown>
|
|
||||||
<timeTargetWasSelectedWithDropDown value="2023-05-26T06:09:38.060917300Z" />
|
|
||||||
</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="Android Studio default 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,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
|
||||||
|
<component name="ProjectType">
|
||||||
|
<option name="id" value="Android" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
|||||||
|
6
|
||||||
Binary file not shown.
@ -0,0 +1,108 @@
|
|||||||
|
#Tue Jun 06 12:10:41 CST 2023
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/add_bg.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_add_bg.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/trash.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/cloude.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_cloude.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/menu/recyclebin_options.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_recyclebin_options.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/select_all.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_select_all.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/dusk.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dusk.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/dream.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dream.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/raw/introduction=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/recycle_bin.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_recycle_bin.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/deselect_all.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_deselect_all.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/recover.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_recover.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/swith_bg.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_swith_bg.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
|
||||||
|
net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/layout/bg_icon.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_bg_icon.xml.flat
|
||||||
|
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\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=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.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="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\assets"/><source path="E:\Homework\SoftwareProject\TeamProject\src\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="E:\Homework\SoftwareProject\TeamProject\src\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="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\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="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\debug\shaders"/></dataSet></merger>
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
#Tue Jun 06 12:12: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
|
||||||
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.
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