Compare commits

...

46 Commits

Author SHA1 Message Date
pbyhqr72x 19392d7189 Merge pull request '最终维护报告 by 谈晓龙' (#23) from luoxinxin into master
3 years ago
xxl 7c4aedeb93 提交最终维护报告 by 谈晓龙
3 years ago
pbyhqr72x 4de2b2cea7 Merge pull request '最终版本 assets放在main目录下' (#20) from develop into master
3 years ago
pbyhqr72x 08f3ec7c1a Merge pull request '最终版本 注意assets放在main目录下' (#19) from luoxinxin into develop
3 years ago
xxl 0bbb5e0bf0 最终版本
3 years ago
pbyhqr72x 7474af1905 Delete 'src/Notes-master/res/AndroidManifest.xml'
3 years ago
pbyhqr72x b64096cbd5 Merge pull request 'sync' (#17) from develop into master
3 years ago
pbyhqr72x 3d429f238d sync
3 years ago
xxl 775d22645f sync
3 years ago
xxl 00dc58e80a Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin
3 years ago
pbyhqr72x 06518a8f34 Delete 'doc/开源软件维护.docx'
3 years ago
xxl 311fb81dc4 ppt
3 years ago
xxl c070419617 Merge remote-tracking branch 'origin/hxs_xiaomi1' into luoxinxin
3 years ago
Aoi 71695c874a 11
3 years ago
pbyhqr72x 6d35b9476a tongyi
3 years ago
xxl 52e29900d5 增加功能:
3 years ago
pbyhqr72x d01c3b5117 Merge pull request '小米便签1.1.2 修改了新建文件夹有设置密码弹窗的bug' (#12) from develop into master
3 years ago
pbyhqr72x fa5b5fd66f 同意
3 years ago
xxl 953edd0d8a 修改创建文件夹会有检验密码弹窗的bug
3 years ago
pbyhqr72x 87216814a8 同意
3 years ago
pbyhqr72x 8ca916b8a4 同意
3 years ago
xxl d330687bad 完善维护了密码功能包括:
3 years ago
pbyhqr72x 58c45909b8 Merge pull request 'bug修复' (#8) from lixiang into develop
3 years ago
xxl 2a42d48dbb Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin
3 years ago
xxl e012e4479f 小米便签1.1:密码功能+置顶功能
3 years ago
李想 58a9b5461a bug修改
3 years ago
pbyhqr72x 652c61b8d9 同意
3 years ago
xxl 1a6ea7fb5e 完善了增加密码功能:
3 years ago
phmsuvtwa d1df4a314a Merge pull request '简单置顶功能' (#6) from hxs_xiaomi2 into develop
3 years ago
pbyhqr72x 172705ab5a 同意
3 years ago
pbyhqr72x 603bb850b9 同意
3 years ago
李想 b2da26bb48 1
3 years ago
xxl acaedfb5c5 增加密码设置功能之后代码
3 years ago
xxl ee94a7e1c3 Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote
3 years ago
xxl 7825157d34 提交小米便签源码,修改基于此源码上,修改完毕后请及时提交请求合并。
3 years ago
pbyhqr72x 2b53cead21 同意
3 years ago
xxl c49a3ea049 补充模板
3 years ago
pbyhqr72x 46f2530434 接受
3 years ago
xxl d556d8a19a 删除模板
3 years ago
xxl db447391ca Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin
3 years ago
xxl 536e117436 提交模板
3 years ago
xxl e46abc7efa 完善一下2.1 2.2
3 years ago
xxl 7fafef7a7b 完成2.1、2.2
3 years ago
xxl 460a900527 创建doc文件夹
3 years ago
xxl 757c619c08 Signed-off-by: xxl <2532500952@qq.com>
3 years ago
pbyhqr72x 598aad3044 Initial commit
3 years ago

@ -0,0 +1,2 @@
# Xiao_Mi_promote

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#50000000" />
</selector>

Binary file not shown.

@ -1,2 +0,0 @@
#Sat Sep 11 10:03:18 CST 2021
gradle.version=7.2

@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

@ -1,123 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>

@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="16" />
</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\Lenovo\.android\avd\Pixel_5_API_23.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2021-09-12T08:09:43.695989200Z" />
</component>
</project>

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

@ -1,21 +0,0 @@
<?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="openjdk-16" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

@ -1,30 +0,0 @@
<?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>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
</component>
</project>

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Android app/Notes-master/app/src/main/res/drawable/new_note.xml" value="0.24270833333333333" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/layout/add_account_text.xml" value="0.10260416666666666" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/layout/datetime_picker.xml" value="0.10260416666666666" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/layout/note_edit.xml" value="0.26145833333333335" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/layout/note_item.xml" value="0.146875" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/menu/call_note_edit.xml" value="0.19444444444444445" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/menu/note_edit.xml" value="0.22291666666666668" />
<entry key="..\:/Android app/Notes-master/app/src/main/res/xml/preferences.xml" value="0.12158054711246201" />
</map>
</option>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="16" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4" />

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SonarLintProjectState">
<lastEventPolling>1631850246765</lastEventPolling>
</component>
</project>

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SonarLintProjectSettings">
<option name="bindingEnabled" value="true" />
<option name="projectKey" value="Kilito" />
<option name="serverId" value="Kilito" />
</component>
</project>

@ -1,11 +0,0 @@
m
java:S37765"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(üßú–ùÿÿÿÿ
O
java:S1874A"9Remove this use of "setTextAppearance"; it is deprecated.(¤ñÝ×
O
java:S1874H"9Remove this use of "setTextAppearance"; it is deprecated.(Á†<C381>ö
O
java:S1874N"9Remove this use of "setTextAppearance"; it is deprecated.(¤ñÝ×
>
java:S1068("(Remove this unused "mTop" private field.(èÞ†´

@ -1,15 +0,0 @@
ƒ
Sapp/build/generated/source/buildConfig/debug/net/micode/notes/ui/NotesListItem.java,6\5\65510b2703c0c5abe5f48e74f16618d1815996ad
<
build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
A
gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4
?
settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233
X
(gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e
@
app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
@
local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca

@ -1,69 +0,0 @@
apply plugin: 'com.android.application'
//apply plugin: 'kotlin-android'
apply plugin: 'org.sonarqube'
sonarqube {
properties {
//Sonar
property "sonar.host.url", "*****************************"
//Token
property "sonar.login","**********************************"
//
//property "sonar.login","*******"
//property "sonar.password","******"
property "sonar.sourceEncoding", "UTF-8"
property "sonar.projectKey", "Android_DuoApp"
property "sonar.projectName", project.name
//(APPjava)
property "sonar.sources", "src/main/java"
property "sonar.projectVersion", project.version
}
}
android {
compileSdkVersion 31
buildToolsVersion "31.0.0"
useLibrary 'org.apache.http.legacy'
defaultConfig {
applicationId "net.micode.notes"
minSdkVersion 14
targetSdkVersion 31
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}
repositories {
mavenCentral()
}
dependencies {
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
google()
//mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
}
}
apply plugin: "org.sonarqube"
allprojects {
repositories {
google()
//mavenCentral()
jcenter()
}
}
apply plugin: 'org.sonarqube'

@ -1,12 +0,0 @@
/**
* 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";
}

@ -1,2 +0,0 @@
appMetadataVersion=1.0
androidGradlePluginVersion=7.0.2

@ -1,10 +0,0 @@
{
"version": 3,
"artifactType": {
"type": "COMPATIBLE_SCREEN_MANIFEST",
"kind": "Directory"
},
"applicationId": "net.micode.notes",
"variantName": "debug",
"elements": []
}

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\androidTest\res"/><source path="D:\Android app\Notes-master\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Android app\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\androidTest\res"/><source path="D:\Android app\Notes-master\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Android app\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\androidTestDebug\res"/></dataSet><mergedItems/></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\main\assets"/><source path="D:\Android app\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\debug\assets"/></dataSet></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>

@ -1,100 +0,0 @@
#Tue Nov 09 08:42:22 CST 2021
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_encryption_repeat.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_encryption_repeat.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_encryption.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_encryption.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_decryption.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_decryption.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\homepage.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_homepage.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\raw\\introduction=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
D\:\\Android\ app\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android app\Notes-master\app\src\debug\shaders"/></dataSet></merger>

@ -1,4 +0,0 @@
#Tue Nov 09 20:21:20 CST 2021
base.0=D\:\\Android app\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save