pqefjimyf
/
MiNote
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://bdgit.educoder.net/pqefjimyf/MiNote

Browse Source 
# Conflicts:
#	src/Notes-master1/.gradle/8.0/checksums/checksums.lock
#	src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin
#	src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin
#	src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
#	src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
#	src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
#	src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
#	src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
#	src/Notes-master1/.gradle/file-system.probe
#	src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
#	src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
#	src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
main
zhangyimai 2 years ago
parent 5d10b7340f eb25bcfc50
commit 852b86a3d4
11 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File

BIN
doc/开源软件的质量分析报告.docx
View File

Binary file not shown.

2
src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
Unescape View File

@ -1,2 +1,2 @@
<?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\MiNote\src\Notes-master1\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android\MiNote\src\Notes-master1\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Android\MiNote\src\Notes-master1\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>

2
src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
Unescape View File

@ -1,2 +1,2 @@
<?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\MiNote\src\Notes-master1\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\MiNote\src\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\ruangong\xiaomi\MiNote\src\Notes-master1\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:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger>

2
src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
Unescape View File

@ -1,2 +1,2 @@
<?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\MiNote\src\Notes-master1\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\MiNote\src\Notes-master1\app\src\debug\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\ruangong\xiaomi\MiNote\src\Notes-master1\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:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\debug\shaders"/></dataSet></merger>

4
src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
Unescape View File

@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -40,7 +40,7 @@
}
},
{
"source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",

2
src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
Unescape View File

@ -79,6 +79,7 @@ import java.io.InputStreamReader;
import java.util.HashSet;
public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
private int mode = -1;
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
private static final int FOLDER_LIST_QUERY_TOKEN = 1;
@ -139,6 +140,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.note_list);
getWindow().setBackgroundDrawableResource(R.drawable.cat);
initResources();
/**

BIN
src/Notes-master1/app/src/main/res/drawable-hdpi/batterfly.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 MiB

BIN
src/Notes-master1/app/src/main/res/drawable-hdpi/rocket.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.3 MiB

16
src/Notes-master1/app/src/main/res/menu/note_list.xml
Unescape View File

@ -36,4 +36,20 @@
<item
android:id="@+id/menu_search"
android:title="@string/menu_search"/>
<item
android:id="@+id/menu_cat"
android:title="Background:cat"/>
<item
android:id="@+id/menu_lattice"
android:title="Background:lattice"/>
<item
android:id="@+id/menu_notes"
android:title="Background:notes"/>
<item
android:id="@+id/menu_house"
android:title="Background:house"/>
</menu>

7
src/Notes-master1/app/src/main/res/values/strings.xml
Unescape View File

@ -37,6 +37,13 @@
<!-- Text export file information -->
<string name="file_path">/MIUI/notes/</string>
<string name="file_name_txt_format">notes_%s.txt</string>
<!--背景切换-->
<string name="menu_cat">Background:Cat</string>
<string name="menu_lattice">Background:Green lattice</string>
<string name="menu_notes">Background:Notes</string>
<string name="menu_house">Background:House</string>
<!-- notes list string -->
<string name="format_folder_files_count">(%d)</string>
<string name="menu_create_folder">New Folder</string>

7
src/Notes-master1/local.properties
Unescape View File

@ -2,6 +2,7 @@
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
#
#Sat Dec 02 10:18:27 CST 2023
sdk.dir=D\:\\Android\\Sdk
# For customization when using a Version Control System, please read the
# header note.
#Wed Jan 03 18:03:28 CST 2024
sdk.dir=C\:\\Users\\mhl\\AppData\\Local\\Android\\Sdk

Write Preview
Loading…
Cancel
Save