release v1.2

LICENSE

@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "{}" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright 2017 呵呵小鱼
+
+   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.

README.md

@@ -1,21 +1,27 @@
 ## 花灰 ##
 
-<img src="https://raw.githubusercontent.com/lexrus/Huahui/master/Huahui/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60%402x.png" width="60" height="60" alt="icon"/>
+<img src="https://raw.githubusercontent.com/lexrus/Huahui/master/Huahui/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60%402x.png" width="96" height="96" alt="icon"/>
 
 iOS 版本请前往 [https://github.com/lexrus/Huahui](https://github.com/lexrus/Huahui)
 
 这个项目是 『中国程序员常读错的英文单词的 App』 的 Android 版本，简单粗暴。
 
-陈列了一些中国程序员经常读错的单词，纠正发音！使用 jsoup 爬取网页上的单词列表；使用原生 MediaPlayer 播放网络单词音频，没有其他多余功能了。
+陈列了一些中国程序员经常读错的单词，纠正发音！使用 jsoup 爬取网页上的单词列表；使用原生 MediaPlayer 播放网络单词音频，并提供本地添加删除功能，附带使用有道翻译 Api 查询音标。
 
 ### 下载 
 
-[直接下载](http://7xp1a1.com1.z0.glb.clouddn.com/HuaHui/huahui_v1.1_20170307.apk)
+[直接下载](http://7xp1a1.com1.z0.glb.clouddn.com/HuaHui/huahui_v1.2_20170714.apk)
 
 ![qcode](qcode.png)
 
 ### 版本更新
 
+v1.2 - 20170714
+- 调整主题色
+- 新增音频缓存功能，节约流量
+- 新增单词查询添加功能，使用有道 Api
+- 一些小细节的完善
+
 v1.1 - 20170307
 - 单词列表改从网络拉取，实时更新
 - 新增本地缓存功能，体验更好
@@ -32,11 +38,16 @@ v1.0 - 20170303
 
 ### 开源库 ###
 - [jsoup](https://github.com/jhy/jsoup)
+- [retrofit](https://github.com/square/retrofit)
 - [LitePal](https://github.com/LitePalFramework/LitePal)
 - [RxJava](https://github.com/ReactiveX/RxJava)
 - [RxAndroid](https://github.com/ReactiveX/RxAndroid)
+- [FileDownloader](https://github.com/lingochamp/FileDownloader)
 - [BaseRecyclerViewAdapterHelper](https://github.com/CymChad/BaseRecyclerViewAdapterHelper)
 
 ### 联系我 ###
 * Email:[me@liyuyu.cn](mailto:me@liyuyu.cn)
-* Weibo:[@呵呵小小鱼](http://weibo.com/u/1241167880)
+* Weibo:[@呵呵小小鱼](http://weibo.com/u/1241167880)
+
+### License ###
+[Apache License Version 2.0](LICENSE)

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.liyu.huahui"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/AndroidManifest.xml

@@ -23,12 +23,15 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.QueryActivity"
-                  android:parentActivityName=".ui.MainActivity"
-                  android:theme="@style/AppTheme.Dialog">
+        <activity
+            android:name=".ui.QueryActivity"
+            android:parentActivityName=".ui.MainActivity"
+            android:theme="@style/AppTheme.Dialog"
+            android:windowSoftInputMode="adjustResize|stateHidden">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.liyu.huahui.ui.MainActivity"/>></activity>
+                android:value="com.liyu.huahui.ui.MainActivity"/>>
+        </activity>
     </application>
 
 </manifest>

app/src/main/java/com/liyu/huahui/adapter/WordAdapter.java

@@ -24,6 +24,8 @@
 
 public class WordAdapter extends BaseQuickAdapter<Word, BaseViewHolder> {
 
+    private OnDataChangedListener listener;
+
     public WordAdapter(int layoutResId, List<Word> data) {
         super(layoutResId, data);
     }
@@ -65,12 +67,18 @@ public boolean onLongClick(View v) {
                 final int deletedPosition = helper.getAdapterPosition();
                 remove(deletedPosition);
                 item.delete();
+                if (listener != null) {
+                    listener.onChanged(getData().size());
+                }
                 Snackbar.make(((MainActivity) mContext).getWindow().getDecorView().getRootView().findViewById(R.id.coordinatorLayout), "删除成功!",
                         Snackbar.LENGTH_LONG).setAction("撤销", new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         addData(deletedPosition, item);
                         item.save();
+                        if (listener != null) {
+                            listener.onChanged(getData().size());
+                        }
                     }
                 }).setActionTextColor(ContextCompat.getColor(mContext, R.color.snackbar_action_color)).show();
                 return false;
@@ -93,4 +101,11 @@ public void onFail(String msg) {
 
     }
 
+    public interface OnDataChangedListener {
+        void onChanged(int dateSize);
+    }
+
+    public void setDataChangedListener(OnDataChangedListener listener) {
+        this.listener = listener;
+    }
 }

app/src/main/java/com/liyu/huahui/ui/MainActivity.java

@@ -74,6 +74,12 @@ public void onClick(View v) {
         adapter = new WordAdapter(R.layout.item_word, null);
         adapter.openLoadAnimation();
         recyclerView.setAdapter(adapter);
+        adapter.setDataChangedListener(new WordAdapter.OnDataChangedListener() {
+            @Override
+            public void onChanged(int dateSize) {
+                tvTotal.setText(String.format("总计：%s个", dateSize));
+            }
+        });
         getWords();
     }
 
@@ -257,8 +263,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 word.save();
                 adapter.addData(word);
                 sortData();
+                adapter.notifyDataSetChanged();
                 int wordIndex = adapter.getData().indexOf(word);
-                recyclerView.scrollToPosition(wordIndex);
+                recyclerView.smoothScrollToPosition(wordIndex);
             }
         }
     }

app/src/main/java/com/liyu/huahui/ui/QueryActivity.java

@@ -15,6 +15,7 @@
 import android.view.animation.Interpolator;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import com.liyu.huahui.App;
 import com.liyu.huahui.R;
@@ -27,6 +28,9 @@
 import com.liyu.huahui.ui.widgets.ProgressButton;
 import com.liyu.huahui.utils.YoudaoUtil;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import rx.Observer;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -74,7 +78,14 @@ public void onClick(View v) {
     private void query() {
         String word = editText.getEditableText().toString().trim();
         if (TextUtils.isEmpty(word)) {
-            editText.setError("单词为什么是空的！");
+            editText.setError("为什么是空的！");
+            return;
+        }
+        String patternWords = "[a-zA-Z1-9 ]{1,}";
+        Pattern r = Pattern.compile(patternWords);
+        Matcher m = r.matcher(word);
+        if (!m.matches()) {
+            editText.setError("这货不是单词啊！");
             return;
         }
         progressButton.startAnim();
@@ -98,11 +109,17 @@ public void Stop() {
 
                     @Override
                     public void onError(Throwable e) {
-                        editText.setEnabled(true);
+                        Toast.makeText(QueryActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
+                        finishAfterTransition();
+
                     }
 
                     @Override
                     public void onNext(YoudaoResponse youdaoResponse) {
+                        if (youdaoResponse.getBasic() == null || TextUtils.isEmpty(youdaoResponse.getQuery())) {
+                            Toast.makeText(QueryActivity.this, "没有查到这个单词！", Toast.LENGTH_SHORT).show();
+                            return;
+                        }
                         Word word = new Word();
                         word.setName(youdaoResponse.getQuery());
                         word.setCorrectPhonetic(String.format("[%s]", youdaoResponse.getBasic().getPhonetic()));