加入fab按钮

chenyangcun · Jun 24, 2015 · c2a44a4 · c2a44a4
1 parent 36986dd
commit c2a44a4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/materia/aswifter/com/materialexample/MainActivity.java b/app/src/main/java/materia/aswifter/com/materialexample/MainActivity.java
@@ -14,8 +14,6 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.w3c.dom.Text;
-
 public class MainActivity extends AppCompatActivity {
 
     private RecyclerView mRecyclerView;
@@ -45,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mRecyclerView.setItemAnimator(new DefaultItemAnimator());
 
         // specify an adapter (see also next example)
-        myDataset = new String[]{"JAVA", "Object C", "C", "C++", "Swift",
+        myDataset = new String[]{"JAVA", "Objective-C", "C", "C++", "Swift",
                 "GO", "JavaScript", "Python", "Ruby", "HTML", "SQL"};
         mAdapter = new MyAdapter(myDataset);
         mRecyclerView.setAdapter(mAdapter);

diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite.png b/app/src/main/res/drawable-xxhdpi/ic_favorite.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,16 +9,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:background="?attr/colorPrimaryDark">
-    </android.support.v7.widget.Toolbar>
+        android:background="?attr/colorPrimaryDark"></android.support.v7.widget.Toolbar>
 
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerView"
-        android:scrollbars="vertical"
-        android:layout_below="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
+        android:layout_height="match_parent"
+        android:layout_below="@+id/toolbar"
+        android:scrollbars="none" />
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab_normal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="10dp"
+        android:src="@drawable/ic_favorite"
+        app:fabSize="normal" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_view.xml b/app/src/main/res/layout/item_view.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:minHeight="60dp"
     android:background="@drawable/item_selector"
+    android:gravity="center_vertical"
     android:orientation="vertical">
 
     <TextView