finish transition to api v2

(cherry picked from commit 4039f6927e627279cf1b324279a2d817a007d29b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
#	app/src/main/java/exh/md/handlers/MangaHandler.kt
#	app/src/main/java/exh/md/utils/MdUtil.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_chapters_sheet.xml
#	app/src/main/res/menu/reader.xml

app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt

@@ -114,7 +114,7 @@ class MangaDex(delegate: HttpSource, val context: Context) :
     override fun mapUrlToChapterUrl(uri: Uri): String? {
         if (!uri.pathSegments.firstOrNull().equals("chapter", true)) return null
         val id = uri.pathSegments.getOrNull(1) ?: return null
-        return MdUtil.apiChapterOld + id
+        return MdUtil.oldApiChapter + id
     }
 
     override suspend fun mapChapterUrlToMangaUrl(uri: Uri): String? {

app/src/main/java/exh/md/handlers/ApiMangaParser.kt

@@ -275,7 +275,7 @@ class ApiMangaParser(private val langs: List<String>) {
         groups: Map<Long, String>
     ): SChapter {
         val chapter = SChapter.create()
-        chapter.url = MdUtil.apiChapterOld + networkChapter.id
+        chapter.url = MdUtil.oldApiChapter + networkChapter.id
         val chapterName = mutableListOf<String>()
         // Build chapter name
 

app/src/main/java/exh/md/handlers/MangaHandler.kt

@@ -56,7 +56,7 @@ class MangaHandler(val client: OkHttpClient, val headers: Headers, val langs: Li
 
     suspend fun getMangaIdFromChapterId(urlChapterId: String): Int {
         return withContext(Dispatchers.IO) {
-            val request = GET(MdUtil.apiUrl + MdUtil.apiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK)
+            val request = GET(MdUtil.apiUrl + MdUtil.newApiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK)
             val response = client.newCall(request).await()
             ApiMangaParser(langs).chapterParseForMangaId(response)
         }

app/src/main/java/exh/md/utils/MdUtil.kt

@@ -26,8 +26,8 @@ class MdUtil {
         const val apiUrl = "https://api.mangadex.org"
         const val apiManga = "/v2/manga/"
         const val includeChapters = "?include=chapters"
-        const val apiChapter = "/v2/chapter/"
+        const val oldApiChapter = "/api/chapter/"
-        const val apiChapterOld = "/api/chapter/"
+        const val newApiChapter = "/v2/chapter/"
         const val apiChapterSuffix = "?mark_read=0"
         const val groupSearchUrl = "$baseUrl/groups/0/1/"
         const val followsAllApi = "/v2/user/me/followed-manga"
@@ -56,65 +56,66 @@ class MdUtil {
         )
 
         val descriptionLanguages = listOf(
-            "Russian / Русский",
+            "=FRANCAIS=",
-            "[u]Russian",
-            "[b][u]Russian",
-            "[RUS]",
-            "Russian / Русский",
-            "Russian/Русский:",
-            "Russia/Русское",
-            "Русский",
-            "RUS:",
-            "[b][u]German / Deutsch",
-            "German/Deutsch:",
-            "Español / Spanish",
-            "Spanish / Español",
-            "Spanish / Espa & ntilde; ol",
-            "Spanish / Español",
-            "[b][u]Spanish",
-            "[Español]:",
             "[b] Spanish: [/ b]",
-            "정보",
+            "[b][u]Chinese",
-            "Spanish/Español",
+            "[b][u]French",
-            "Español / Spanish",
+            "[b][u]German / Deutsch",
-            "Italian / Italiano",
+            "[b][u]Russian",
-            "Italian/Italiano",
+            "[b][u]Spanish",
+            "[b][u]Vietnamese",
+            "[b]External Links",
+            "[b]Link[/b]",
+            "[b]Links:",
+            "[Español]:",
+            "[hr]Fr:",
+            "[hr]TH",
+            "[INDO]",
+            "[PTBR]",
+            "[right][b][u]Persian",
+            "[RUS]",
+            "[u]Russian",
             "\r\n\r\nItalian\r\n",
+            "Arabic /",
+            "Descriptions in Other Languages",
+            "Español /",
+            "Farsi/",
+            "Français",
+            "French - ",
+            "French / ",
+            "German/",
+            "Hindi /",
+            "Italian / ",
+            "Italian Summary:",
+            "Italian/",
+            "Japanese /",
+            "Links:",
             "Pasta-Pizza-Mandolino/Italiano",
             "Persian /فارسی",
-            "Farsi/Persian/",
+            "Polish /",
-            "Polish / polski",
+            "Polish Summary /",
-            "Polish / Polski",
+            "Polish/",
-            "Polish Summary / Polski Opis",
             "Polski",
-            "Portuguese (BR) / Português",
-            "Portuguese / Português",
-            "Português / Portuguese",
-            "Portuguese / Portugu",
-            "Portuguese / Português",
             "Português",
-            "Portuguese (BR) / Portugu & ecirc;",
+            "Portuguese (BR)",
-            "Portuguese (BR) / Portuguê",
+            "Portuguese /",
-            "[PTBR]",
-            "Résume Français",
             "Résumé Français",
-            "[b][u]French",
+            "Résume Français",
-            "French / Français",
+            "RUS:",
-            "Français",
+            "Russia/",
-            "[hr]Fr:",
+            "Russian /",
-            "French - Français:",
+            "Spanish:",
-            "Turkish / Türkçe",
+            "Spanish /",
-            "Turkish/Türkçe",
+            "Spanish Summary:",
+            "Spanish/",
             "Türkçe",
-            "[b][u]Chinese",
+            "Thai:",
-            "Arabic / العربية",
+            "Turkish /",
+            "Turkish/",
+            "Русский",
             "العربية",
-            "[hr]TH",
+            "정보",
-            "[b][u]Vietnamese",
+            "(zh-Hant)",
-            "[b]Links:",
-            "[b]Link[/b]",
-            "Links:",
-            "[b]External Links"
         )
 
         // guess the thumbnail url is .jpg  this has a ~80% success rate