修复头像加载，去除收藏

Author: AllenTom

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

@@ -23,6 +23,9 @@ import org.jetbrains.anko.support.v4.onRefresh
 import org.jetbrains.anko.toast
 
 class ReplyActivity : ActivityBindingStatus() {
+    companion object{
+        const val LOAD_ONCE = 5
+    }
     private var id: Int = 1
     private lateinit var adapter: ReplyListAdapter
     private val isRefreshing: Boolean
@@ -83,7 +86,7 @@ class ReplyActivity : ActivityBindingStatus() {
         //生成加载条件，目前加载5个，方便测试
 
         val condition = "WHERE ${if (!refresh && adapter.replyList.isNotEmpty()) "createat < ${adapter.replyList.last().createAt} " else ""}good_id=$id " +
-                "ORDER BY createat DESC LIMIT 0, 5"
+                "ORDER BY createat DESC LIMIT 0, $LOAD_ONCE"
         request = PostUtil.findReply(condition, {
             reply_swip.isRefreshing = false
             request = null

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

@@ -46,7 +46,7 @@ class BlockAdapter(ctx: Context, val  codeGood: CodeGood, var blocks: List<CodeG
 
     }
 
-    override fun getItemCount() = blocks.size + 2
+    override fun getItemCount() = blocks.size + 1
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when (viewType) {
         CodeGood.BlockType.CODE -> CodeViewHolder(parent.inflate(R.layout.item_block_code) as ViewGroup, highlightTheme)
@@ -57,7 +57,7 @@ class BlockAdapter(ctx: Context, val  codeGood: CodeGood, var blocks: List<CodeG
 
     }
 
-    override fun getItemViewType(position: Int) = if (position == 0) TITLE_VIEW else if (position == blocks.size+1) FAVORITE_VIEW else {
+    override fun getItemViewType(position: Int) = if (position == 0) TITLE_VIEW/* else if (position == blocks.size+1) FAVORITE_VIEW */else {
         blocks[position - 1].blockType
     }
 

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

@@ -5,8 +5,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
         <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/profile_pic_size"
+                android:layout_height="@dimen/profile_pic_size"
                 android:src="@mipmap/ic_user_black"
                 android:id="@+id/block_userIcon"
                 android:layout_marginLeft="10dp"