From f465785935e0780a5dbfc0c3cbff263763240d76 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 16 Jan 2020 22:13:34 -0500 Subject: [PATCH] Move WebViewActivity to where it should be --- app/src/main/AndroidManifest.xml | 2 +- .../tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt | 3 +-- .../eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt | 1 + .../tachiyomi/ui/{manga/info => webview}/WebViewActivity.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/java/eu/kanade/tachiyomi/ui/{manga/info => webview}/WebViewActivity.kt (99%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e4724bf52..a665df7baf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,7 +58,7 @@ diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt index b59cee9dde..8d30281398 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt @@ -10,7 +10,6 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.SearchView import androidx.core.view.GravityCompat -import androidx.drawerlayout.widget.DrawerLayout import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -35,7 +34,7 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog import eu.kanade.tachiyomi.ui.library.HeightTopWindowInsetsListener import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController -import eu.kanade.tachiyomi.ui.manga.info.WebViewActivity +import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.RecyclerWindowInsetsListener import eu.kanade.tachiyomi.util.connectivityManager import eu.kanade.tachiyomi.util.doOnApplyWindowInsets diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt index 4a73909e7b..e247fbfa56 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt @@ -60,6 +60,7 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog import eu.kanade.tachiyomi.ui.library.LibraryController import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController +import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.doOnApplyWindowInsets import eu.kanade.tachiyomi.util.getUriCompat import eu.kanade.tachiyomi.util.marginBottom diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt similarity index 99% rename from app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/WebViewActivity.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt index 4ac88af729..b13f4dca48 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/WebViewActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.manga.info +package eu.kanade.tachiyomi.ui.webview import android.content.Context import android.content.Intent