version 1.02 test

YuanWenHai · Nov 2, 2016 · 04d59e9 · 04d59e9
1 parent 5e35759
commit 04d59e9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/filesearcher/src/main/java/com/will/filesearcher/file_searcher/FSAdapter.java b/filesearcher/src/main/java/com/will/filesearcher/file_searcher/FSAdapter.java
@@ -86,8 +86,8 @@ class FSViewHolder extends RecyclerView.ViewHolder{
         CheckBox checkBox;
         FSViewHolder(View view){
             super(view);
-            text = (TextView) view.findViewById(R.id.item_text);
-            checkBox = (CheckBox) view.findViewById(R.id.item_check_box);
+            text = (TextView) view.findViewById(R.id.file_searcher_item_text);
+            checkBox = (CheckBox) view.findViewById(R.id.file_searcher_item_check_box);
             text.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {

diff --git a/filesearcher/src/main/java/com/will/filesearcher/file_searcher/FileSearcherActivity.java b/filesearcher/src/main/java/com/will/filesearcher/file_searcher/FileSearcherActivity.java
@@ -31,8 +31,8 @@ public class FileSearcherActivity extends AppCompatActivity {
     protected void onCreate( Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.file_searcher_main);
-        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.main_recycler_view);
-        TextView text = (TextView) findViewById(R.id.main_text);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.file_searcher_main_recycler_view);
+        TextView text = (TextView) findViewById(R.id.file_searcher_main_text);
         mAdapter = new FSAdapter(this,text);
         recyclerView.setAdapter(mAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));

diff --git a/filesearcher/src/main/res/layout/file_searcher_item.xml b/filesearcher/src/main/res/layout/file_searcher_item.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <TextView
-            android:id="@+id/item_text"
+            android:id="@+id/file_searcher_item_text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -18,7 +18,7 @@
             android:textColor="@color/black"
             tools:text="abcde.text"/>
         <CheckBox
-            android:id="@+id/item_check_box"
+            android:id="@+id/file_searcher_item_check_box"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"/>

diff --git a/filesearcher/src/main/res/layout/file_searcher_main.xml b/filesearcher/src/main/res/layout/file_searcher_main.xml
@@ -12,23 +12,22 @@
     <android.support.v7.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:id="@+id/main_toolbar"
+        android:id="@+id/file_searcher_main_toolbar"
         app:contentInsetStart="0dp"
         android:background="?attr/colorPrimary">
         <TextView
-            android:id="@+id/main_text"
+            android:id="@+id/file_searcher_main_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-
             android:maxLines="1"
-            android:textColor="#ffffff"
+            android:textColor="?attr/actionMenuTextColor"
             android:textSize="18sp"
             tools:text="正在搜索目录: abcde"/>
     </android.support.v7.widget.Toolbar>
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/main_recycler_view"
+        android:id="@+id/file_searcher_main_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollbars="vertical"/>

diff --git a/filesearcher/src/main/res/values/colors.xml → filesearcher/src/main/res/values/color.xml b/filesearcher/src/main/res/values/colors.xml → filesearcher/src/main/res/values/color.xml
@@ -4,4 +4,5 @@
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
     <color name="black">#333333</color>
+    <color name="white">#ffffff</color>
 </resources>
diff --git a/filesearcher/src/main/res/values/styles.xml b/filesearcher/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowTranslucentStatus">true</item>
+        <item name="actionMenuTextColor">@color/white</item>
     </style>
 
 </resources>