修改Blocks，加入Title和Favorite

Author: AllenTom

app/src/main/kotlin/com/rayfantasy/icode/ui/activity/BlocksActivity.kt

@@ -28,8 +28,6 @@ class BlocksActivity : ActivityBindingStatus() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         codeGood = intent.getSerializableExtra("codeGood") as CodeGood
         title = codeGood.title
-
-        toolbar.subtitle = codeGood.subtitle
         with(recyclerView) {
             layoutManager = LinearLayoutManager(this@BlocksActivity)
             itemAnimator = RefactoredDefaultItemAnimator()

app/src/main/kotlin/com/rayfantasy/icode/ui/adapter/BlockAdapter.kt

@@ -4,8 +4,10 @@ import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
+import com.bumptech.glide.Glide
 import com.rayfantasy.icode.R
 import com.rayfantasy.icode.extension.inflate
+import com.rayfantasy.icode.extension.loadPortrait
 import com.rayfantasy.icode.postutil.bean.CodeGood
 import com.rayfantasy.icode.ui.fragment.SettingFragment
 import kotlinx.android.synthetic.main.item_block_favorite.view.*
@@ -20,34 +22,44 @@ class BlockAdapter(ctx: Context, val  codeGood: CodeGood, var blocks: List<CodeG
     private val FAVORITE_VIEW = 999
     private val highlightTheme = ctx.defaultSharedPreferences.getString(SettingFragment.PREF_HIGHLIGHT, SettingFragment.DEFAULT_HIGHLIGHT)
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder?, position: Int) {
-        val block = blocks[position]
         when (holder) {
             is CodeViewHolder -> {
+                val block = blocks[position - 1]
                 val configure = holder.highlight.configure
                 configure.mLanguage = block.extra
                 holder.highlight.loadFromConfigure(configure)
                 holder.highlight.setSource(block.content)
             }
-            is TextViewHolder -> holder.content.text = block.content
+            is TextViewHolder -> {
+                val block = blocks[position - 1]
+                holder.content.text = block.content
+            }
             is TitleViewHolder -> {
                 holder.username.text = codeGood.username
                 holder.subtitle.text = codeGood.subtitle
+                holder.user_icon.loadPortrait(codeGood.username)
+
             }
+            is FavoriteViewHolder ->{}
+
         }
 
     }
 
-    override fun getItemCount() = blocks.size
+    override fun getItemCount() = blocks.size + 2
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when (viewType) {
         CodeGood.BlockType.CODE -> CodeViewHolder(parent.inflate(R.layout.item_block_code) as ViewGroup, highlightTheme)
         TITLE_VIEW -> TitleViewHolder(parent.inflate(R.layout.item_block_title))
         FAVORITE_VIEW -> FavoriteViewHolder(parent.inflate(R.layout.item_block_favorite))
-        else -> TextViewHolder(parent.inflate(R.layout.item_block_text))
+        CodeGood.BlockType.TEXT -> TextViewHolder(parent.inflate(R.layout.item_block_text))
+        else -> FavoriteViewHolder(parent.inflate(R.layout.item_block_favorite))
 
     }
 
-    override fun getItemViewType(position: Int) = blocks[position].blockType
+    override fun getItemViewType(position: Int) = if (position == 0) TITLE_VIEW else if (position == blocks.size+1) FAVORITE_VIEW else {
+        blocks[position - 1].blockType
+    }
 
     class TextViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val content = itemView.tv_text
@@ -70,11 +82,10 @@ class BlockAdapter(ctx: Context, val  codeGood: CodeGood, var blocks: List<CodeG
     class TitleViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val username = itemView.block_username
         val subtitle = itemView.block_sub_title
-        val usericon = itemView.block_userIcon
+        val user_icon = itemView.block_userIcon
     }
 
     class FavoriteViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val favorite = itemView.favo_btn
-        val favo_count = itemView.favo_count
     }
 }

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

@@ -7,39 +7,25 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/add_code_favorite"
+            android:textColor="#000"
+            android:textSize="20dp"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true" />
+
         <com.like.LikeButton
                 app:icon_type="heart"
-                app:icon_size="30dp"
+                app:icon_size="24dp"
                 android:id="@+id/favo_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true">
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
 
         </com.like.LikeButton>
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="+999"
-                android:id="@+id/favo_count"
-                android:gravity="center"
-                android:textColor="#fff"
-                android:layout_alignParentTop="true"
-                android:layout_alignRight="@+id/favo_btn"
-                android:layout_alignEnd="@+id/favo_btn"
-                android:layout_marginTop="30dp"
-                android:layout_marginRight="28dp"/>
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/add_code_favorite"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:textColor="#000"
-                android:layout_marginLeft="70dp"
-                android:layout_marginStart="70dp"
-                android:textSize="20dp"/>
     </RelativeLayout>
 </android.support.v7.widget.CardView>