mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts: Some refactors on media activities.

Browse Source
This commit is contained in:
Alex Ning
2020-06-16 15:17:00 +08:00
parent 268ea4f9d8
commit 88a2119586
22 changed files with 519 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/menu/view_gif_activity.xml
View File

@@ -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>

13
app/src/main/res/menu/view_image_activity.xml → app/src/main/res/menu/view_image_or_gif_activity.xml
View File

@@ -2,22 +2,23 @@
<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: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"
android:icon="@drawable/ic_file_download_toolbar_white_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_share_view_image_activity"
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"
android:icon="@drawable/ic_share_toolbar_white_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_set_wallpaper_view_image_activity"
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>
</menu>