Optimize search function

liying2008 · Oct 16, 2018 · 965e1e2 · 965e1e2
1 parent 2feb0a0
commit 965e1e2
Show file tree

Hide file tree

Showing 23 changed files with 98 additions and 124 deletions.
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/dictionaries/liying.xml b/.idea/dictionaries/liying.xml
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ android:
   components:
     - platform-tools
     - tools
-    - android-27
+    - android-28
     - extra-android-m2repository
 
 before_install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
+## v1.0.1
+- 【优化】优化搜索密码功能，支持记录搜索历史。
 
-# v1.0.0
+## v1.0.0
 - 【新增】导入密码界面可长按删除文件。
 
-# v1.0.0_beta
+## v1.0.0_beta
 - 初始版本。
diff --git a/README.md b/README.md
@@ -1,72 +1,73 @@
-# QPassword (七圈密码) #
----
+# QPassword (七圈密码)
+
 [![GitHub release](https://img.shields.io/github/release/liying2008/QPassword.svg)](https://github.com/liying2008/QPassword/releases)
 [![Build Status](https://travis-ci.org/liying2008/QPassword.svg?branch=master)](https://travis-ci.org/liying2008/QPassword)
 [![Github Releases](https://img.shields.io/github/downloads/liying2008/QPassword/total.svg)](https://codeload.github.com/liying2008/QPassword/zip/master)
 [![license](https://img.shields.io/github/license/liying2008/QPassword.svg)](https://github.com/liying2008/QPassword/blob/master/LICENSE)
 
 
-> ### [Download Latest APK](https://github.com/liying2008/QPassword/releases/download/v1.0.0/qpassword_v1.0.0.apk)
+> ### [Download Latest APK](https://github.com/liying2008/QPassword/releases/download/v1.0.1/qpassword_v1.0.1.apk)
+
+## Compiling Environment
 
-Compiling Environment
----------------------
-- compileSdkVersion 27
-- targetSdkVersion 27
-- Gradle Version 4.4
-- Kotlin Version 1.2.31
+- compileSdkVersion 28
+- targetSdkVersion 28
+- Gradle Version 4.6
+- Kotlin Version 1.2.71
 
 ### Linux
+
 ```shell
 ./gradlew assembleDebug
 ```
 
 ### Windows
+
 ```shell
 gradlew assembleDebug
 ```
 
-> ### 项目可直接导入 <code>Android Studio 3.1.1</code> 中运行。
+> **项目可直接导入 <code>Android Studio 3.2</code> 中运行。**
+
+## Primary Function
 
-Primary Function
-----------------
 “**七圈密码**” 是一款用来保存你的各类账号及密码的软件，你只需要记住一个主密码即可轻松管理保存的所有密码，大大减轻了记忆负担。
 
-Others
-------
+### Others
+
 1. 如果用户设置了主密码，则用户所保存的密码都会使用AES加密算法进行加密，加密密钥根据主密码生成；如果用户选择不设置主密码，则保存在数据库中的密码数据将会以明文形式存储；
 2. 该应用不联网，用户存储的所有密码均保存在本地；
 3. 该应用的部分界面参考了：https://github.com/o602075123/MyPassword 。
 
-ScreenShot
-----------
+## ScreenShot
+
 ![ScreenShot1](screenshot/1.png)
 ![ScreenShot2](screenshot/2.png)
 ![ScreenShot3](screenshot/3.png)
 ![ScreenShot4](screenshot/4.png)
 ![ScreenShot5](screenshot/5.png)
 ![ScreenShot6](screenshot/6.png)
 
-Update
-------
-2018-04-14
+## Update
+
+2018-10-16
+
+## ChangeLog
 
-UpdateLog
-------
 [点击查看更新日志](CHANGELOG.md)
 
-Contact Me
----------
+## Contact Me
+
 CSDN：[http://blog.csdn.net/u012939909](http://blog.csdn.net/u012939909)  
 Email：[liruoer2008@yeah.net](mailto:liruoer2008@yeah.net)  
 
-Thanks
-----
+## Thanks
+
 - [fastjson](https://github.com/alibaba/fastjson)
 - [PatternLockView](https://github.com/aritraroy/PatternLockView)
 - [guava](https://github.com/google/guava)
 
-License
-----
+## License
 
 ```
 Copyright 2017-2018 独毒火

diff --git a/app/src/main/java/cc/duduhuo/qpassword/adapter/DrawerItemAdapter.kt b/app/src/main/java/cc/duduhuo/qpassword/adapter/DrawerItemAdapter.kt
@@ -237,12 +237,11 @@ class DrawerItemAdapter(private val mContext: Context) : RecyclerView.Adapter<Dr
         fun onOperationItemClick(groupDrawerItem: OperationDrawerItem)
     }
 
-    inner open class DrawerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
+    open inner class DrawerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
     /**
      * 分组菜单和操作菜单
      */
-
     inner class NormalViewHolder(itemView: View) : DrawerViewHolder(itemView)
 
     /**

diff --git a/app/src/main/java/cc/duduhuo/qpassword/adapter/PasswordListAdapter.kt b/app/src/main/java/cc/duduhuo/qpassword/adapter/PasswordListAdapter.kt
@@ -3,7 +3,6 @@ package cc.duduhuo.qpassword.adapter
 import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

diff --git a/app/src/main/java/cc/duduhuo/qpassword/db/GroupService.kt b/app/src/main/java/cc/duduhuo/qpassword/db/GroupService.kt
@@ -91,7 +91,7 @@ class GroupService(context: Context) {
 
     /**
      * 删除分组（同时删除该分组下的所有密码）
-     * @param group 分组名称
+     * @param groupName 分组名称
      * @return 影响的行数
      */
     fun deleteGroup(groupName: String): Int {

diff --git a/app/src/main/java/cc/duduhuo/qpassword/service/MainBinder.kt b/app/src/main/java/cc/duduhuo/qpassword/service/MainBinder.kt
@@ -1,12 +1,8 @@
 package cc.duduhuo.qpassword.service
 
-import android.app.Activity
-import android.app.Dialog
-import android.app.ProgressDialog
 import android.content.Context
 import android.os.AsyncTask
 import android.os.Binder
-import android.support.v7.app.AppCompatActivity
 import cc.duduhuo.qpassword.bean.Group
 import cc.duduhuo.qpassword.bean.Key
 import cc.duduhuo.qpassword.bean.Password
@@ -15,7 +11,6 @@ import cc.duduhuo.qpassword.db.KeyService
 import cc.duduhuo.qpassword.db.PasswordService
 import cc.duduhuo.qpassword.service.listener.*
 import cc.duduhuo.qpassword.service.task.*
-import cc.duduhuo.qpassword.ui.activity.BaseActivity
 
 /**
  * =======================================================
@@ -214,7 +209,7 @@ class MainBinder(context: Context) : Binder() {
 
     /**
      * 添加新密码List
-     * @param password 新密码
+     * @param passwords 新密码
      */
     fun insertPasswords(passwords: List<Password>) {
         val task = InsertPasswordsTask(passwords, mPasswordService, mGroupService)
@@ -238,7 +233,7 @@ class MainBinder(context: Context) : Binder() {
 
     /**
      * 删除分组
-     * @param group 要删除的分组（该分组下的所有密码会一并删除）
+     * @param groupName 要删除的分组（该分组下的所有密码会一并删除）
      */
     fun deleteGroup(groupName: String) {
         val task = DeleteGroupTask(groupName, mGroupService)

diff --git a/app/src/main/java/cc/duduhuo/qpassword/service/task/DeleteGroupTask.kt b/app/src/main/java/cc/duduhuo/qpassword/service/task/DeleteGroupTask.kt
@@ -3,7 +3,6 @@ package cc.duduhuo.qpassword.service.task
 import android.os.AsyncTask
 import cc.duduhuo.qpassword.db.GroupService
 import cc.duduhuo.qpassword.service.listener.OnGroupChangeListener
-import cc.duduhuo.qpassword.ui.activity.BaseActivity
 
 /**
  * =======================================================

diff --git a/app/src/main/java/cc/duduhuo/qpassword/service/task/DeletePasswordTask.kt b/app/src/main/java/cc/duduhuo/qpassword/service/task/DeletePasswordTask.kt
@@ -1,7 +1,6 @@
 package cc.duduhuo.qpassword.service.task
 
 import android.os.AsyncTask
-import android.util.Log
 import cc.duduhuo.qpassword.bean.Password
 import cc.duduhuo.qpassword.db.PasswordService
 import cc.duduhuo.qpassword.service.listener.OnPasswordChangeListener

diff --git a/app/src/main/java/cc/duduhuo/qpassword/service/task/InsertPasswordTask.kt b/app/src/main/java/cc/duduhuo/qpassword/service/task/InsertPasswordTask.kt
@@ -8,7 +8,6 @@ import cc.duduhuo.qpassword.db.PasswordService
 import cc.duduhuo.qpassword.service.listener.OnGroupChangeListener
 import cc.duduhuo.qpassword.service.listener.OnPasswordChangeListener
 import cc.duduhuo.qpassword.service.listener.OnPasswordFailListener
-import cc.duduhuo.qpassword.ui.activity.BaseActivity
 
 /**
  * =======================================================

diff --git a/app/src/main/java/cc/duduhuo/qpassword/ui/activity/AboutActivity.kt b/app/src/main/java/cc/duduhuo/qpassword/ui/activity/AboutActivity.kt
@@ -1,5 +1,6 @@
 package cc.duduhuo.qpassword.ui.activity
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.Point
@@ -92,9 +93,10 @@ class AboutActivity : BaseActivity() {
         }
     }
 
-    /**
-     * 关于作者
-     */
+    @SuppressLint("InflateParams")
+        /**
+         * 关于作者
+         */
     fun aboutMe(v: View) {
         val builder = AlertDialog.Builder(this)
         builder.setTitle(R.string.about_author)

diff --git a/app/src/main/java/cc/duduhuo/qpassword/ui/activity/EditActivity.kt b/app/src/main/java/cc/duduhuo/qpassword/ui/activity/EditActivity.kt
@@ -1,5 +1,6 @@
 package cc.duduhuo.qpassword.ui.activity
 
+import android.annotation.SuppressLint
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -113,6 +114,7 @@ class EditActivity : BaseActivity(), OnGetPasswordListener, OnGetPasswordsListen
     /**
      * 创建新分组
      */
+    @SuppressLint("InflateParams")
     private fun createGroup() {
         val builder = AlertDialog.Builder(this)
         val view = layoutInflater.inflate(R.layout.dialog_add_group, null, false)

diff --git a/app/src/main/java/cc/duduhuo/qpassword/ui/activity/ExportActivity.kt b/app/src/main/java/cc/duduhuo/qpassword/ui/activity/ExportActivity.kt
@@ -93,9 +93,9 @@ class ExportActivity : BaseActivity() {
                     if (shouldShowPermissionRationale(PERMISSION)) {
                         Snackbar.make(view, R.string.permission_write_rationale,
                             Snackbar.LENGTH_INDEFINITE)
-                            .setAction(R.string.ok, {
+                            .setAction(R.string.ok) {
                                 requestPermission(PERMISSION, REQUEST_PERMISSION)
-                            }).show()
+                            }.show()
                     } else {
                         requestPermission(PERMISSION, REQUEST_PERMISSION)
                     }

diff --git a/app/src/main/java/cc/duduhuo/qpassword/ui/activity/ImportActivity.kt b/app/src/main/java/cc/duduhuo/qpassword/ui/activity/ImportActivity.kt
@@ -96,9 +96,9 @@ class ImportActivity : BaseActivity(), FileListAdapter.OnFileClickListener, OnPa
                 if (shouldShowPermissionRationale(PERMISSION)) {
                     Snackbar.make(main_layout, R.string.permission_read_rationale,
                         Snackbar.LENGTH_INDEFINITE)
-                        .setAction(R.string.ok, {
+                        .setAction(R.string.ok) {
                             requestPermission(PERMISSION, REQUEST_PERMISSION)
-                        })
+                        }
                         .show()
                 } else {
                     requestPermission(PERMISSION, REQUEST_PERMISSION)
@@ -225,22 +225,22 @@ class ImportActivity : BaseActivity(), FileListAdapter.OnFileClickListener, OnPa
         val builder = AlertDialog.Builder(this)
         builder.setTitle(R.string.delete_file)
         builder.setMessage(getString(R.string.delete_file_message, fileName))
-        builder.setNegativeButton(R.string.delete, { _, _ ->
+        builder.setNegativeButton(R.string.delete) { _, _ ->
             val ok = File(absolutePath).delete()
             if (ok) {
                 // 刷新 RecyclerView
                 mAdapter!!.removeItem(position)
             } else {
                 // 删除文件失败
                 Snackbar.make(rv_file, R.string.delete_fail, Snackbar.LENGTH_LONG)
-                    .setAction(R.string.refresh_file_list, {
+                    .setAction(R.string.refresh_file_list) {
                         initData(refresh = true)
-                    }).show()
+                    }.show()
             }
-        })
-        builder.setPositiveButton(R.string.cancel, { _, _ ->
+        }
+        builder.setPositiveButton(R.string.cancel) { _, _ ->
             // no op
-        })
+        }
         builder.create().show()
         return true
     }