Allow to reorder and rename categories

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

@@ -21,14 +21,26 @@
         android:layout_marginRight="@dimen/margin_right"
         android:layout_marginEnd="@dimen/margin_right"/>
 
+    <ImageView
+        android:id="@+id/reorder"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginLeft="@dimen/margin_left"
+        android:layout_marginStart="@dimen/margin_left"
+        android:layout_marginRight="@dimen/margin_right"
+        android:layout_marginEnd="@dimen/margin_right"
+        android:scaleType="center"
+        android:layout_alignParentRight="true"
+        android:src="@drawable/ic_reorder_grey_600_24dp"/>
+
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/margin_right"
-        android:layout_marginEnd="@dimen/margin_right"
         android:layout_toRightOf="@id/image"
         android:layout_toEndOf="@id/image"
+        android:layout_toLeftOf="@id/reorder"
+        android:layout_toStartOf="@id/reorder"
         android:layout_centerInParent="true"
         android:ellipsize="end"
         android:maxLines="1"

app/src/main/res/menu/category_selection.xml

@@ -3,10 +3,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item android:id="@+id/action_edit"
+          android:title="@string/action_edit"
+          android:icon="@drawable/ic_create"
+          app:showAsAction="ifRoom"/>
+
     <item android:id="@+id/action_delete"
           android:title="@string/action_delete"
           android:icon="@drawable/ic_action_delete"
-          android:orderInCategory="1"
-          app:showAsAction="always"/>
+          app:showAsAction="ifRoom"/>
 
 </menu>

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

@@ -24,6 +24,7 @@
     <string name="action_edit">Edit</string>
     <string name="action_add_category">Add category</string>
     <string name="action_edit_categories">Edit categories</string>
+    <string name="action_rename_category">Rename category</string>
     <string name="action_sort_up">Sort up</string>
     <string name="action_sort_down">Sort down</string>
     <string name="action_show_unread">Unread</string>