Replace image editor.

res/layout/image_editor_fragment.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    tools:context="org.thoughtcrime.securesms.scribbles.ScribbleActivity">
 
-    <org.thoughtcrime.securesms.scribbles.widget.ScribbleView
+    <org.thoughtcrime.securesms.imageeditor.ImageEditorView
-        android:id="@+id/scribble_view"
+        android:id="@+id/image_editor_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
         android:gravity="center" />
 
-    <org.thoughtcrime.securesms.scribbles.ScribbleHud
+    <org.thoughtcrime.securesms.scribbles.ImageEditorHud
         android:id="@+id/scribble_hud"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

res/layout/image_editor_hud.xml

@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="8dp"
-                android:src="@drawable/ic_trash_outline_36" />
+                android:src="@drawable/ic_trash_filled_32" />
 
             <ImageView
                 android:id="@+id/scribble_undo_button"
@@ -42,23 +42,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="8dp"
-                android:src="@drawable/ic_undo_36" />
+                android:src="@drawable/ic_undo_32" />
-
-            <ImageView
-                android:id="@+id/scribble_draw_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:padding="8dp"
-                android:src="@drawable/ic_marker_36" />
-
-            <ImageView
-                android:id="@+id/scribble_highlight_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:padding="8dp"
-                android:src="@drawable/ic_highlighter_36" />
 
             <ImageView
                 android:id="@+id/scribble_text_button"
@@ -66,7 +50,23 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="8dp"
-                android:src="@drawable/ic_text_36" />
+                android:src="@drawable/ic_text_32" />
+                
+            <ImageView
+                android:id="@+id/scribble_draw_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="8dp"
+                android:src="@drawable/ic_brush_marker_32" />
+
+            <ImageView
+                android:id="@+id/scribble_highlight_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="8dp"
+                android:src="@drawable/ic_brush_highlight_32" />
 
             <ImageView
                 android:id="@+id/scribble_sticker_button"
@@ -74,7 +74,15 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="8dp"
-                android:src="@drawable/ic_camera_emoji_36" />
+                android:src="@drawable/ic_emoji_32" />
+
+            <ImageView
+                android:id="@+id/scribble_crop_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="8dp"
+                android:src="@drawable/ic_crop_32" />
 
             <ImageView
                 android:id="@+id/scribble_confirm_button"
@@ -82,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="8dp"
-                android:src="@drawable/ic_check_circle_filled_36" />
+                android:src="@drawable/ic_check_circle_32" />
 
         </LinearLayout>
 
@@ -113,6 +121,36 @@
             app:layout_constraintTop_toBottomOf="@+id/scribble_color_picker"
             app:layout_constraintVertical_bias="0.0" />
 
+        <ImageView
+            android:id="@+id/scribble_crop_flip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:padding="8dp"
+            android:src="@drawable/ic_flip_32"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/scribble_crop_rotate" />
+
+        <ImageView
+            android:id="@+id/scribble_crop_rotate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:padding="8dp"
+            android:src="@drawable/ic_rotate_32"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <ImageView
+            android:id="@+id/scribble_crop_aspect_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:padding="8dp"
+            android:src="@drawable/ic_crop_lock_32"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
     </android.support.constraint.ConstraintLayout>
 
 </merge>

res/layout/mediasend_fragment.xml

@@ -25,6 +25,7 @@
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/mediasend_caption_and_rail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"

res/layout/scribble_activity.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    tools:context="org.thoughtcrime.securesms.scribbles.ScribbleActivity">
-
-</FrameLayout>

res/layout/scribble_view.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge tools:parentTag="FrameLayout"
-       xmlns:tools="http://schemas.android.com/tools"
-       xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <ImageView android:id="@+id/image_view"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:scaleType="centerInside"
-               android:adjustViewBounds="true"/>
-
-    <org.thoughtcrime.securesms.scribbles.widget.MotionView
-            android:id="@+id/motion_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-    <org.thoughtcrime.securesms.scribbles.widget.CanvasView
-            android:id="@+id/canvas_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/transparent"/>
-
-</merge>