From 88a21195860bb99ab3cbc4b992b1d57bc016fcb4 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 16 Jun 2020 15:17:00 +0800
Subject: Resolve conflicts: Some refactors on media activities.

---
 app/src/main/res/menu/view_gif_activity.xml        | 17 ---------------
 app/src/main/res/menu/view_image_activity.xml      | 23 ---------------------
 .../main/res/menu/view_image_or_gif_activity.xml   | 24 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/res/menu/view_gif_activity.xml
 delete mode 100644 app/src/main/res/menu/view_image_activity.xml
 create mode 100644 app/src/main/res/menu/view_image_or_gif_activity.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/view_gif_activity.xml b/app/src/main/res/menu/view_gif_activity.xml
deleted file mode 100644
index 0dc5aba5..00000000
--- a/app/src/main/res/menu/view_gif_activity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_download_view_gif_activity"
-        android:orderInCategory="1"
-        android:title="@string/action_download"
-        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_share_view_gif_activity"
-        android:orderInCategory="2"
-        android:title="@string/action_share"
-        android:icon="@drawable/ic_share_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_image_activity.xml b/app/src/main/res/menu/view_image_activity.xml
deleted file mode 100644
index 0c080ae9..00000000
--- a/app/src/main/res/menu/view_image_activity.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_download_view_image_activity"
-        android:orderInCategory="1"
-        android:title="@string/action_download"
-        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_share_view_image_activity"
-        android:orderInCategory="2"
-        android:title="@string/action_share"
-        android:icon="@drawable/ic_share_toolbar_white_24dp"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_set_wallpaper_view_image_activity"
-        android:orderInCategory="3"
-        android:title="@string/action_set_wallpaper"
-        app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_image_or_gif_activity.xml b/app/src/main/res/menu/view_image_or_gif_activity.xml
new file mode 100644
index 00000000..682516a4
--- /dev/null
+++ b/app/src/main/res/menu/view_image_or_gif_activity.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_download_view_image_or_gif_activity"
+        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
+        android:orderInCategory="1"
+        android:title="@string/action_download"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_share_view_image_or_gif_activity"
+        android:icon="@drawable/ic_share_toolbar_white_24dp"
+        android:orderInCategory="2"
+        android:title="@string/action_share"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_set_wallpaper_view_image_or_gif_activity"
+        android:orderInCategory="3"
+        android:title="@string/action_set_wallpaper"
+        android:visible="false"
+        app:showAsAction="never" />
+</menu>
-- 
cgit v1.2.3