improved conversation info ui

twidere/src/main/kotlin/org/mariotaku/twidere/extension/DefaultFeaturesExtensions.kt

@@ -0,0 +1,34 @@
+/*
+ *             Twidere - Twitter client for Android
+ *
+ *  Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mariotaku.twidere.extension
+
+import org.mariotaku.twidere.model.DefaultFeatures
+import org.mariotaku.twidere.model.ParcelableMessageConversation
+
+/**
+ * Created by mariotaku on 2017/2/26.
+ */
+fun DefaultFeatures.getDirectMessageMaxParticipants(extrasType: String?): Long {
+    when (extrasType) {
+        ParcelableMessageConversation.ExtrasType.TWITTER_OFFICIAL -> return twitterDirectMessageMaxParticipants
+    }
+    return 2
+}
+

twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt

@@ -23,6 +23,7 @@ import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.content.Intent
+import android.graphics.Rect
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentActivity
@@ -56,6 +57,7 @@ import org.mariotaku.twidere.constant.IntentConstants.*
 import org.mariotaku.twidere.constant.nameFirstKey
 import org.mariotaku.twidere.constant.profileImageStyleKey
 import org.mariotaku.twidere.extension.applyTheme
+import org.mariotaku.twidere.extension.getDirectMessageMaxParticipants
 import org.mariotaku.twidere.extension.model.displayAvatarTo
 import org.mariotaku.twidere.extension.model.getSubtitle
 import org.mariotaku.twidere.extension.model.getTitle
@@ -65,8 +67,8 @@ import org.mariotaku.twidere.fragment.BaseDialogFragment
 import org.mariotaku.twidere.fragment.BaseFragment
 import org.mariotaku.twidere.fragment.ProgressDialogFragment
 import org.mariotaku.twidere.fragment.iface.IToolBarSupportFragment
+import org.mariotaku.twidere.fragment.message.MessageConversationInfoFragment.ConversationInfoAdapter.Companion.VIEW_TYPE_BOTTOM_SPACE
 import org.mariotaku.twidere.fragment.message.MessageConversationInfoFragment.ConversationInfoAdapter.Companion.VIEW_TYPE_HEADER
-import org.mariotaku.twidere.fragment.message.MessageConversationInfoFragment.ConversationInfoAdapter.Companion.VIEW_TYPE_SPACE
 import org.mariotaku.twidere.model.*
 import org.mariotaku.twidere.model.ParcelableMessageConversation.ConversationType
 import org.mariotaku.twidere.model.ParcelableMessageConversation.ExtrasType
@@ -89,6 +91,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
     private val conversationId: String get() = arguments.getString(EXTRA_CONVERSATION_ID)
 
     private lateinit var adapter: ConversationInfoAdapter
+    private lateinit var itemDecoration: ConversationInfoDecoration
 
     override val controlBarHeight: Int get() = toolbar.measuredHeight
     override var controlBarOffset: Float = 0f
@@ -126,8 +129,13 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             }
 
         }
+        itemDecoration = ConversationInfoDecoration(adapter,
+                resources.getDimensionPixelSize(R.dimen.element_spacing_large)
+        )
+
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LayoutManager(context)
+        recyclerView.addItemDecoration(itemDecoration)
 
 
         val profileImageStyle = preferences[profileImageStyleKey]
@@ -202,7 +210,6 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             activity?.finish()
             return
         }
-        adapter.conversation = data
 
         val name = data.getTitle(context, userColorNameManager, preferences[nameFirstKey]).first
         val summary = data.getSubtitle(context)
@@ -221,6 +228,16 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             appBarSubtitle.visibility = View.GONE
             conversationSubtitle.visibility = View.GONE
         }
+        if (data.conversation_extras_type == ExtrasType.TWITTER_OFFICIAL
+                && data.conversation_type == ConversationType.GROUP) {
+            editButton.visibility = View.VISIBLE
+            adapter.showButtonSpace = true
+        } else {
+            editButton.visibility = View.GONE
+            adapter.showButtonSpace = false
+        }
+
+        adapter.conversation = data
     }
 
     private fun performDestroyConversation() {
@@ -266,6 +283,20 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
     }
 
 
