Merge pull request #680 from SUPERCILEX/patch-1

Fixup db README

Author: samtstern

database/README.md

@@ -1,6 +1,6 @@
 # FirebaseUI Database
 
-## Using FirebaseUI to populate a `RecyclerView`
+## Using FirebaseUI to populate a [`RecyclerView`](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.html)
 
 To use the FirebaseUI to display Firebase data, we need a few things:
 
@@ -113,6 +113,25 @@ protected void onCreate(Bundle savedInstanceState) {
 }
 ```
 
+There's nothing magical going on here; we're just mapping numeric IDs and casts into a nice, type-safe contract.
+
+### Connect to Firebase
+
+First we'll set up a reference to the database of chat messages:
+
+```java
+@Override
+protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_main);
+
+    RecyclerView messages = (RecyclerView) findViewById(R.id.messages);
+    messages.setLayoutManager(new LinearLayoutManager(this));
+
+    DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
+}
+```
+
 ### Create a custom ViewHolder
 
 A ViewHolder is similar to container of a ViewGroup that allows simple lookup of the sub-views of the group.
@@ -122,43 +141,24 @@ We can wrap that in a ViewHolder with:
 ```java
 public static class ChatHolder extends RecyclerView.ViewHolder {
     private final TextView mNameField;
-    private final TextView mTextField;
+    private final TextView mMessageField;
 
     public ChatHolder(View itemView) {
         super(itemView);
         mNameField = (TextView) itemView.findViewById(android.R.id.text1);
-        mTextField = (TextView) itemView.findViewById(android.R.id.text2);
+        mMessageField = (TextView) itemView.findViewById(android.R.id.text2);
     }
 
     public void setName(String name) {
         mNameField.setText(name);
     }
 
-    public void setText(String text) {
-        mTextField.setText(text);
+    public void setMessage(String message) {
+        mMessageField.setText(message);
     }
 }
 ```
 
-There's nothing magical going on here; we're just mapping numeric IDs and casts into a nice, type-safe contract.
-
-### Connect to Firebase
-
-First we'll set up a reference to the database of chat messages:
-
-```java
-@Override
-protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_main);
-
-    RecyclerView messages = (RecyclerView) findViewById(R.id.messages);
-    messages.setLayoutManager(new LinearLayoutManager(this));
-
-    DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
-}
-```
-
 ### Create custom FirebaseRecyclerAdapter subclass
 
 Next, we need to create a subclass of the `FirebaseRecyclerAdapter` with the correct parameters
@@ -177,13 +177,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     mAdapter = new FirebaseRecyclerAdapter<Chat, ChatHolder>(
             Chat.class,
-            ChatHolder.class,
             R.layout.message,
+            ChatHolder.class,
             ref) {
         @Override
         public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
             holder.setName(chat.getName());
-            holder.setText(chat.getMessage());
+            holder.setMessage(chat.getMessage());
         }
     };
 
@@ -235,13 +235,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     mAdapter = new FirebaseRecyclerAdapter<Chat, ChatHolder>(
             Chat.class,
-            ChatHolder.class,
             R.layout.message,
+            ChatHolder.class,
             ref) {
         @Override
         public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
             holder.setName(chat.getName());
-            holder.setText(chat.getMessage());
+            holder.setMessage(chat.getMessage());
         }
     };