diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java index 5f1a09873..64ad0f210 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java @@ -332,7 +332,7 @@ public class MainActivity extends AppCompatActivity case R.id.cab_edit: editDirectory(); return true; - case R.id.cab_remove: + case R.id.cab_delete: prepareForDeleting(); mode.finish(); return true; diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java index bfcb64bd1..baf0aa952 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java @@ -264,7 +264,7 @@ public class PhotosActivity extends AppCompatActivity @Override public boolean onActionItemClicked(ActionMode mode, MenuItem item) { switch (item.getItemId()) { - case R.id.cab_remove: + case R.id.cab_delete: prepareForDeleting(); mode.finish(); return true; diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java index 4cc61d7ca..ae9c2bef2 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java @@ -102,7 +102,7 @@ public class ViewPagerActivity extends AppCompatActivity case R.id.menu_share: shareImage(); return true; - case R.id.menu_remove: + case R.id.menu_delete: notifyDeletion(); return true; case R.id.menu_edit: diff --git a/app/src/main/res/layout/activity_photo.xml b/app/src/main/res/layout/activity_photo.xml index cb2830950..884715a3f 100644 --- a/app/src/main/res/layout/activity_photo.xml +++ b/app/src/main/res/layout/activity_photo.xml @@ -18,7 +18,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:padding="@dimen/undo_padding" - android:src="@mipmap/ic_launcher" + android:src="@mipmap/undo" android:visibility="gone"/> diff --git a/app/src/main/res/menu/directories_menu.xml b/app/src/main/res/menu/directories_menu.xml index c976961b9..d5f64ce2e 100644 --- a/app/src/main/res/menu/directories_menu.xml +++ b/app/src/main/res/menu/directories_menu.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/photos_menu.xml b/app/src/main/res/menu/photos_menu.xml index ccf1ce9bf..6e774a7c3 100644 --- a/app/src/main/res/menu/photos_menu.xml +++ b/app/src/main/res/menu/photos_menu.xml @@ -2,8 +2,8 @@ diff --git a/app/src/main/res/menu/viewpager_menu.xml b/app/src/main/res/menu/viewpager_menu.xml index de5242bad..243dc202a 100644 --- a/app/src/main/res/menu/viewpager_menu.xml +++ b/app/src/main/res/menu/viewpager_menu.xml @@ -3,17 +3,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/mipmap-hdpi/delete.png b/app/src/main/res/mipmap-hdpi/delete.png new file mode 100644 index 000000000..4a9f76947 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/delete.png differ diff --git a/app/src/main/res/mipmap-hdpi/edit.png b/app/src/main/res/mipmap-hdpi/edit.png new file mode 100644 index 000000000..d3ff58dcc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/edit.png differ diff --git a/app/src/main/res/mipmap-hdpi/share.png b/app/src/main/res/mipmap-hdpi/share.png new file mode 100644 index 000000000..b09a6926d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/share.png differ diff --git a/app/src/main/res/mipmap-hdpi/undo.png b/app/src/main/res/mipmap-hdpi/undo.png new file mode 100644 index 000000000..eb7522cdb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/undo.png differ diff --git a/app/src/main/res/mipmap-mdpi/delete.png b/app/src/main/res/mipmap-mdpi/delete.png new file mode 100644 index 000000000..e2f5f3555 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/delete.png differ diff --git a/app/src/main/res/mipmap-mdpi/edit.png b/app/src/main/res/mipmap-mdpi/edit.png new file mode 100644 index 000000000..12b09f1d9 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/edit.png differ diff --git a/app/src/main/res/mipmap-mdpi/share.png b/app/src/main/res/mipmap-mdpi/share.png new file mode 100644 index 000000000..e944fd70c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/share.png differ diff --git a/app/src/main/res/mipmap-mdpi/undo.png b/app/src/main/res/mipmap-mdpi/undo.png new file mode 100644 index 000000000..294b57578 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/undo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/delete.png b/app/src/main/res/mipmap-xhdpi/delete.png new file mode 100644 index 000000000..388b5b060 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/delete.png differ diff --git a/app/src/main/res/mipmap-xhdpi/edit.png b/app/src/main/res/mipmap-xhdpi/edit.png new file mode 100644 index 000000000..5a06bff5a Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/edit.png differ diff --git a/app/src/main/res/mipmap-xhdpi/share.png b/app/src/main/res/mipmap-xhdpi/share.png new file mode 100644 index 000000000..22a8783e7 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/share.png differ diff --git a/app/src/main/res/mipmap-xhdpi/undo.png b/app/src/main/res/mipmap-xhdpi/undo.png new file mode 100644 index 000000000..c4c28d0a4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/undo.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/delete.png b/app/src/main/res/mipmap-xxhdpi/delete.png new file mode 100644 index 000000000..3fcdfdb55 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/delete.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/edit.png b/app/src/main/res/mipmap-xxhdpi/edit.png new file mode 100644 index 000000000..02e19d045 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/edit.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/share.png b/app/src/main/res/mipmap-xxhdpi/share.png new file mode 100644 index 000000000..a35b3cd14 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/share.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/undo.png b/app/src/main/res/mipmap-xxhdpi/undo.png new file mode 100644 index 000000000..1e1e3d866 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/undo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/delete.png b/app/src/main/res/mipmap-xxxhdpi/delete.png new file mode 100644 index 000000000..8d322aa9b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/delete.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/edit.png b/app/src/main/res/mipmap-xxxhdpi/edit.png new file mode 100644 index 000000000..d6668a051 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/edit.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png new file mode 100644 index 000000000..e351c7beb Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/share.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/undo.png b/app/src/main/res/mipmap-xxxhdpi/undo.png new file mode 100644 index 000000000..6b10718b9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/undo.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f7af5d55d..d6731de28 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,8 @@ - #3F51B5 - #303F9F - #FF4081 + #ffff6f00 + #ffe46300 + @color/colorPrimary #ff222222 #66000000 #33000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 260873966..7d22a2e4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,10 +2,11 @@ Simple Gallery Share via Not much to do in a gallery without accessing your photos - Remove + Delete Deleting Edit Undo + Share Rename file Rename folder Could not rename the file