6 files changed, 11 insertions, 10 deletions
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
index ad62a46..6a6ddb2 100755
--- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
@@ -11,12 +11,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/comics_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v4.view.PagerTitleStrip
+            <androidx.viewpager.widget.PagerTitleStrip
                 android:id="@+id/comics_pager_title_strip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
                 android:paddingTop="4dp"
                 android:textColor="@android:color/white" />
 
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
 
         <com.shamanland.fab.FloatingActionButton
             android:id="@+id/fab"
diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
index d030731..66edd74 100755
--- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
+++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -83,4 +83,4 @@
         </FrameLayout>
 
     </FrameLayout>
-    </android.support.v7.widget.CardView>
-\ No newline at end of file
+    </androidx.cardview.widget.CardView>
+\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
index 55c8513..8364fbd 100644..100755
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
@@ -1,8 +1,9 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/comic_container"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <it.sephiroth.android.library.imagezoom.ImageViewTouch
+    <com.github.chrisbanes.photoview.PhotoView
         android:id="@+id/comic_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml
index 59d985c..7e34169 100644..100755
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml
@@ -2,7 +2,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/comics_swipe_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -13,5 +13,5 @@
             android:layout_height="match_parent"
             android:columnWidth="160dp"
             android:numColumns="auto_fit" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </FrameLayout>
 \ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
index 2feda8b..0730abc 100755
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
@@ -6,7 +6,7 @@
     android:animateLayoutChanges="true"
     android:layout_height="fill_parent" >
 
-    <org.fox.ttcomics2.utils.IVTViewPager
+    <androidx.viewpager.widget.ViewPager
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
diff --git a/org.fox.ttcomics/src/main/res/layout/toolbar.xml b/org.fox.ttcomics/src/main/res/layout/toolbar.xml
index 3f24ba4..8f9ea00 100644..100755
--- a/org.fox.ttcomics/src/main/res/layout/toolbar.xml
+++ b/org.fox.ttcomics/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"