Made necessary renamings for transition

app/src/main/java/com/sirekanyan/knigopis/feature/notes/NoteViewHolder.kt

@@ -29,7 +29,7 @@ class NoteViewHolder(
         userNotes.text = model.noteContent
         userDate.text = model.noteDate
         userNickname.text = model.userName
-        userSmallAvatar.setCircleImage(model.userImage)
+        userImage.setCircleImage(model.userImage)
     }
 
 }

app/src/main/java/com/sirekanyan/knigopis/feature/user/UserActivity.kt

@@ -41,6 +41,7 @@ class UserActivity : BaseActivity() {
     private val dialogs by inject<DialogFactory>(parameters = createParameters())
     private val userId by lazy { intent.getStringExtra(EXTRA_USER_ID) }
     private val userName by lazy { intent.getStringExtra(EXTRA_USER_NAME) }
+    private val userPhoto by lazy { intent.getStringExtra(EXTRA_USER_PHOTO) }
     private val booksAdapter = UserBooksAdapter(::onBookLongClicked)
     private lateinit var unsubscribeOption: MenuItem
 
@@ -51,11 +52,8 @@ class UserActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.user_activity)
         toolbar.title = userName
-        toolbarImage.setCircleImage(
-            intent.getStringExtra(EXTRA_USER_PHOTO),
-            R.drawable.oval_dark_placeholder_background
-        )
-        toolbarImage.setElevationRes(R.dimen.image_view_elevation)
+        userImage.setCircleImage(userPhoto, R.drawable.oval_dark_placeholder_background)
+        userImage.setElevationRes(R.dimen.image_view_elevation)
         setSupportActionBar(toolbar)
         fab.setOnClickListener { view ->
             interactor.addFriend(userId)

app/src/main/java/com/sirekanyan/knigopis/feature/users/UserViewHolder.kt

@@ -29,7 +29,7 @@ class UserViewHolder(
     }
 
     override fun onBind(position: Int, model: UserModel) {
-        userAvatar.setCircleImage(model.image)
+        userImage.setCircleImage(model.image)
         userNickname.text = model.name
         totalBooksCount.text = model.booksCount
         newBooksCount.text = model.newBooksCount

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

@@ -81,7 +81,7 @@
                 tools:text="Павел Дуров" />
 
             <ImageView
-                android:id="@+id/userSmallAvatar"
+                android:id="@+id/userImage"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_marginLeft="8dp"

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

@@ -8,7 +8,7 @@
     android:paddingStart="16dp">
 
     <ImageView
-        android:id="@+id/userAvatar"
+        android:id="@+id/userImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"

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

@@ -37,7 +37,7 @@
     </android.support.design.widget.AppBarLayout>
 
     <ImageView
-        android:id="@+id/toolbarImage"
+        android:id="@+id/userImage"
         android:layout_width="@dimen/avatar_size_expanded"
         android:layout_height="@dimen/avatar_size_expanded"
         android:layout_marginLeft="16dp"