Apply convention to UserShowPostsView

Author: akirasosa

app/src/androidTest/kotlin/com/hana053/micropost/pages/main/MainActivityTest.kt

@@ -71,7 +71,7 @@ class MainActivityTest : InjectableTest by InjectableTestImpl() {
         activityRule.launchActivity(null)
 
         onView(withId(R.id.list_post))
-            .check(matches(atPositionOnView(0, withText("my test content"), R.id.content)))
+            .check(matches(atPositionOnView(0, withText("my test content"), R.id.tv_post_content)))
     }
 
     @Test
@@ -94,9 +94,9 @@ class MainActivityTest : InjectableTest by InjectableTestImpl() {
         onView(withId(R.id.swipe_refresh)).perform(swipeDown())
 
         onView(withId(R.id.list_post))
-            .check(matches(atPositionOnView(0, withText("my new content"), R.id.content)))
+            .check(matches(atPositionOnView(0, withText("my new content"), R.id.tv_post_content)))
         onView(withId(R.id.list_post))
-            .check(matches(atPositionOnView(1, withText("my test content"), R.id.content)))
+            .check(matches(atPositionOnView(1, withText("my test content"), R.id.tv_post_content)))
     }
 
     @Test
@@ -118,9 +118,9 @@ class MainActivityTest : InjectableTest by InjectableTestImpl() {
         activityRule.launchActivity(null)
 
         onView(withId(R.id.list_post))
-            .check(matches(atPositionOnView(0, withText("my test content"), R.id.content)))
+            .check(matches(atPositionOnView(0, withText("my test content"), R.id.tv_post_content)))
         onView(withId(R.id.list_post))
-            .check(matches(atPositionOnView(1, withText("my old content"), R.id.content)))
+            .check(matches(atPositionOnView(1, withText("my old content"), R.id.tv_post_content)))
     }
 
     @Test
@@ -139,7 +139,7 @@ class MainActivityTest : InjectableTest by InjectableTestImpl() {
         }
 
         activityRule.launchActivity(null)
-        onView(withId(R.id.avatar)).perform(click())
+        onView(withId(R.id.img_avatar)).perform(click())
 
         verify(navigator).navigateToUserShow(1)
     }

app/src/androidTest/kotlin/com/hana053/micropost/pages/usershow/UserShowActivityTest.kt

@@ -4,7 +4,8 @@ import android.content.Intent
 import android.support.test.espresso.Espresso.onView
 import android.support.test.espresso.action.ViewActions.click
 import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.*
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.filters.LargeTest
 import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
@@ -147,8 +148,8 @@ class UserShowActivityTest : InjectableTest by InjectableTestImpl() {
 
         launchActivityWithUserId(1)
 
-        onView(withId(R.id.postRecyclerView))
-            .check(matches(atPositionOnView(0, withText("my test content"), R.id.content)))
+        onView(withId(R.id.list_post))
+            .check(matches(atPositionOnView(0, withText("my test content"), R.id.tv_post_content)))
     }
 
     private fun launchActivityWithUserId(userId: Long) {

app/src/main/kotlin/com/hana053/micropost/pages/usershow/posts/UserShowPostsView.kt

@@ -12,10 +12,10 @@ class UserShowPostsView(
     postListAdapter: PostListAdapter
 ) : ViewWrapper {
 
-    private val postRecyclerView = content.postRecyclerView
+    private val listPost = content.list_post
 
     init {
-        with(postRecyclerView) {
+        with(listPost) {
             layoutManager = LinearLayoutManager(context())
             adapter = postListAdapter
             isNestedScrollingEnabled = false

app/src/main/kotlin/com/hana053/micropost/shared/posts/PostListAdapter.kt

@@ -24,10 +24,10 @@ class PostListAdapter(
 
     class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         val container: LinearLayout = view.container
-        val avatar: ImageView = view.avatar
-        val userName: TextView = view.userName
-        val createdAt: RelativeTimeTextView = view.createdAt
-        val content: TextView = view.content
+        val avatar: ImageView = view.img_avatar
+        val userName: TextView = view.tv_post_user_name
+        val createdAt: RelativeTimeTextView = view.tv_post_created_at
+        val content: TextView = view.tv_post_content
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
@@ -48,7 +48,6 @@ class PostListAdapter(
                 avatarClicksSubject.onNext(item.user)
             }
         }
-
     }
 
     override fun getItemCount(): Int = posts.size

app/src/main/res/layout/_user_posts.xml

@@ -8,7 +8,7 @@
     android:elevation="2dp">
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/postRecyclerView"
+        android:id="@+id/list_post"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"

app/src/main/res/layout/item_posts.xml

@@ -13,7 +13,7 @@
     android:paddingTop="@dimen/margin_small">
 
     <ImageView
-        android:id="@+id/avatar"
+        android:id="@+id/img_avatar"
         android:layout_width="@dimen/avatar_size_medium"
         android:layout_height="@dimen/avatar_size_medium"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
@@ -25,22 +25,22 @@
         android:layout_height="wrap_content">
 
         <TextView
-            android:id="@+id/userName"
+            android:id="@+id/tv_post_user_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textStyle="bold"/>
 
         <com.github.curioustechizen.ago.RelativeTimeTextView
-            android:id="@+id/createdAt"
+            android:id="@+id/tv_post_created_at"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             tools:ignore="RelativeOverlap"/>
 
         <TextView
-            android:id="@+id/content"
+            android:id="@+id/tv_post_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/userName"/>
+            android:layout_below="@id/tv_post_user_name"/>
     </RelativeLayout>
 </LinearLayout>