Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

README.md

@@ -4,36 +4,46 @@
 
 xperia64's DIYEdit porting to Android
 
-Thanks to:
+this repo will no longer update because of my education problems
+feel free to fork and pull request
+
+functionality planned to add(but canceled)
+- [ ] night mode support
+- [ ] multi language change
+- [ ] midi file playback
+- [ ] custom file chooser activity
 
-- [FluidSynth](https://github.com/FluidSynth/fluidsynth) gives music playback with custom sf2
-  soundbank support.
-- [xperia64's DIYEdit](https://github.com/xperia64/DIYEdit) gives easy-to-use classes.
-- [codekidX's storage-chooser](https://github.com/codekidX/storage-chooser) for choosing file and
-  directory，and Android R (11) support provided by mendhak.
-- [kshoji's JFugue-for-Android](https://github.com/kshoji/JFugue-for-Android) for playing and
-  processing MIDI files.
-- [Material Design Icons by Google](https://github.com/google/material-design-icons) for providing
-  Material Design Icons that matches DIYEdit_Mobile's app theme.
-- [kshoji's javax.sound.midi-for-Android](https://github.com/kshoji/javax.sound.midi-for-Android)
-  gives support for JFugue-for-Android.
-
-  Partly referred
-  to [Creating a Fluidsynth Hello World App for Android by Hector Ricardo](https://github.com/HectorRicardo/fluidsynth-android-hello-world)
+Thanks to:
+ - [FluidSynth](https://github.com/FluidSynth/fluidsynth) gives music playback with custom sf2 soundbank support.
+ - [xperia64's DIYEdit](https://github.com/xperia64/DIYEdit) gives easy-to-use classes.
+ - [codekidX's storage-chooser](https://github.com/codekidX/storage-chooser) for choosing file and directory，and Android R (11) support provided by mendhak.
+ - [kshoji's JFugue-for-Android](https://github.com/kshoji/JFugue-for-Android) for playing and processing MIDI files.
+ - [Material Design Icons by Google](https://github.com/google/material-design-icons) for providing Material Design Icons that matches DIYEdit_Mobile's app theme.
+ - [kshoji's javax.sound.midi-for-Android](https://github.com/kshoji/javax.sound.midi-for-Android) gives support for JFugue-for-Android.
+
+   Partly refered to [Creating a Fluidsynth Hello World App for Android by Hector Ricardo](https://github.com/HectorRicardo/fluidsynth-android-hello-world)
 
 # Chinese
 
 xperia64 DIYEdit 的 Android 移植版本
 
-感谢：
+因为学业问题不再更新
+想怎么fork/pull request就怎么搞
 
-- [FluidSynth](https://github.com/FluidSynth/fluidsynth) 提供使用自定义 sf2 音色库播放音乐的功能。
-- [xperia64 的 DIYEdit](https://github.com/xperia64/DIYEdit) 提供了简单易用的类。
-- [codekidX 的 storage-chooser](https://github.com/codekidX/storage-chooser) 用于选择文件与目录，以及
-  mendhak 提供的 Android R (11) 支持。
-- [kshoji 的 JFugue-for-Android](https://github.com/kshoji/JFugue-for-Android) 播放与处理 MIDI 文件。
-- [Google 的 Material Design Icons](https://github.com/google/material-design-icons)
-- [kshoji 的 javax.sound.midi-for-Android](https://github.com/kshoji/javax.sound.midi-for-Android)
-  提供对 JFugue-for-Android 的支持。
+计划加入的功能（但是取消了）
+- [ ] 夜间模式
+- [ ] 多语言切换
+- [ ] MIDI播放
+- [ ] 自制文件选择器Activity
 
-  部分参考了 [Creating a Fluidsynth Hello World App for Android -- Hector Ricardo](https://github.com/HectorRicardo/fluidsynth-android-hello-world)
+感谢：
+ - [FluidSynth](https://github.com/FluidSynth/fluidsynth) 提供使用自定义 sf2 音色库播放音乐的功能。
+ - [xperia64 的 DIYEdit](https://github.com/xperia64/DIYEdit) 提供了简单易用的类。
+ - [codekidX 的 storage-chooser](https://github.com/codekidX/storage-chooser) 用于选择文件与目录，以及 mendhak 提供的 Android R (11) 支持。
+ - [kshoji 的 JFugue-for-Android](https://github.com/kshoji/JFugue-for-Android) 播放与处理 MIDI 文件。
+ - [Google 的 Material Design Icons](https://github.com/google/material-design-icons)
+ - [kshoji 的 javax.sound.midi-for-Android](https://github.com/kshoji/javax.sound.midi-for-Android) 提供对 JFugue-for-Android 的支持。
+
+   部分参考了 [Creating a Fluidsynth Hello World App for Android -- Hector Ricardo](https://github.com/HectorRicardo/fluidsynth-android-hello-world)
+
+-- 大家爱的中国教育