From 2ee9bffe2a0a39f5fe1d44f82d9c5735b69803c6 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Fri, 19 Nov 2021 21:30:35 -0800
Subject: Delete extra copies

---
 app/src/main/res/layout/activity_image.xml   |  2 +-
 app/src/main/res/layout/activity_image_2.xml | 72 ----------------------------
 2 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_image_2.xml

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

diff --git a/app/src/main/res/layout/activity_image.xml b/app/src/main/res/layout/activity_image.xml
index 7e19dabf..689c4f4d 100644
--- a/app/src/main/res/layout/activity_image.xml
+++ b/app/src/main/res/layout/activity_image.xml
@@ -19,7 +19,7 @@
 
         <!-- Alpha and scaling will be reset on load -->
 
-        <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+        <com.github.piasy.biv.view.BigImageView
             android:id="@+id/image_photo"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_image_2.xml b/app/src/main/res/layout/activity_image_2.xml
deleted file mode 100644
index 689c4f4d..00000000
--- a/app/src/main/res/layout/activity_image_2.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/image_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ProgressBar
-        android:id="@+id/image_progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-
-    <com.pitchedapps.frost.views.DragFrame
-        android:id="@+id/image_drag"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- Alpha and scaling will be reset on load -->
-
-        <com.github.piasy.biv.view.BigImageView
-            android:id="@+id/image_photo"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0"
-            android:scaleX="0.9"
-            android:scaleY="0.9" />
-
-    </com.pitchedapps.frost.views.DragFrame>
-
-    <LinearLayout
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:gravity="end"
-        android:orientation="horizontal"
-        android:paddingStart="8dp"
-        android:paddingTop="10dp"
-        android:paddingEnd="8dp"
-        android:paddingBottom="10dp">
-
-        <ImageView
-            android:id="@+id/error"
-            style="@style/Image.Icon" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <ImageView
-            android:id="@+id/download"
-            style="@style/Image.Icon" />
-
-        <ImageView
-            android:id="@+id/share"
-            style="@style/Image.Icon" />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/image_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:alpha="0.5"
-        android:padding="@dimen/kau_padding_normal"
-        app:behavior_peekHeight="44dp"
-        app:layout_behavior="@string/bottom_sheet_behavior" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
-- 
cgit v1.2.3