Refresh media selection and sending flow with a shiny new UX.

app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt

@@ -0,0 +1,59 @@
+package org.thoughtcrime.securesms.components
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.DialogFragment
+import org.thoughtcrime.securesms.R
+
+/**
+ * Fullscreen Dialog Fragment which will dismiss itself when the keyboard is closed
+ */
+abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
+  DialogFragment(contentLayoutId),
+  KeyboardAwareLinearLayout.OnKeyboardShownListener,
+  KeyboardAwareLinearLayout.OnKeyboardHiddenListener {
+
+  private var hasShown = false
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    setStyle(STYLE_NORMAL, R.style.Theme_Signal_RoundedBottomSheet)
+    super.onCreate(savedInstanceState)
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    val dialog = super.onCreateDialog(savedInstanceState)
+
+    dialog.window?.setDimAmount(0f)
+    dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+
+    return dialog
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    hasShown = false
+
+    val view = super.onCreateView(inflater, container, savedInstanceState)
+    return if (view is KeyboardAwareLinearLayout) {
+      view.addOnKeyboardShownListener(this)
+      view.addOnKeyboardHiddenListener(this)
+      view
+    } else {
+      throw IllegalStateException("Expected parent of view hierarchy to be keyboard aware.")
+    }
+  }
+
+  override fun onKeyboardShown() {
+    hasShown = true
+  }
+
+  override fun onKeyboardHidden() {
+    if (hasShown) {
+      dismissAllowingStateLoss()
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -20,6 +21,8 @@ import org.thoughtcrime.securesms.keyboard.KeyboardPage;
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerFragment;
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment;
 
+import java.util.Objects;
+
 public class MediaKeyboard extends FrameLayout implements InputView {
 
   private static final String TAG          = Log.tag(MediaKeyboard.class);
@@ -40,6 +43,10 @@ public class MediaKeyboard extends FrameLayout implements InputView {
     super(context, attrs);
   }
 
+  public void setFragmentManager(@NonNull FragmentManager fragmentManager) {
+    this.fragmentManager = fragmentManager;
+  }
+
   public void setKeyboardListener(@Nullable MediaKeyboardListener listener) {
     this.keyboardListener = listener;
   }
@@ -125,13 +132,32 @@ public class MediaKeyboard extends FrameLayout implements InputView {
 
   private void initView() {
     if (!isInitialised) {
+
       LayoutInflater.from(getContext()).inflate(R.layout.media_keyboard, this, true);
 
+      if (fragmentManager == null) {
+        FragmentActivity activity = resolveActivity(getContext());
+        fragmentManager = activity.getSupportFragmentManager();
+      }
+
+      keyboardPagerFragment = new KeyboardPagerFragment();
+      fragmentManager.beginTransaction()
+                     .replace(R.id.media_keyboard_fragment_container, keyboardPagerFragment)
+                     .commitNowAllowingStateLoss();
+
       keyboardState         = State.NORMAL;
       latestKeyboardHeight  = -1;
       isInitialised         = true;
-      fragmentManager       = ((FragmentActivity) getContext()).getSupportFragmentManager();
-      keyboardPagerFragment = (KeyboardPagerFragment) fragmentManager.findFragmentById(R.id.media_keyboard_fragment_container);
+    }
+  }
+
+  private static FragmentActivity resolveActivity(@Nullable Context context) {
+    if (context instanceof FragmentActivity) {
+      return (FragmentActivity) context;
+    } else if (context instanceof ContextThemeWrapper) {
+      return resolveActivity(((ContextThemeWrapper) context).getBaseContext());
+    } else {
+      throw new IllegalStateException("Could not locate FragmentActivity");
     }
   }