+    private fun openEditAction(type: String) {
+        when (type) {
+            "name" -> {
+                executeAfterFragmentResumed { fragment ->
+                    val df = EditNameDialogFragment()
+                    df.show(fragment.childFragmentManager, "edit_name")
+                }
+            }
+            "avatar" -> {
+
+            }
+        }
+    }
+
     private inline fun dismissAlertDialogThen(tag: String, crossinline action: BaseFragment.() -> Unit) {
         executeAfterFragmentResumed { fragment ->
             val df = fragment.childFragmentManager.findFragmentByTag(tag) as? DialogFragment
@@ -278,6 +309,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             context: Context,
             val accountKey: UserKey,
             val conversationId: String) : AsyncTaskLoader<ParcelableMessageConversation?>(context) {
+
         override fun loadInBackground(): ParcelableMessageConversation? {
             val where = Expression.and(Expression.equalsArgs(Conversations.ACCOUNT_KEY),
                     Expression.equalsArgs(Conversations.CONVERSATION_ID)).sql
@@ -294,12 +326,14 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
         override fun onStartLoading() {
             forceLoad()
         }
+
     }
 
     class ConversationInfoAdapter(context: Context) : BaseRecyclerViewAdapter<RecyclerView.ViewHolder>(context),
             IItemCountsAdapter {
         private val inflater = LayoutInflater.from(context)
-        override val itemCounts: ItemCounts = ItemCounts(4)
+
+        override val itemCounts: ItemCounts = ItemCounts(5)
 
         var listener: Listener? = null
 
@@ -309,6 +343,13 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
                 notifyDataSetChanged()
             }
 
+        var showButtonSpace: Boolean = false
+            set(value) {
+                field = value
+                notifyDataSetChanged()
+            }
+
+
         init {
             setHasStableIds(true)
         }
@@ -316,6 +357,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
         override fun getItemCount(): Int {
             val conversation = this.conversation ?: return 0
             val participantsSize = conversation.participants.size
+            itemCounts[ITEM_INDEX_TOP_SPACE] = if (showButtonSpace) 1 else 0
             itemCounts[ITEM_INDEX_HEADER] = 1
             itemCounts[ITEM_INDEX_ITEM] = participantsSize
             when (conversation.conversation_type) {
@@ -350,6 +392,10 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
             when (viewType) {
+                VIEW_TYPE_TOP_SPACE -> {
+                    val view = inflater.inflate(R.layout.header_message_conversation_info_button_space, parent, false)
+                    return SpaceViewHolder(view)
+                }
                 VIEW_TYPE_HEADER -> {
                     val view = inflater.inflate(HeaderViewHolder.layoutResource, parent, false)
                     return HeaderViewHolder(view, this)
@@ -362,7 +408,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
                     val view = inflater.inflate(R.layout.list_item_conversation_info_add_user, parent, false)
                     return AddUserViewHolder(view, this)
                 }
-                VIEW_TYPE_SPACE -> {
+                VIEW_TYPE_BOTTOM_SPACE -> {
                     val view = inflater.inflate(R.layout.list_item_conversation_info_space, parent, false)
                     return SpaceViewHolder(view)
                 }
@@ -372,10 +418,11 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
 
         override fun getItemViewType(position: Int): Int {
             when (itemCounts.getItemCountIndex(position)) {
+                ITEM_INDEX_TOP_SPACE -> return VIEW_TYPE_TOP_SPACE
                 ITEM_INDEX_HEADER -> return VIEW_TYPE_HEADER
                 ITEM_INDEX_ITEM -> return VIEW_TYPE_USER
                 ITEM_INDEX_ADD_USER -> return VIEW_TYPE_ADD_USER
-                ITEM_INDEX_SPACE -> return VIEW_TYPE_SPACE
+                ITEM_INDEX_SPACE -> return VIEW_TYPE_BOTTOM_SPACE
             }
             throw UnsupportedOperationException()
         }
@@ -401,26 +448,29 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             fun onUserClick(position: Int) {}
             fun onAddUserClick(position: Int) {}
             fun onDisableNotificationChanged(disabled: Boolean) {}
+
         }
 
         companion object {
-            private const val ITEM_INDEX_HEADER = 0
+            internal const val ITEM_INDEX_TOP_SPACE = 0
-            private const val ITEM_INDEX_ITEM = 1
+            internal const val ITEM_INDEX_HEADER = 1
-            private const val ITEM_INDEX_ADD_USER = 2
+            internal const val ITEM_INDEX_ITEM = 2
-            private const val ITEM_INDEX_SPACE = 3
+            internal const val ITEM_INDEX_ADD_USER = 3
+            internal const val ITEM_INDEX_SPACE = 4
 
+            internal const val VIEW_TYPE_TOP_SPACE = 0
             internal const val VIEW_TYPE_HEADER = 1
             internal const val VIEW_TYPE_USER = 2
             internal const val VIEW_TYPE_ADD_USER = 3
-            internal const val VIEW_TYPE_SPACE = 4
+            internal const val VIEW_TYPE_BOTTOM_SPACE = 4
-        }
 
+        }
 
     }
 
     internal class SpaceViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
-
     internal class AddUserViewHolder(itemView: View, adapter: ConversationInfoAdapter) : RecyclerView.ViewHolder(itemView) {
+
         private val itemContent = itemView.findViewById(R.id.itemContent)
 
         init {
@@ -436,6 +486,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             adapter: ConversationInfoAdapter
     ) : SimpleUserViewHolder<ConversationInfoAdapter>(itemView, adapter) {
         private val headerIcon = itemView.findViewById(R.id.headerIcon)
+
         private val itemContent = itemView.findViewById(R.id.itemContent)
 
         init {
@@ -448,9 +499,11 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
             super.displayUser(user)
             headerIcon.visibility = if (displayHeaderIcon) View.VISIBLE else View.INVISIBLE
         }
+
     }
 
     internal class HeaderViewHolder(itemView: View, adapter: ConversationInfoAdapter) : RecyclerView.ViewHolder(itemView) {
+
         private val muteSwitch = itemView.muteNotifications
 
         private val listener = CompoundButton.OnCheckedChangeListener { button, checked ->
@@ -466,6 +519,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
         companion object {
             const val layoutResource = R.layout.header_message_conversation_info
         }
+
     }
 
     internal class LayoutManager(
@@ -473,8 +527,8 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
     ) : FixedLinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) {
 
         override fun getDecoratedMeasuredHeight(child: View): Int {
-            if (getItemViewType(child) == VIEW_TYPE_SPACE) {
+            if (getItemViewType(child) == VIEW_TYPE_BOTTOM_SPACE) {
-                return calculateSpaceItemHeight(child, VIEW_TYPE_SPACE, VIEW_TYPE_HEADER)
+                return calculateSpaceItemHeight(child, VIEW_TYPE_BOTTOM_SPACE, VIEW_TYPE_HEADER)
             }
             return super.getDecoratedMeasuredHeight(child)
         }
@@ -482,12 +536,14 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
     }
 
     class EditInfoDialogFragment : BaseDialogFragment() {
+
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
             val actions = arrayOf(Action(getString(R.string.action_edit_conversation_name), "name"),
                     Action(getString(R.string.action_edit_conversation_avatar), "avatar"))
             val builder = AlertDialog.Builder(context)
             builder.setItems(actions.map(Action::title).toTypedArray()) { dialog, which ->
-
+                val action = actions[which]
+                (parentFragment as MessageConversationInfoFragment).openEditAction(action.type)
             }
             val dialog = builder.create()
             dialog.setOnShowListener {
@@ -498,6 +554,24 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
         }
 
         data class Action(val title: String, val type: String)
+
+    }
+
+    class EditNameDialogFragment : BaseDialogFragment() {
+        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+            val builder = AlertDialog.Builder(context)
+            builder.setView(R.layout.dialog_edit_conversation_name)
+            builder.setNegativeButton(android.R.string.cancel, null)
+            builder.setPositiveButton(android.R.string.ok) { dialog, which ->
+
+            }
+            val dialog = builder.create()
+            dialog.setOnShowListener {
+                it as AlertDialog
+                it.applyTheme()
+            }
+            return dialog
+        }
     }
 
     class DestroyConversationConfirmDialogFragment : BaseDialogFragment() {
@@ -518,15 +592,40 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment,
 
     }
 
+    internal class ConversationInfoDecoration(
+            val adapter: ConversationInfoAdapter,
+            val typeSpacing: Int
+    ) : RecyclerView.ItemDecoration() {
+
+        override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+            val position = parent.getChildLayoutPosition(view)
+            if (position < 0) return
+            val itemCounts = adapter.itemCounts
+            val countIndex = itemCounts.getItemCountIndex(position)
+            when (countIndex) {
+                ConversationInfoAdapter.ITEM_INDEX_TOP_SPACE,
+                ConversationInfoAdapter.ITEM_INDEX_SPACE,
+                ConversationInfoAdapter.ITEM_INDEX_ADD_USER -> {
+                    outRect.setEmpty()
+                }
+                else -> {
+                    // Previous item is space or first item
+                    if (position == 0 || itemCounts.getItemCountIndex(position - 1)
+                            == ConversationInfoAdapter.ITEM_INDEX_TOP_SPACE) {
+                        outRect.setEmpty()
+                    } else if (itemCounts.getItemStartPosition(countIndex) == position) {
+                        outRect.set(0, typeSpacing, 0, 0)
+                    } else {
+                        outRect.setEmpty()
+                    }
+                }
+            }
+        }
+    }
+
     companion object {
         const val RESULT_CLOSE = 101
         const val REQUEST_CONVERSATION_ADD_USER = 101
     }
-}
 
-private fun DefaultFeatures.getDirectMessageMaxParticipants(extrasType: String?): Long {
-    when (extrasType) {
-        ExtrasType.TWITTER_OFFICIAL -> return twitterDirectMessageMaxParticipants
-    }
-    return 2
 }

twidere/src/main/kotlin/org/mariotaku/twidere/util/view/AppBarChildBehavior.kt

@@ -33,7 +33,6 @@ import android.widget.TextView
 import org.mariotaku.microblog.library.annotation.NoObfuscate
 import org.mariotaku.twidere.R
 import org.mariotaku.twidere.extension.*
-import org.mariotaku.twidere.util.DebugLog
 
 /**
  * Created by mariotaku on 2017/2/20.
@@ -59,10 +58,12 @@ class AppBarChildBehavior(
 
     private val dependencyRect = Rect()
 
+    private val layoutRect = Rect()
+
     private val thisRect = Rect()
     private val targetRect = Rect()
 
-    private val tempRect = Rect()
+    private val tempLocation = IntArray(2)
 
 
     init {
@@ -94,7 +95,8 @@ class AppBarChildBehavior(
         val dependency = parent.getDependencies(child).first()
 
         dependency.getFrameRelatedTo(dependencyRect, parent)
-        child.layoutRelatedTo(parent, dependencyRect, layoutDirection)
+        layoutRect.layoutRelatedTo(child, parent, dependencyRect, layoutDirection)
+        child.layout(layoutRect.left, layoutRect.top, layoutRect.right, layoutRect.bottom)
 
         child.getFrameRelatedTo(thisRect, parent)
         target.getFrameRelatedTo(targetRect, parent)
@@ -108,38 +110,38 @@ class AppBarChildBehavior(
         val target = parent.findViewById(targetViewId)
         val toolbar = parent.findViewById(toolbarId)
         val behavior = (appBar.layoutParams as CoordinatorLayout.LayoutParams).behavior as AppBarLayout.Behavior
-        toolbar.getLocationOnScreen(tempRect)
+        toolbar.getLocationOnScreen(tempLocation)
         val offset = behavior.topAndBottomOffset
-        val percent = offset / (tempRect.bottom - appBar.height).toFloat()
+        val percent = offset / (tempLocation[1] + toolbar.height - appBar.height).toFloat()
         transformation.onTargetChanged(child, thisRect, target, targetRect, percent, offset)
         return true
     }
 
-    internal fun View.layoutRelatedTo(parent: CoordinatorLayout, frame: Rect, layoutDirection: Int) {
+    internal fun Rect.layoutRelatedTo(view: View, parent: CoordinatorLayout, frame: Rect, layoutDirection: Int) {
         val verticalRule = alignmentRule and VERTICAL_MASK
         val horizontalRule = alignmentRule and HORIZONTAL_MASK
-        tempRect.set(0, 0, measuredWidth, measuredHeight)
+        set(0, 0, view.measuredWidth, view.measuredHeight)
         when (verticalRule) {
             ALIGNMENT_CENTER_VERTICAL -> {
-                tempRect.offsetTopTo(frame.centerY() - measuredHeight / 2 + marginTop - marginBottom)
+                offsetTopTo(frame.centerY() - view.measuredHeight / 2 + marginTop - marginBottom)
             }
             0, ALIGNMENT_TOP -> {
-                tempRect.offsetTopTo(frame.top + marginTop)
+                offsetTopTo(frame.top + marginTop)
             }
             ALIGNMENT_BOTTOM -> {
-                tempRect.offsetBottomTo(frame.bottom - marginBottom)
+                offsetBottomTo(frame.bottom - marginBottom)
             }
             ALIGNMENT_ABOVE -> {
-                tempRect.offsetBottomTo(frame.top + marginTop - marginBottom)
+                offsetBottomTo(frame.top + marginTop - marginBottom)
             }
             ALIGNMENT_BELOW -> {
-                tempRect.offsetTopTo(frame.bottom + marginTop - marginBottom)
+                offsetTopTo(frame.bottom + marginTop - marginBottom)
             }
             ALIGNMENT_ABOVE_CENTER -> {
-                tempRect.offsetBottomTo(frame.centerY() + marginTop - marginBottom)
+                offsetBottomTo(frame.centerY() + marginTop - marginBottom)
             }
             ALIGNMENT_BELOW_CENTER -> {
-                tempRect.offsetTopTo(frame.centerY() + marginTop - marginBottom)
+                offsetTopTo(frame.centerY() + marginTop - marginBottom)
             }
             else -> {
                 throw IllegalArgumentException("Illegal alignment flag ${Integer.toHexString(alignmentRule)}")
@@ -147,62 +149,65 @@ class AppBarChildBehavior(
         }
         when (horizontalRule) {
             ALIGNMENT_CENTER_HORIZONTAL -> {
-                tempRect.offsetLeftTo(frame.centerX() - measuredWidth / 2
+                offsetLeftTo(frame.centerX() - view.measuredWidth / 2
                         + absoluteMarginLeft(layoutDirection) - absoluteMarginRight(layoutDirection))
             }
             0, ALIGNMENT_LEFT -> {
-                tempRect.offsetLeftTo(frame.left + absoluteMarginLeft(layoutDirection))
+                offsetLeftTo(frame.left + absoluteMarginLeft(layoutDirection))
             }
             ALIGNMENT_RIGHT -> {
-                tempRect.offsetRightTo(frame.right - absoluteMarginRight(layoutDirection))
+                offsetRightTo(frame.right - absoluteMarginRight(layoutDirection))
             }
             ALIGNMENT_TO_LEFT_OF -> {
-                tempRect.offsetRightTo(frame.left + absoluteMarginLeft(layoutDirection)
+                offsetRightTo(frame.left + absoluteMarginLeft(layoutDirection)
                         - absoluteMarginRight(layoutDirection))
             }
             ALIGNMENT_TO_RIGHT_OF -> {
-                tempRect.offsetLeftTo(frame.right + absoluteMarginLeft(layoutDirection)
+                offsetLeftTo(frame.right + absoluteMarginLeft(layoutDirection)
                         - absoluteMarginRight(layoutDirection))
             }
             ALIGNMENT_TO_LEFT_OF_CENTER -> {
-                tempRect.offsetRightTo(frame.centerX() + absoluteMarginLeft(layoutDirection)
+                offsetRightTo(frame.centerX() + absoluteMarginLeft(layoutDirection)
                         - absoluteMarginRight(layoutDirection))
             }
             ALIGNMENT_TO_RIGHT_OF_CENTER -> {
-                tempRect.offsetLeftTo(frame.centerX() + absoluteMarginLeft(layoutDirection)
+                offsetLeftTo(frame.centerX() + absoluteMarginLeft(layoutDirection)
                         - absoluteMarginRight(layoutDirection))
             }
             ALIGNMENT_START -> {
-                tempRect.offsetStartTo(frame.getStart(layoutDirection)
+                offsetStartTo(frame.getStart(layoutDirection)
                         + relativeMarginStart(layoutDirection), layoutDirection)
             }
             ALIGNMENT_END -> {
-                tempRect.offsetEndTo(frame.getEnd(layoutDirection)
+                offsetEndTo(frame.getEnd(layoutDirection)
                         - relativeMarginEnd(layoutDirection), layoutDirection)
             }
             ALIGNMENT_TO_START_OF -> {
-                tempRect.offsetEndTo(frame.getStart(layoutDirection)
+                offsetEndTo(frame.getStart(layoutDirection)
                         + relativeMarginStart(layoutDirection) - relativeMarginEnd(layoutDirection),
                         layoutDirection)
             }
             ALIGNMENT_TO_END_OF -> {
-                tempRect.offsetStartTo(frame.getEnd(layoutDirection)
+                offsetStartTo(frame.getEnd(layoutDirection)
                         + relativeMarginStart(layoutDirection) - relativeMarginEnd(layoutDirection),
                         layoutDirection)
             }
             ALIGNMENT_TO_START_OF_CENTER -> {
-                tempRect.offsetEndTo(frame.centerX() + relativeMarginStart(layoutDirection)
+                offsetEndTo(frame.centerX() + relativeMarginStart(layoutDirection)
                         - relativeMarginEnd(layoutDirection), layoutDirection)
             }
             ALIGNMENT_TO_END_OF_CENTER -> {
-                tempRect.offsetStartTo(frame.centerX() + relativeMarginStart(layoutDirection)
+                offsetStartTo(frame.centerX() + relativeMarginStart(layoutDirection)
                         - relativeMarginEnd(layoutDirection), layoutDirection)
             }
             else -> {
                 throw IllegalArgumentException("Illegal alignment flag ${Integer.toHexString(alignmentRule)}")
             }
         }
-        this.layout(tempRect.left, tempRect.top, tempRect.right, tempRect.bottom)
+        left = left.coerceAtLeast(absoluteMarginLeft(layoutDirection) - frame.left)
+        right = right.coerceAtMost(parent.measuredWidth - absoluteMarginRight(layoutDirection) - frame.left)
+//        tempRect.top = tempRect.top.coerceAtLeast(marginTop - frame.top)
+//        tempRect.bottom = tempRect.bottom.coerceAtLeast(parent.measuredHeight - marginBottom - frame.top)
     }
 
     private fun absoluteMarginLeft(layoutDirection: Int): Int {
@@ -269,7 +274,6 @@ class AppBarChildBehavior(
             child.scaleY = 1 - (frame.height() - targetFrame.height()) * percent / frame.height()
             child.translationX = (targetFrame.right - frame.right) * percent
             child.translationY = -offset - (frame.bottom - offset - targetFrame.bottom) * percent
-            DebugLog.d(msg = "bot:${frame.bottom}")
         }
 
     }

twidere/src/main/res/layout/dialog_edit_conversation_name.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~             Twidere - Twitter client for Android
+  ~
+  ~  Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
+  ~
+  ~  This program is free software: you can redistribute it and/or modify
+  ~  it under the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation, either version 3 of the License, or
+  ~  (at your option) any later version.
+  ~
+  ~  This program is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~  GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/element_spacing_large">
+
+    <org.mariotaku.twidere.view.FixedEditText
+        android:id="@+id/editName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_conversation_name"
+        android:maxLines="1"
+        app:backgroundTint="?colorAccent"/>
+
+</LinearLayout>

twidere/src/main/res/layout/fragment_messages_conversation_info.xml

@@ -78,7 +78,7 @@
 
     <org.mariotaku.twidere.view.FixedTextView
         android:id="@+id/appBarTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="8dp"
         android:ellipsize="end"
@@ -98,7 +98,7 @@
 
     <org.mariotaku.twidere.view.FixedTextView
         android:id="@+id/appBarSubtitle"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="8dp"
         android:ellipsize="end"

twidere/src/main/res/layout/header_message_conversation_info.xml

@@ -23,7 +23,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/element_spacing_large"
     app:cardBackgroundColor="?cardItemBackgroundColor"
     app:cardCornerRadius="0dp"
     app:cardElevation="1dp"
@@ -32,8 +31,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="wrap_content">
-        android:layout_marginTop="@dimen/element_size_small">
 
         <FrameLayout
             android:id="@+id/headerSpace"

twidere/src/main/res/layout/header_message_conversation_info_button_space.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~             Twidere - Twitter client for Android
+  ~
+  ~  Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
+  ~
+  ~  This program is free software: you can redistribute it and/or modify
+  ~  it under the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation, either version 3 of the License, or
+  ~  (at your option) any later version.
+  ~
+  ~  This program is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~  GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="?cardItemBackgroundColor"
+    app:cardCornerRadius="0dp"
+    app:cardElevation="1dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="false">
+
+    <android.support.v4.widget.Space
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/element_spacing_xlarge"/>
+</android.support.v7.widget.CardView>

twidere/src/main/res/values/strings.xml

@@ -1226,4 +1226,5 @@
     <string name="message_destroy_conversation_confirm">Leave this conversation?</string>
     <string name="action_edit_conversation_name">Edit name</string>
     <string name="action_edit_conversation_avatar">Edit icon</string>
+    <string name="hint_conversation_name">Conversation name</string>
 </resources>