diff --git a/src/id/bacamanga/build.gradle b/src/id/bacamanga/build.gradle
new file mode 100644
index 000000000..7dd799ec2
--- /dev/null
+++ b/src/id/bacamanga/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+ appName = 'Tachiyomi: Baca Manga'
+ pkgNameSuffix = 'id.bacamanga'
+ extClass = '.BacaManga'
+ extVersionCode = 1
+ libVersion = '1.2'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/id/bacamanga/res/mipmap-hdpi/ic_launcher.png b/src/id/bacamanga/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..91b1f014d
Binary files /dev/null and b/src/id/bacamanga/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/id/bacamanga/res/mipmap-mdpi/ic_launcher.png b/src/id/bacamanga/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..dfbce0f74
Binary files /dev/null and b/src/id/bacamanga/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/id/bacamanga/res/mipmap-xhdpi/ic_launcher.png b/src/id/bacamanga/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..f1d6ee4a7
Binary files /dev/null and b/src/id/bacamanga/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/id/bacamanga/res/mipmap-xxhdpi/ic_launcher.png b/src/id/bacamanga/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..150a9c434
Binary files /dev/null and b/src/id/bacamanga/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/id/bacamanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/id/bacamanga/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..dcb01e94b
Binary files /dev/null and b/src/id/bacamanga/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/id/bacamanga/res/web_hi_res_512.png b/src/id/bacamanga/res/web_hi_res_512.png
new file mode 100644
index 000000000..697f7ee59
Binary files /dev/null and b/src/id/bacamanga/res/web_hi_res_512.png differ
diff --git a/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt b/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt
new file mode 100644
index 000000000..454a3aba8
--- /dev/null
+++ b/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt
@@ -0,0 +1,282 @@
+package eu.kanade.tachiyomi.extension.id.bacamanga
+
+import android.util.Base64
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.source.model.*
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.*
+import org.json.JSONObject
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.io.UnsupportedEncodingException
+import java.net.URLDecoder
+import java.text.SimpleDateFormat
+import java.util.*
+
+class BacaManga : ParsedHttpSource() {
+
+ override val name = "Baca Manga"
+ override val baseUrl = "https://bacamanga.co"
+ override val lang = "id"
+ override val supportsLatest = true
+ override val client: OkHttpClient = network.cloudflareClient
+
+ override fun popularMangaRequest(page: Int): Request {
+ return GET("$baseUrl/manga/page/$page/?order=popular", headers)
+ }
+
+ override fun latestUpdatesRequest(page: Int): Request {
+ return GET("$baseUrl/manga/page/$page/?order=update", headers)
+ }
+
+ override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+ val builtUrl = "$baseUrl/manga/page/$page/"
+ val url = HttpUrl.parse(builtUrl)!!.newBuilder()
+ url.addQueryParameter("title", query)
+ filters.forEach { filter ->
+ when (filter) {
+ is AuthorFilter -> {
+ url.addQueryParameter("author", filter.state)
+ }
+ is YearFilter -> {
+ url.addQueryParameter("yearx", filter.state)
+ }
+ is StatusFilter -> {
+ val status = when (filter.state) {
+ Filter.TriState.STATE_INCLUDE -> "completed"
+ Filter.TriState.STATE_EXCLUDE -> "ongoing"
+ else -> ""
+ }
+ url.addQueryParameter("status", status)
+ }
+ is TypeFilter -> {
+ url.addQueryParameter("type", filter.toUriPart())
+ }
+ is OrderByFilter -> {
+ url.addQueryParameter("order", filter.toUriPart())
+ }
+ is GenreList -> {
+ filter.state.forEach {
+ if (it.state) {
+ url.addQueryParameter("genre[]", it.id)
+ }
+ }
+ }
+ }
+ }
+ return GET(url.build().toString(), headers)
+ }
+
+ override fun popularMangaSelector() = "div.bs"
+ override fun latestUpdatesSelector() = popularMangaSelector()
+ override fun searchMangaSelector() = popularMangaSelector()
+
+ override fun popularMangaFromElement(element: Element): SManga {
+ val manga = SManga.create()
+ manga.thumbnail_url = element.select("div.limit img").attr("src")
+ element.select("a").first().let {
+ manga.setUrlWithoutDomain(it.attr("href"))
+ manga.title = it.attr("title")
+ }
+ return manga
+ }
+
+ override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
+ override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
+
+ override fun popularMangaNextPageSelector() = "a.next.page-numbers"
+ override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
+ override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
+
+ override fun mangaDetailsParse(document: Document): SManga {
+ val infoElement = document.select(".spe")
+ val sepName = infoElement.select("span:nth-child(4)").last()
+ val manga = SManga.create()
+ manga.author = sepName.ownText()
+ manga.artist = sepName.ownText()
+ manga.genre = infoElement.select("span:nth-child(1) > a")
+ .joinToString(", ") { it.text() }
+ manga.status = parseStatus(infoElement.select("span:nth-child(2)").text())
+ manga.description = document.select("div[itemprop=articleBody]").last().text()
+ manga.thumbnail_url = document.select(".thumb > img:nth-child(1)").attr("src")
+
+ return manga
+ }
+
+ private fun parseStatus(element: String): Int = when {
+ element.contains("ongoing", ignoreCase = true) -> SManga.ONGOING
+ element.contains("completed", ignoreCase = true) -> SManga.COMPLETED
+ else -> SManga.UNKNOWN
+ }
+
+ override fun chapterListParse(response: Response): List<SChapter> {
+ val document = response.asJsoup()
+ val chapters = document.select(chapterListSelector()).map { chapterFromElement(it) }
+ // Add date for latest chapter only
+ document.select("script.yoast-schema-graph").html()
+ .let {
+ val date = JSONObject(it).getJSONArray("@graph").
+ getJSONObject(3).getString("dateModified")
+ chapters[0].date_upload = parseDate(date)
+ }
+ return chapters
+ }
+
+ private fun parseDate(date: String): Long {
+ return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ENGLISH).parse(date).time
+ }
+
+ override fun chapterListSelector() = ".lchx"
+
+ override fun chapterFromElement(element: Element): SChapter {
+ val urlElement = element.select("a").first()
+ val chapter = SChapter.create()
+ chapter.setUrlWithoutDomain(urlElement.attr("href"))
+ chapter.name = urlElement.text()
+ return chapter
+ }
+
+ override fun pageListParse(document: Document): List<Page> {
+ val pages = mutableListOf<Page>()
+ val script = document.select("div#readerarea script").html()
+ val key = script.substringAfter("atob(").substringBefore(");")
+ val coded = script.substringAfter("*/var $key = \"").substringBefore("\";")
+ val decoded = URLDecoder.decode(decodeBase64(coded), "UTF-8")
+ val images = Jsoup.parse(decoded)
+ images.select("img").forEachIndexed { i, element ->
+ val url = element.attr("src")
+ pages.add(Page(i, "", url))
+ }
+ return pages
+ }
+
+ private fun decodeBase64(coded: String): String {
+ var valueDecoded = ByteArray(0)
+ try {
+ valueDecoded = Base64.decode(coded.toByteArray(charset("UTF-8")), Base64.DEFAULT)
+ } catch (e: UnsupportedEncodingException) {
+ }
+
+ return String(valueDecoded)
+ }
+
+ override fun imageUrlParse(document: Document) = ""
+
+ override fun imageRequest(page: Page): Request {
+ return if (page.imageUrl!!.contains("i0.wp.com")) {
+ val headers = Headers.Builder()
+ headers.apply {
+ add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3")
+ }
+ GET(page.imageUrl!!, headers.build())
+ } else GET(page.imageUrl!!, headers)
+ }
+
+ private class AuthorFilter : Filter.Text("Author")
+
+ private class YearFilter : Filter.Text("Year")
+
+ private class OrderByFilter : UriPartFilter("Sort by", arrayOf(
+ Pair("Default", ""),
+ Pair("A-Z", "title"),
+ Pair("Z-A", "titlereverse"),
+ Pair("Latest Update", "update"),
+ Pair("Latest Added", "latest"),
+ Pair("Popular", "popular")
+ ))
+
+ private class StatusFilter : Filter.TriState("Completed")
+
+ private class TypeFilter : UriPartFilter("Type", arrayOf(
+ Pair("All", ""),
+ Pair("Manga", "Manga"),
+ Pair("Manhua", "Manhua"),
+ Pair("Manhwa", "Manhwa")
+ ))
+
+ private class Genre(name: String, val id: String = name) : Filter.CheckBox(name)
+ private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
+
+ override fun getFilterList() = FilterList(
+ Filter.Header("NOTE: Ignored if using text search!"),
+ Filter.Separator(),
+ AuthorFilter(),
+ Filter.Separator(),
+ YearFilter(),
+ Filter.Separator(),
+ StatusFilter(),
+ Filter.Separator(),
+ OrderByFilter(),
+ Filter.Separator(),
+ TypeFilter(),
+ Filter.Separator(),
+ GenreList(getGenreList())
+ )
+
+ private fun getGenreList() = listOf(
+ Genre("Action", "action"),
+ Genre("Adult", "adult"),
+ Genre("Adventure", "adventure"),
+ Genre("Comedy", "comedy"),
+ Genre("Crime", "crime"),
+ Genre("Demons", "demons"),
+ Genre("Doujinshi", "doujinshi"),
+ Genre("Drama", "drama"),
+ Genre("Ecchi", "ecchi"),
+ Genre("Echi", "echi"),
+ Genre("Fantasy", "fantasy"),
+ Genre("Game", "game"),
+ Genre("Gender Bender", "gender-bender"),
+ Genre("Harem", "harem"),
+ Genre("Historical", "historical"),
+ Genre("Horor", "horor"),
+ Genre("Horror", "horror"),
+ Genre("Isekai", "isekai"),
+ Genre("Josei", "josei"),
+ Genre("Magic", "magic"),
+ Genre("Manhua", "manhua"),
+ Genre("Manhwa", "manhwa"),
+ Genre("Martial Art", "martial-art"),
+ Genre("Martial Arts", "martial-arts"),
+ Genre("Mature", "mature"),
+ Genre("Mecha", "mecha"),
+ Genre("Medical", "medical"),
+ Genre("Military", "military"),
+ Genre("Monster", "monster"),
+ Genre("Monster Girls", "monster-girls"),
+ Genre("Music", "music"),
+ Genre("Mystery", "mystery"),
+ Genre("Post-Apocalyptic", "post-apocalyptic"),
+ Genre("Psychological", "psychological"),
+ Genre("Romance", "romance"),
+ Genre("School", "school"),
+ Genre("School Life", "school-life"),
+ Genre("Sci-Fi", "sci-fi"),
+ Genre("Seinen", "seinen"),
+ Genre("Shoujo Ai", "shoujo-ai"),
+ Genre("Shoujo", "shoujo"),
+ Genre("Shounen Ai", "shounen-ai"),
+ Genre("Shounen", "shounen"),
+ Genre("Si-fi", "si-fi"),
+ Genre("Slice of Life", "slice-of-life"),
+ Genre("Smut", "smut"),
+ Genre("Sports", "sports"),
+ Genre("Super Power", "super-power"),
+ Genre("Supernatural", "supernatural"),
+ Genre("Thriller", "thriller"),
+ Genre("Tragedy", "tragedy"),
+ Genre("Vampire", "vampire"),
+ Genre("Webtoon", "webtoon"),
+ Genre("Webtoons", "webtoons"),
+ Genre("Yaoi", "yaoi"),
+ Genre("Yuri", "yuri"),
+ Genre("Zombies", "zombies")
+ )
+
+ private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+ Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+ fun toUriPart() = vals[state].second
+ }
+}