Fix several issues with new avatar picker.

* Fix silliness with text behaviour
* Fix long click behaviour
* Make views play nicer with landscape mode
* Do not show megaphone if user has an avatar (or had one and removed it)
* Fix bad heading on vector color picker

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt

@@ -160,8 +160,8 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     val menuRes = when (avatar) {
       is Avatar.Photo -> R.menu.avatar_picker_context
       is Avatar.Text -> R.menu.avatar_picker_context
-      is Avatar.Vector -> return false
-      is Avatar.Resource -> return false
+      is Avatar.Vector -> return true
+      is Avatar.Resource -> return true
     }
 
     val popup = PopupMenu(context, anchorView, Gravity.TOP)

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerItem.kt

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.avatar.picker
 
 import android.util.TypedValue
 import android.view.View
+import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
@@ -57,14 +58,17 @@ object AvatarPickerItem {
     init {
       textView.typeface = AvatarRenderer.getTypeface(context)
       textView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
-        updateAndApplyText(textView.text.toString())
+        updateFontSize(textView.text.toString())
       }
     }
 
-    private fun updateAndApplyText(text: String) {
+    private fun updateFontSize(text: String) {
       val textSize = Avatars.getTextSizeForLength(context, text, textView.measuredWidth * 0.8f, textView.measuredHeight * 0.45f)
       textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
-      textView.text = text
+
+      if (textView !is EditText) {
+        textView.text = text
+      }
     }
 
     override fun bind(model: Model) {
@@ -76,12 +80,8 @@ object AvatarPickerItem {
       selectedOverlay?.animate()?.cancel()
       selectedFader?.animate()?.cancel()
 
-      if (model.isSelected) {
-        itemView.setOnLongClickListener {
-          onAvatarLongClickListener?.invoke(itemView, model.avatar) ?: false
-        }
-      } else {
-        itemView.setOnLongClickListener(null)
+      itemView.setOnLongClickListener {
+        onAvatarLongClickListener?.invoke(itemView, model.avatar) ?: false
       }
 
       itemView.setOnClickListener { onAvatarClickListener?.invoke(model.avatar, model.isSelected) }
@@ -108,7 +108,10 @@ object AvatarPickerItem {
         is Avatar.Text -> {
           textView.visible = true
 
-          updateAndApplyText(model.avatar.text)
+          updateFontSize(model.avatar.text)
+          if (textView.text.toString() != model.avatar.text) {
+            textView.text = model.avatar.text
+          }
 
           imageView.setImageDrawable(null)
           imageView.background.colorFilter = SimpleColorFilter(model.avatar.color.backgroundColor)

app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationFragment.kt

@@ -31,12 +31,13 @@ import org.thoughtcrime.securesms.util.ViewUtil
 /**
  * Fragment to create an avatar based off of a Vector or Text (via a pager)
  */
-class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragment_hidden_recycler) {
+class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragment) {
 
   private val viewModel: TextAvatarCreationViewModel by viewModels(factoryProducer = this::createFactory)
 
   private lateinit var textInput: EditText
   private lateinit var recycler: RecyclerView
+  private lateinit var content: ConstraintLayout
 
   private val withRecyclerSet = ConstraintSet()
   private val withoutRecyclerSet = ConstraintSet()
@@ -60,9 +61,10 @@ class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragme
     val tabLayout: ControllableTabLayout = view.findViewById(R.id.text_avatar_creation_tabs)
     val doneButton: View = view.findViewById(R.id.text_avatar_creation_done)
 
-    withRecyclerSet.load(requireContext(), R.layout.text_avatar_creation_fragment)
-    withoutRecyclerSet.load(requireContext(), R.layout.text_avatar_creation_fragment_hidden_recycler)
+    withRecyclerSet.load(requireContext(), R.layout.text_avatar_creation_fragment_content)
+    withoutRecyclerSet.load(requireContext(), R.layout.text_avatar_creation_fragment_content_hidden_recycler)
 
+    content = view.findViewById(R.id.content)
     recycler = view.findViewById(R.id.text_avatar_creation_recycler)
     textInput = view.findViewById(R.id.avatar_picker_item_text)
 
@@ -83,19 +85,7 @@ class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragme
     val viewHolder = AvatarPickerItem.ViewHolder(view)
     viewModel.state.observe(viewLifecycleOwner) { state ->
       EditTextUtil.setCursorColor(textInput, state.currentAvatar.color.foregroundColor)
-
-      val hadText = textInput.length() > 0
-      val selectionStart = textInput.selectionStart
-      val selectionEnd = textInput.selectionEnd
-
       viewHolder.bind(AvatarPickerItem.Model(state.currentAvatar, false))
-      textInput.post {
-        if (!hadText) {
-          textInput.setSelection(textInput.length())
-        } else {
-          textInput.setSelection(selectionStart, selectionEnd)
-        }
-      }
 
       adapter.submitList(state.colors().map { AvatarColorItem.Model(it) })
       hasBoundFromViewModel = true
@@ -114,8 +104,8 @@ class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragme
     }
 
     textInput.setOnEditorActionListener { v, actionId, event ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        doneButton.performClick()
+      if (actionId == EditorInfo.IME_ACTION_NEXT) {
+        tabLayout.getTabAt(1)?.select()
         true
       } else {
         false
@@ -130,20 +120,18 @@ class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragme
           textInput.isEnabled = true
           ViewUtil.focusAndShowKeyboard(textInput)
 
-          val constraintLayout = requireView() as ConstraintLayout
-          TransitionManager.endTransitions(constraintLayout)
-          withoutRecyclerSet.applyTo(constraintLayout)
-          TransitionManager.beginDelayedTransition(constraintLayout)
+          TransitionManager.endTransitions(content)
+          withoutRecyclerSet.applyTo(content)
+          TransitionManager.beginDelayedTransition(content)
           textInput.setSelection(textInput.length())
         }
         1 -> {
           textInput.isEnabled = false
           ViewUtil.hideKeyboard(requireContext(), textInput)
 
-          val constraintLayout = requireView() as ConstraintLayout
-          TransitionManager.endTransitions(constraintLayout)
-          withRecyclerSet.applyTo(constraintLayout)
-          TransitionManager.beginDelayedTransition(constraintLayout)
+          TransitionManager.endTransitions(content)
+          withRecyclerSet.applyTo(content)
+          TransitionManager.beginDelayedTransition(content)
         }
       }
     }