From 88a21195860bb99ab3cbc4b992b1d57bc016fcb4 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Tue, 16 Jun 2020 15:17:00 +0800 Subject: Resolve conflicts: Some refactors on media activities. --- app/src/main/res/layout/activity_view_gif.xml | 57 -------------------- app/src/main/res/layout/activity_view_image.xml | 58 -------------------- .../main/res/layout/activity_view_image_or_gif.xml | 63 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 115 deletions(-) delete mode 100644 app/src/main/res/layout/activity_view_gif.xml delete mode 100644 app/src/main/res/layout/activity_view_image.xml create mode 100644 app/src/main/res/layout/activity_view_image_or_gif.xml (limited to 'app/src/main/res/layout') diff --git a/app/src/main/res/layout/activity_view_gif.xml b/app/src/main/res/layout/activity_view_gif.xml deleted file mode 100644 index a09b4a4e..00000000 --- a/app/src/main/res/layout/activity_view_gif.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_image.xml b/app/src/main/res/layout/activity_view_image.xml deleted file mode 100644 index 9a80a732..00000000 --- a/app/src/main/res/layout/activity_view_image.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_image_or_gif.xml b/app/src/main/res/layout/activity_view_image_or_gif.xml new file mode 100644 index 00000000..019bbc7b --- /dev/null +++ b/app/src/main/res/layout/activity_view_image_or_gif.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3