diff --git a/src/id/komikindoid/AndroidManifest.xml b/src/id/komikindoid/AndroidManifest.xml
new file mode 100644
index 000000000..a46a5570e
--- /dev/null
+++ b/src/id/komikindoid/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/id/komikindoid/build.gradle b/src/id/komikindoid/build.gradle
new file mode 100644
index 000000000..dd59cce0b
--- /dev/null
+++ b/src/id/komikindoid/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+ extName = 'KomikIndoID'
+ pkgNameSuffix = 'id.komikindoid'
+ extClass = '.KomikIndoID'
+ extVersionCode = 1
+ libVersion = '1.2'
+}
+
+apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/id/komikindoid/res/drawable-hdpi/ic_launcher.png b/src/id/komikindoid/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..b044a4702
Binary files /dev/null and b/src/id/komikindoid/res/drawable-hdpi/ic_launcher.png differ
diff --git a/src/id/komikindoid/res/drawable-mdpi/ic_launcher.png b/src/id/komikindoid/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c45a2f800
Binary files /dev/null and b/src/id/komikindoid/res/drawable-mdpi/ic_launcher.png differ
diff --git a/src/id/komikindoid/res/drawable-xhdpi/ic_launcher.png b/src/id/komikindoid/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..0ceb9a208
Binary files /dev/null and b/src/id/komikindoid/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/src/id/komikindoid/res/drawable-xxhdpi/ic_launcher.png b/src/id/komikindoid/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0f8951a21
Binary files /dev/null and b/src/id/komikindoid/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/src/id/komikindoid/res/drawable-xxxhdpi/ic_launcher.png b/src/id/komikindoid/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..163f685ad
Binary files /dev/null and b/src/id/komikindoid/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/src/id/komikindoid/res/web_hi_res_512.png b/src/id/komikindoid/res/web_hi_res_512.png
new file mode 100644
index 000000000..8cba3ae09
Binary files /dev/null and b/src/id/komikindoid/res/web_hi_res_512.png differ
diff --git a/src/id/komikindoid/src/eu/kanade/tachiyomi/extension/id/komikindoid/KomikIndoID.kt b/src/id/komikindoid/src/eu/kanade/tachiyomi/extension/id/komikindoid/KomikIndoID.kt
new file mode 100644
index 000000000..96651d6c2
--- /dev/null
+++ b/src/id/komikindoid/src/eu/kanade/tachiyomi/extension/id/komikindoid/KomikIndoID.kt
@@ -0,0 +1,327 @@
+package eu.kanade.tachiyomi.extension.id.komikindoid
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+
+class KomikIndoID : ParsedHttpSource() {
+ override val name = "KomikIndoID"
+ override val baseUrl = "https://komikindo.id"
+ override val lang = "id"
+ override val supportsLatest = true
+ override val client: OkHttpClient = network.cloudflareClient
+ private val dateFormat: SimpleDateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US)
+
+ override fun popularMangaRequest(page: Int): Request {
+ return GET("$baseUrl/daftar-komik/page/$page/?order=popular", headers)
+ }
+
+ override fun latestUpdatesRequest(page: Int): Request {
+ return GET("$baseUrl/daftar-komik/page/$page/?order=update", headers)
+ }
+
+ override fun popularMangaSelector() = "div.animepost"
+ override fun latestUpdatesSelector() = popularMangaSelector()
+ override fun searchMangaSelector() = popularMangaSelector()
+
+ override fun popularMangaFromElement(element: Element): SManga = searchMangaFromElement(element)
+ override fun latestUpdatesFromElement(element: Element): SManga = searchMangaFromElement(element)
+
+ override fun popularMangaNextPageSelector() = "a.next.page-numbers"
+ override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
+ override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
+
+ override fun searchMangaFromElement(element: Element): SManga {
+ val manga = SManga.create()
+ manga.thumbnail_url = element.select("div.limit img").attr("src")
+ element.select("div.animposx > a").first().let {
+ manga.setUrlWithoutDomain(it.attr("href"))
+ manga.title = it.attr("title")
+ }
+ return manga
+ }
+
+ override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+ val builtUrl = if (page == 1) "$baseUrl/daftar-komik/" else "$baseUrl/daftar-komik/page/$page/?order="
+ val url = builtUrl.toHttpUrlOrNull()!!.newBuilder()
+ url.addQueryParameter("title", query)
+ url.addQueryParameter("page", page.toString())
+ 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 SortByFilter -> {
+ url.addQueryParameter("order", filter.toUriPart())
+ }
+ is GenreListFilter -> {
+ filter.state
+ .filter { it.state != Filter.TriState.STATE_IGNORE }
+ .forEach { url.addQueryParameter("genre[]", it.id) }
+ }
+ }
+ }
+ return GET(url.build().toString(), headers)
+ }
+ override fun mangaDetailsParse(document: Document): SManga {
+ val infoElement = document.select("div.infoanime").first()
+ val descElement = document.select("div.desc > .entry-content.entry-content-single").first()
+ val sepName = infoElement.select(".infox > .spe > span:nth-child(2)").last()
+ val manga = SManga.create()
+ // need authorCleaner to take "pengarang:" string to remove it from author
+ val authorCleaner = document.select(".infox .spe b:contains(Pengarang)").text()
+ manga.author = document.select(".infox .spe span:contains(Pengarang)").text().substringAfter(authorCleaner)
+ manga.artist = manga.author
+ val genres = mutableListOf()
+ infoElement.select(".infox > .genre-info > a").forEach { element ->
+ val genre = element.text()
+ genres.add(genre)
+ }
+ manga.genre = genres.joinToString(", ")
+ manga.status = parseStatus(infoElement.select(".infox > .spe > span:nth-child(1)").text())
+ manga.description = descElement.select("p").text()
+ manga.thumbnail_url = document.select(".thumb > img:nth-child(1)").attr("src")
+ return manga
+ }
+
+ private fun parseStatus(element: String): Int = when {
+ element.toLowerCase().contains("berjalan") -> SManga.ONGOING
+ element.toLowerCase().contains("tamat") -> SManga.COMPLETED
+ else -> SManga.UNKNOWN
+ }
+
+ override fun chapterListSelector() = "#chapter_list li"
+
+ override fun chapterFromElement(element: Element): SChapter {
+ val urlElement = element.select(".lchx a").first()
+ val chapter = SChapter.create()
+ chapter.setUrlWithoutDomain(urlElement.attr("href"))
+ chapter.name = urlElement.text()
+ chapter.date_upload = element.select(".dt a").first()?.text()?.let { parseChapterDate(it) } ?: 0
+ return chapter
+ }
+
+ fun parseChapterDate(date: String): Long {
+ return if (date.contains("lalu")) {
+ val value = date.split(' ')[0].toInt()
+ when {
+ "detik" in date -> Calendar.getInstance().apply {
+ add(Calendar.SECOND, value * -1)
+ }.timeInMillis
+ "menit" in date -> Calendar.getInstance().apply {
+ add(Calendar.MINUTE, value * -1)
+ }.timeInMillis
+ "jam" in date -> Calendar.getInstance().apply {
+ add(Calendar.HOUR_OF_DAY, value * -1)
+ }.timeInMillis
+ "hari" in date -> Calendar.getInstance().apply {
+ add(Calendar.DATE, value * -1)
+ }.timeInMillis
+ "minggu" in date -> Calendar.getInstance().apply {
+ add(Calendar.DATE, value * 7 * -1)
+ }.timeInMillis
+ "bulan" in date -> Calendar.getInstance().apply {
+ add(Calendar.MONTH, value * -1)
+ }.timeInMillis
+ "tahun" in date -> Calendar.getInstance().apply {
+ add(Calendar.YEAR, value * -1)
+ }.timeInMillis
+ else -> {
+ 0L
+ }
+ }
+ } else {
+ try {
+ dateFormat.parse(date)?.time ?: 0
+ } catch (_: Exception) {
+ 0L
+ }
+ }
+ }
+
+ override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
+ val basic = Regex("""Chapter\s([0-9]+)""")
+ when {
+ basic.containsMatchIn(chapter.name) -> {
+ basic.find(chapter.name)?.let {
+ chapter.chapter_number = it.groups[1]?.value!!.toFloat()
+ }
+ }
+ }
+ }
+
+ override fun pageListParse(document: Document): List {
+ val pages = mutableListOf()
+ var i = 0
+ document.select("div.imgch-auh img").forEach { element ->
+ val url = element.attr("src")
+ i++
+ if (url.isNotEmpty()) {
+ pages.add(Page(i, "", url))
+ }
+ }
+ return pages
+ }
+
+ override fun imageUrlParse(document: Document) = ""
+
+ override fun imageRequest(page: Page): Request {
+ if (page.imageUrl!!.contains("i2.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")
+ }
+ return GET(page.imageUrl!!, headers.build())
+ } else {
+ val imgHeader = Headers.Builder().apply {
+ add("User-Agent", "Mozilla/5.0 (Linux; U; Android 4.1.1; en-gb; Build/KLP) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30")
+ add("Referer", baseUrl)
+ }.build()
+ return GET(page.imageUrl!!, imgHeader)
+ }
+ }
+
+ private class AuthorFilter : Filter.Text("Author")
+
+ private class YearFilter : Filter.Text("Year")
+
+ private class TypeFilter : UriPartFilter(
+ "Type",
+ arrayOf(
+ Pair("Default", ""),
+ Pair("Manga", "Manga"),
+ Pair("Manhwa", "Manhwa"),
+ Pair("Manhua", "Manhua"),
+ Pair("Comic", "Comic")
+ )
+ )
+
+ private class SortByFilter : 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 : UriPartFilter(
+ "Status",
+ arrayOf(
+ Pair("All", ""),
+ Pair("Ongoing", "ongoing"),
+ Pair("Completed", "completed")
+ )
+ )
+
+ private class Genre(name: String, val id: String = name) : Filter.TriState(name)
+ private class GenreListFilter(genres: List) : Filter.Group("Genre", genres)
+
+ override fun getFilterList() = FilterList(
+ Filter.Header("NOTE: Ignored if using text search!"),
+ Filter.Separator(),
+ AuthorFilter(),
+ YearFilter(),
+ StatusFilter(),
+ TypeFilter(),
+ SortByFilter(),
+ GenreListFilter(getGenreList())
+ )
+
+ private fun getGenreList() = listOf(
+ Genre("4-Koma", "4-koma"),
+ Genre("4-Koma. Comedy", "4-koma-comedy"),
+ Genre("Action", "action"),
+ Genre("Action. Adventure", "action-adventure"),
+ Genre("Adult", "adult"),
+ Genre("Adventure", "adventure"),
+ Genre("Comedy", "comedy"),
+ Genre("Cooking", "cooking"),
+ 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("Gore", "gore"),
+ Genre("Harem", "harem"),
+ Genre("Historical", "historical"),
+ Genre("Horror", "horror"),
+ Genre("Isekai", "isekai"),
+ Genre("Josei", "josei"),
+ Genre("Magic", "magic"),
+ Genre("Manga", "manga"),
+ Genre("Manhua", "manhua"),
+ Genre("Manhwa", "manhwa"),
+ Genre("Martial Arts", "martial-arts"),
+ Genre("Mature", "mature"),
+ Genre("Mecha", "mecha"),
+ Genre("Medical", "medical"),
+ Genre("Military", "military"),
+ Genre("Music", "music"),
+ Genre("Mystery", "mystery"),
+ Genre("One Shot", "one-shot"),
+ Genre("Oneshot", "oneshot"),
+ Genre("Parody", "parody"),
+ Genre("Police", "police"),
+ Genre("Psychological", "psychological"),
+ Genre("Romance", "romance"),
+ Genre("Samurai", "samurai"),
+ Genre("School", "school"),
+ Genre("School Life", "school-life"),
+ Genre("Sci-fi", "sci-fi"),
+ Genre("Seinen", "seinen"),
+ Genre("Shoujo", "shoujo"),
+ Genre("Shoujo Ai", "shoujo-ai"),
+ Genre("Shounen", "shounen"),
+ Genre("Shounen Ai", "shounen-ai"),
+ 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("Yuri", "yuri")
+ )
+
+ private open class UriPartFilter(displayName: String, val vals: Array>) :
+ Filter.Select(displayName, vals.map { it.first }.toTypedArray()) {
+ fun toUriPart() = vals[state].second
+ }
+}