move icons into drawables and reuse some from Commons library

app/build.gradle

@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.1.1'
+    compile 'com.simplemobiletools:commons:2.1.2'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_launcher_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">

app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt

@@ -206,7 +206,7 @@ class VideoFragment : ViewPagerFragment(), View.OnClickListener, SurfaceHolder.C
     private fun pauseVideo() {
         mIsPlaying = false
         mMediaPlayer?.pause()
-        mView.video_play_outline.setImageDrawable(resources.getDrawable(R.mipmap.play_outline_big))
+        mView.video_play_outline.setImageDrawable(resources.getDrawable(R.drawable.img_play_outline_big))
         activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 

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

@@ -16,7 +16,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
-        android:src="@mipmap/pin"/>
+        android:src="@drawable/ic_pin"/>
 
     <RelativeLayout
         android:id="@+id/dir_shadow_holder"

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

@@ -18,7 +18,7 @@
         android:layout_height="@dimen/play_outline_size_big"
         android:layout_centerInParent="true"
         android:background="@android:color/transparent"
-        android:src="@mipmap/play_outline_big"/>
+        android:src="@drawable/img_play_outline_big"/>
 
     <RelativeLayout
         android:id="@+id/video_time_holder"

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

@@ -16,7 +16,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/tiny_margin"
-        android:src="@mipmap/play_outline"
+        android:src="@drawable/img_play_outline"
         android:visibility="gone"/>
 
     <TextView

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

@@ -3,47 +3,47 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_properties"
-        android:icon="@mipmap/info"
+        android:icon="@drawable/ic_info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_pin"
-        android:icon="@mipmap/pin"
+        android:icon="@drawable/ic_pin"
         android:title="@string/pin_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unpin"
-        android:icon="@mipmap/unpin"
+        android:icon="@drawable/ic_unpin"
         android:title="@string/unpin_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_rename"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_hide"
-        android:icon="@mipmap/hide"
+        android:icon="@drawable/ic_hide"
         android:title="@string/hide_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unhide"
-        android:icon="@mipmap/unhide"
+        android:icon="@drawable/ic_unhide"
         android:title="@string/unhide_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_copy_move"
-        android:icon="@mipmap/copy"
+        android:icon="@drawable/ic_copy"
         android:title="@string/copy_move"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_select_all"
-        android:icon="@mipmap/select_all"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>

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

@@ -3,37 +3,37 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_delete"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_properties"
-        android:icon="@mipmap/info"
+        android:icon="@drawable/ic_info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_copy_move"
-        android:icon="@mipmap/copy"
+        android:icon="@drawable/ic_copy"
         android:title="@string/copy_move"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_rename"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_edit"
-        android:icon="@mipmap/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_select_all"
-        android:icon="@mipmap/select_all"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all"
         app:showAsAction="ifRoom"/>
 </menu>

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

@@ -3,17 +3,17 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save_as"
-        android:icon="@mipmap/check"
+        android:icon="@drawable/ic_check"
         android:title="@string/save_as"
         app:showAsAction="always"/>
     <item
         android:id="@+id/rotate"
-        android:icon="@mipmap/rotate"
+        android:icon="@drawable/ic_rotate"
         android:title="@string/rotate"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/resize"
-        android:icon="@mipmap/resize"
+        android:icon="@drawable/ic_resize"
         android:title="@string/resize"
         app:showAsAction="ifRoom"/>
 </menu>

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

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sort"
-        android:icon="@mipmap/sort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/open_camera"
-        android:icon="@mipmap/camera"
+        android:icon="@drawable/ic_camera"
         android:title="@string/open_camera"
         app:showAsAction="ifRoom"/>
     <item

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

@@ -3,17 +3,17 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sort"
-        android:icon="@mipmap/sort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/toggle_filename"
-        android:icon="@mipmap/toggle_filename"
+        android:icon="@drawable/ic_toggle_filename"
         android:title="@string/toggle_filename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/open_camera"
-        android:icon="@mipmap/camera"
+        android:icon="@drawable/ic_camera"
         android:title="@string/open_camera"
         app:showAsAction="ifRoom"/>
     <item

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

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/rotate"
-        android:icon="@mipmap/rotate"
+        android:icon="@drawable/ic_rotate"
         android:title="@string/rotate"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/save"
-        android:icon="@mipmap/check"
+        android:icon="@drawable/ic_check"
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
 </menu>

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

@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@mipmap/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item

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

@@ -15,27 +15,27 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/menu_delete"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@mipmap/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_rename"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_properties"
-        android:icon="@mipmap/info"
+        android:icon="@drawable/ic_info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
 </menu>