From b51d147986e8f4789636118e5487e53b5170679b Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 16 Aug 2020 20:40:42 -0400
Subject: [PATCH] Cleanup
---
.../kanade/tachiyomi/source/online/HttpSource.kt | 8 ++++----
.../kanade/tachiyomi/source/online/all/EHentai.kt | 4 ++--
app/src/main/res/drawable/eh_ic_hllogo.xml | 6 ------
app/src/main/res/drawable/eh_ic_nhlogo_color.xml | 15 ---------------
4 files changed, 6 insertions(+), 27 deletions(-)
delete mode 100644 app/src/main/res/drawable/eh_ic_hllogo.xml
delete mode 100644 app/src/main/res/drawable/eh_ic_nhlogo_color.xml
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
index e623be0ff..230862ccd 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
@@ -37,24 +37,24 @@ abstract class HttpSource : CatalogueSource {
*/
// SY -->
protected val network: NetworkHelper by lazy {
- val original = Injekt.get<NetworkHelper>()
+ val network = Injekt.get<NetworkHelper>()
object : NetworkHelper(Injekt.get<Application>()) {
override val client: OkHttpClient
- get() = delegate?.networkHttpClient ?: original.client
+ get() = delegate?.networkHttpClient ?: network.client
.newBuilder()
.injectPatches { id }
.maybeInjectEHLogger()
.build()
override val cloudflareClient: OkHttpClient
- get() = delegate?.networkCloudflareClient ?: original.cloudflareClient
+ get() = delegate?.networkCloudflareClient ?: network.cloudflareClient
.newBuilder()
.injectPatches { id }
.maybeInjectEHLogger()
.build()
override val cookieManager: AndroidCookieJar
- get() = original.cookieManager
+ get() = network.cookieManager
}
}
// SY <--
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 5c6659f83..74326ab8d 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -52,6 +52,8 @@ import exh.util.ignore
import exh.util.nullIfBlank
import exh.util.trimOrNull
import exh.util.urlImportFetchSearchManga
+import java.net.URLEncoder
+import java.util.ArrayList
import kotlinx.coroutines.runBlocking
import okhttp3.CacheControl
import okhttp3.CookieJar
@@ -67,8 +69,6 @@ import org.jsoup.nodes.TextNode
import rx.Observable
import rx.Single
import uy.kohesive.injekt.injectLazy
-import java.net.URLEncoder
-import java.util.ArrayList
// TODO Consider gallery updating when doing tabbed browsing
@Nsfw
diff --git a/app/src/main/res/drawable/eh_ic_hllogo.xml b/app/src/main/res/drawable/eh_ic_hllogo.xml
deleted file mode 100644
index 840be3bc3..000000000
--- a/app/src/main/res/drawable/eh_ic_hllogo.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="192"
- android:viewportWidth="192" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#000000" android:pathData="M115.49,34.82C115.55,30.11 115.5,25.39 115.52,20.67C127.62,20.66 139.72,20.66 151.82,20.67C151.8,28.84 151.81,37.01 151.81,45.18C147.62,47.04 143.85,49.73 140.84,53.2C140.04,45.99 136.12,38.9 129.61,35.39C125.35,32.93 119.98,33.01 115.49,34.82Z"/>
- <path android:fillColor="#000000" android:pathData="M35.62,22.63C47.61,22.59 59.59,22.65 71.58,22.6C71.71,41.53 71.56,60.46 71.65,79.39C85.41,79.39 99.17,79.38 112.92,79.39C119.31,86.01 124.89,93.89 126.83,103.02C133.6,96.24 142.69,92.25 151.8,89.7C151.83,116.66 151.79,143.61 151.82,170.57C139.71,170.57 127.61,170.6 115.5,170.56C115.56,151.14 115.47,131.73 115.55,112.31C100.9,112.22 86.25,112.27 71.61,112.29C71.59,131.65 71.72,151.02 71.54,170.38C59.57,170.14 47.6,170.89 35.63,170.49C35.59,121.2 35.6,71.91 35.62,22.63Z"/>
- <path android:fillColor="#000000" android:pathData="M115.49,34.82C119.98,33.01 125.35,32.93 129.61,35.39C136.12,38.9 140.04,45.99 140.84,53.2C143.85,49.73 147.62,47.04 151.81,45.18C155.23,44.08 158.99,44.25 162.54,44.63C168.17,46.15 172.94,50.53 174.96,56C177.57,63.12 176.41,71.32 172.73,77.84C168.17,85.05 159.47,87.4 151.8,89.7C142.69,92.25 133.6,96.24 126.83,103.02C124.89,93.89 119.31,86.01 112.92,79.39C107.32,73.38 101.28,66.67 100.79,58.01C101.31,48.58 106.31,38.46 115.49,34.82Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/eh_ic_nhlogo_color.xml b/app/src/main/res/drawable/eh_ic_nhlogo_color.xml
deleted file mode 100644
index 85942d927..000000000
--- a/app/src/main/res/drawable/eh_ic_nhlogo_color.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="470.25"
- android:viewportWidth="603.195" android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <group
- android:translateY="100"
- android:scaleX="1.2"
- android:scaleY="1.2">
- <path android:fillColor="#EC2854"
- android:pathData="M172.2,36.03c-16.6,6.91 -52.73,34.03 -36.25,58.47c7.29,10.81 19.94,18.44 31.47,22.06c10.73,3.36 23.9,-0.76 33.71,3.72c-2.09,5.1 -9.48,23.69 -15.81,22.32c-11.83,-2.54 -23.79,-0.44 -33.07,8.48c-18.96,-26.3 -45.97,-36.97 -75.74,-29.68c22.07,-27.2 16.72,-55.69 -6.47,-81.62c-14,-15.66 -47.99,-37.96 -69.85,-28.85C54.78,-11.81 121.31,5.38 172.2,36.03C163.38,39.7 168.58,33.85 172.2,36.03z"
- android:strokeColor="#EC2854" android:strokeWidth="1"/>
- <path android:fillColor="#EC2854"
- android:pathData="M310.36,36.03c16.59,6.91 52.73,34.03 36.25,58.47c-7.29,10.81 -19.94,18.44 -31.47,22.06c-10.73,3.37 -23.9,-0.76 -33.71,3.72c2.1,5.11 9.46,23.67 15.81,22.32c11.83,-2.54 23.79,-0.45 33.07,8.48c18.96,-26.29 45.97,-36.97 75.74,-29.68c-22.06,-27.21 -16.73,-55.68 6.47,-81.62c14,-15.65 47.99,-37.97 69.85,-28.85C427.78,-11.8 361.25,5.37 310.36,36.03C319.18,39.7 313.98,33.85 310.36,36.03z"
- android:strokeColor="#EC2854" android:strokeWidth="1"/>
- <path android:fillColor="#FFFFFF" android:pathData="M180.43,97.11h23.2v15.92c6.87,-6.56 14.15,-11.27 21.84,-14.14c7.69,-2.86 16.23,-4.3 25.64,-4.3c20.62,0 34.55,5.55 41.78,16.65c3.98,6.07 5.97,14.77 5.97,26.08v71.95h-24.83v-70.69c0,-6.84 -1.31,-12.36 -3.93,-16.55c-4.34,-6.98 -12.21,-10.47 -23.6,-10.47c-5.79,0 -10.54,0.46 -14.25,1.36c-6.69,1.54 -12.57,4.61 -17.64,9.22c-4.07,3.7 -6.72,7.52 -7.94,11.47c-1.22,3.94 -1.83,9.58 -1.83,16.91v58.75h-24.42L180.43,97.11L180.43,97.11z"/>
- </group>
-</vector>