文档改为文件

thinaaron · thinaaron · commit b24eceecac1d · 2016-12-22T15:57:13.000+08:00
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Android Studio 2.2.3，用gradle引用的许多第三方库，第一次加载会
 
 ##一些觉得有必要提一下的
 因为不想写一堆绑定函数，所以项目用了 [androidannotations](https://github.com/excilys/androidannotations)，如果以前没用过最好先看看。
-显示图片用的[universal-image-loader](https://github.com/nostra13/Android-Universal-Image-Loader)，网络库用的[android-async-http](https://github.com/loopj/android-async-http)，因为登录以后保存的cookie都在[android-async-http](https://github.com/loopj/android-async-http)，有些图片需要登录后的cookie才能取到（例如项目文档里面的图片），这种情况就会用先用[android-async-http](https://github.com/loopj/android-async-http)下载图片（AttachmentimagePagerFragment.java）。
+显示图片用的[universal-image-loader](https://github.com/nostra13/Android-Universal-Image-Loader)，网络库用的[android-async-http](https://github.com/loopj/android-async-http)，因为登录以后保存的cookie都在[android-async-http](https://github.com/loopj/android-async-http)，有些图片需要登录后的cookie才能取到（例如项目文件里面的图片），这种情况就会用先用[android-async-http](https://github.com/loopj/android-async-http)下载图片（AttachmentimagePagerFragment.java）。
 
 - Application用的是MyApp.java，用静态变量保存了用户信息，屏幕长宽等信息（理论上来说不是好的做法，但是这些基本都是只读的数据，而且并不大，所以就这么做了）。
 
diff --git a/app/src/main/java/net/coding/program/model/AttachmentFileObject.java b/app/src/main/java/net/coding/program/model/AttachmentFileObject.java
@@ -12,7 +12,7 @@
 
 /**
  * Created by yangzhen on 2014/10/25.
- * 项目文档中的文件
+ * 项目文件中的文件
  */
 public class AttachmentFileObject implements Serializable {
 
diff --git a/app/src/main/java/net/coding/program/project/detail/AttachmentsActivity.java b/app/src/main/java/net/coding/program/project/detail/AttachmentsActivity.java
@@ -65,7 +65,7 @@
 import static net.coding.program.common.Global.HOST_API;
 
 /**
- * 展示某一项目文档目录下面文件的Activity
+ * 展示某一项目文件目录下面文件的Activity
  * 原本没有二级目录，这个Activity是只用来处理AttachmentFileObject的
  * 之后加了二级目录，那么有些实现方式就不太合适了
  * Created by yangzhen
@@ -299,8 +299,8 @@ public void onClick(View v) {
     /**
      * 弹出框
      */
-    private DialogUtil.BottomPopupWindow mAttachmentPopupWindow = null;//文档目录的底部弹出框
-    private DialogUtil.BottomPopupWindow mAttachmentFilePopupWindow = null;//文档文件的底部弹出框
+    private DialogUtil.BottomPopupWindow mAttachmentPopupWindow = null;//文件目录的底部弹出框
+    private DialogUtil.BottomPopupWindow mAttachmentFilePopupWindow = null;//文件文件的底部弹出框
     private int selectedPosition;
     protected View.OnClickListener onMoreClickListener = new View.OnClickListener() {
         @Override
@@ -618,9 +618,9 @@ private void jumpToDetail(AttachmentFileObject data) {
 
 
     /**
-     * 获取当前文档列表中的所有图片文档，提供给AttachmentsPicDetailActivity
+     * 获取当前文件列表中的所有图片文件，提供给AttachmentsPicDetailActivity
      *
-     * @return 当前文档列表中的所有图片文档
+     * @return 当前文件列表中的所有图片文件
      */
     private ArrayList<AttachmentFileObject> getPicFiles() {
         ArrayList<AttachmentFileObject> picFiles = new ArrayList<>();
diff --git a/app/src/main/java/net/coding/program/project/detail/AttachmentsDetailBaseActivity.java b/app/src/main/java/net/coding/program/project/detail/AttachmentsDetailBaseActivity.java
@@ -40,7 +40,7 @@
 import cz.msebera.android.httpclient.Header;
 
 /**
- * 展示某一项目文档目录下面文件的BsseActivity
+ * 展示某一项目文件目录下面文件的BsseActivity
  * Created by yangzhen
  */
 @EActivity
diff --git a/app/src/main/java/net/coding/program/project/detail/AttachmentsFolderSelectorActivity.java b/app/src/main/java/net/coding/program/project/detail/AttachmentsFolderSelectorActivity.java
@@ -41,7 +41,7 @@
 import java.util.regex.Pattern;
 
 /**
- * 在文档做移动操作时，选择文档目录的Activity
+ * 在文件做移动操作时，选择文件目录的Activity
  * Created by yangzhen
  */
 @EActivity(R.layout.activity_attachments_folder_selector)
diff --git a/app/src/main/java/net/coding/program/project/detail/AttachmentsHtmlDetailActivity.java b/app/src/main/java/net/coding/program/project/detail/AttachmentsHtmlDetailActivity.java
@@ -35,7 +35,7 @@
 import java.io.InputStream;
 
 /**
- * 展示某一项目文档目录下面HTML文件和Markdown类型文件的Activity
+ * 展示某一项目文件目录下面HTML文件和Markdown类型文件的Activity
  * HTML文件就纯展示
  * Markdown文件拿到生成的HTML代码之后，使用了从网页版Coding中扒来的css样式,直接写在markdown-html模板里
  * Created by yangzhen
diff --git a/app/src/main/java/net/coding/program/project/detail/AttachmentsPicDetailActivity.java b/app/src/main/java/net/coding/program/project/detail/AttachmentsPicDetailActivity.java
@@ -47,7 +47,7 @@
 import cz.msebera.android.httpclient.Header;
 
 /**
- * 展示某一项目文档目录下面图片文件的Activity
+ * 展示某一项目文件目录下面图片文件的Activity
  * Created by yangzhen
  */
 @EActivity(R.layout.activity_attachments_image)
diff --git a/app/src/main/java/net/coding/program/project/detail/AttachmentsTextDetailActivity.java b/app/src/main/java/net/coding/program/project/detail/AttachmentsTextDetailActivity.java
@@ -23,7 +23,7 @@
 import org.json.JSONObject;
 
 /**
- * 展示某一项目文档目录下面TXT文件的Activity
+ * 展示某一项目文件目录下面TXT文件的Activity
  * Created by yangzhen
  */
 @EActivity(R.layout.activity_attachments_text)
diff --git a/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java b/app/src/main/java/net/coding/program/project/detail/ProjectActivity.java
@@ -149,7 +149,7 @@ private void initData() {
             spinnerFragments.add(insertPos, ProjectTaskFragment_.class);
             project_activity_action_list.add(insertPos, "项目任务");
 
-            // 私有项目添加项目文档
+            // 私有项目添加项目文件
             final int insertAttPos = 3;
             spinnerIcons.add(insertAttPos, R.drawable.ic_spinner_attachment);
             spinnerFragments.add(insertAttPos, ProjectAttachmentFragment_.class);
diff --git a/app/src/main/java/net/coding/program/search/SearchFramgentAdapter.java b/app/src/main/java/net/coding/program/search/SearchFramgentAdapter.java
@@ -11,7 +11,7 @@
 public class SearchFramgentAdapter extends FragmentStatePagerAdapter {
 
 
-    private static final String[] TITLES = {"项目", "任务", "讨论", "冒泡", "文档", "用户", "合并请求", "pull请求"};
+    private static final String[] TITLES = {"项目", "任务", "讨论", "冒泡", "文件", "用户", "合并请求", "pull请求"};
     private static final String[] tab = {"projects", "tasks", "project_topics", "tweets", "files", "friends", "merge_requests", "pull_requests"};
     private String key;
 
diff --git a/app/src/main/java/net/coding/program/search/SearchProjectActivity.java b/app/src/main/java/net/coding/program/search/SearchProjectActivity.java
@@ -20,6 +20,7 @@
 import android.widget.TextView;
 
 import net.coding.program.R;
+import net.coding.program.common.Global;
 import net.coding.program.common.SearchProjectCache;
 import net.coding.program.common.adapter.SearchHistoryListAdapter;
 import net.coding.program.common.ui.BaseActivity;
@@ -34,7 +35,7 @@
 import java.util.List;
 
 @EActivity(R.layout.activity_search_project)
-public class SearchProjectActivity extends BaseActivity implements TextView.OnEditorActionListener, TextWatcher, View.OnClickListener, AdapterView.OnItemClickListener {
+public class SearchProjectActivity extends BaseActivity implements TextView.OnEditorActionListener, TextWatcher, AdapterView.OnItemClickListener {
 
     private static final String TAG = SearchProjectActivity.class.getSimpleName();
     @ViewById
@@ -66,7 +67,11 @@ public class SearchProjectActivity extends BaseActivity implements TextView.OnEd
     void init() {
         imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         btnCancel = (Button) this.findViewById(R.id.btnCancel);
-        btnCancel.setOnClickListener(this);
+        btnCancel.setOnClickListener(v -> {
+            Global.popSoftkeyboard(this, editText, false);
+            onBackPressed();
+        });
+
         editText = (EditText) this.findViewById(R.id.editText);
         final int pageMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 4, getResources()
                 .getDisplayMetrics());
@@ -118,7 +123,11 @@ private void setTabsValue() {
     private void initSearchFooterView() {
         View footerView = LayoutInflater.from(this).inflate(R.layout.subject_search_history_list_footer, null);
         mSearchFooterClearAllView = (TextView) footerView.findViewById(R.id.subject_search_hot_footer_clear);
-        mSearchFooterClearAllView.setOnClickListener(mOnClickListener);
+        mSearchFooterClearAllView.setOnClickListener(v -> {
+            SearchProjectCache.getInstance(SearchProjectActivity.this).clearCache();
+            loadSearchCache();
+        });
+
         mSearchFooterDivider = footerView.findViewById(R.id.subject_search_hot_footer_divider);
         mSearchFooterDivider.setVisibility(View.GONE);
         emptyListView.addFooterView(footerView, null, false);
@@ -174,28 +183,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         search(mSearchHistoryList.get(position));
     }
 
-    private View.OnClickListener mOnClickListener = new View.OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.subject_search_hot_footer_clear:
-                    SearchProjectCache.getInstance(SearchProjectActivity.this).clearCache();
-                    loadSearchCache();
-                    break;
-            }
-        }
-    };
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btnCancel:
-                onBackPressed();
-                break;
-        }
-    }
-
     @Override
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
         if (actionId == EditorInfo.IME_ACTION_SEARCH) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_activity_task_add">添加任务</string>
     <string name="title_activity_members">项目成员列表</string>
     <string name="title_activity_watcher_list">关注者列表</string>
-    <string name="title_activity_attachment">项目文档列表</string>
+    <string name="title_activity_attachment">项目文件列表</string>
     <string name="title_activity_test">TestActivity</string>
     <string name="title_activity_setting">设置</string>
     <string name="title_activity_my_created">我创建的</string>
diff --git a/app/src/main/res/values/strings_array.xml b/app/src/main/res/values/strings_array.xml
@@ -73,7 +73,7 @@
         <item>全部</item>
         <item>任务</item>
         <item>讨论</item>
-        <item>文档</item>
+        <item>文件</item>
         <item>代码</item>
         <item>其它</item>
     </string-array>
