diff --git a/src/ru/unicomics/AndroidManifest.xml b/src/ru/unicomics/AndroidManifest.xml
new file mode 100644
index 000000000..974551024
--- /dev/null
+++ b/src/ru/unicomics/AndroidManifest.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ru/unicomics/build.gradle b/src/ru/unicomics/build.gradle
new file mode 100644
index 000000000..db6b78f81
--- /dev/null
+++ b/src/ru/unicomics/build.gradle
@@ -0,0 +1,11 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+ extName = 'UniComics'
+ pkgNameSuffix = 'ru.unicomics'
+ extClass = '.UniComics'
+ extVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/ru/unicomics/res/mipmap-hdpi/ic_launcher.png b/src/ru/unicomics/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..b7966fa88
Binary files /dev/null and b/src/ru/unicomics/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/ru/unicomics/res/mipmap-mdpi/ic_launcher.png b/src/ru/unicomics/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c11c68ce3
Binary files /dev/null and b/src/ru/unicomics/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/ru/unicomics/res/mipmap-xhdpi/ic_launcher.png b/src/ru/unicomics/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..fe9603f23
Binary files /dev/null and b/src/ru/unicomics/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/ru/unicomics/res/mipmap-xxhdpi/ic_launcher.png b/src/ru/unicomics/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6f2652e12
Binary files /dev/null and b/src/ru/unicomics/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/ru/unicomics/res/mipmap-xxxhdpi/ic_launcher.png b/src/ru/unicomics/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..cee145142
Binary files /dev/null and b/src/ru/unicomics/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/ru/unicomics/res/web_hi_res_512.png b/src/ru/unicomics/res/web_hi_res_512.png
new file mode 100644
index 000000000..68dcb34e7
Binary files /dev/null and b/src/ru/unicomics/res/web_hi_res_512.png differ
diff --git a/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt
new file mode 100644
index 000000000..424b066d9
--- /dev/null
+++ b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt
@@ -0,0 +1,167 @@
+package eu.kanade.tachiyomi.extension.ru.unicomics
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.MangasPage
+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 eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import rx.Observable
+
+class UniComics : ParsedHttpSource() {
+
+ override val name = "UniComics"
+
+ override val baseUrl = "https://unicomics.ru"
+
+ override val lang = "ru"
+
+ override val supportsLatest = true
+
+ override fun headersBuilder(): Headers.Builder = Headers.Builder()
+ .add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.50")
+ .add("Referer", baseUrl)
+
+ override fun popularMangaRequest(page: Int): Request =
+ GET("$baseUrl/comics/series/page/$page", headers)
+
+ override fun latestUpdatesRequest(page: Int): Request =
+ GET("$baseUrl/comics/online/page/$page", headers)
+
+ override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request = throw UnsupportedOperationException("Поиск только через браузер. Открывается в приложении через «СЕРИИ»(не отдельная глава)")
+ override fun searchMangaFromElement(element: Element): SManga = throw UnsupportedOperationException("Not used")
+ override fun searchMangaSelector() = throw UnsupportedOperationException("Not used")
+ private fun searchMangaByIdRequest(id: String): Request {
+ return GET("$baseUrl$PATH_URL$id", headers)
+ }
+
+ override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable {
+ return if (query.startsWith(PREFIX_SLUG_SEARCH)) {
+ val realQuery = query.removePrefix(PREFIX_SLUG_SEARCH)
+ client.newCall(searchMangaByIdRequest(realQuery))
+ .asObservableSuccess()
+ .map { response ->
+ val details = mangaDetailsParse(response)
+ details.url = realQuery
+ MangasPage(listOf(details), false)
+ }
+ } else {
+ client.newCall(searchMangaRequest(page, query, filters))
+ .asObservableSuccess()
+ .map { response ->
+ searchMangaParse(response)
+ }
+ }
+ }
+
+ override fun popularMangaSelector() = "div.list_comics"
+
+ override fun latestUpdatesSelector() = popularMangaSelector()
+
+ override fun popularMangaFromElement(element: Element): SManga {
+ val manga = SManga.create()
+ manga.thumbnail_url = element.select(".left_comics img").first().attr("src").replace(".jpg", "_big.jpg")
+ element.select("a").first().let {
+ manga.setUrlWithoutDomain(it.attr("href").substringAfter(PATH_URL))
+ }
+ manga.title = element.select(".list_title_en").first().text()
+ return manga
+ }
+ override fun popularMangaParse(response: Response): MangasPage {
+ val document = response.asJsoup()
+
+ val mangas = document.select(popularMangaSelector()).map { element ->
+ popularMangaFromElement(element)
+ }
+ return MangasPage(mangas, true)
+ }
+
+ override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
+ override fun latestUpdatesParse(response: Response): MangasPage = popularMangaParse(response)
+
+ override fun popularMangaNextPageSelector(): String? = null
+
+ override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
+
+ override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
+
+ override fun mangaDetailsRequest(manga: SManga): Request {
+ return GET(baseUrl + PATH_URL + manga.url, headers)
+ }
+
+ override fun mangaDetailsParse(document: Document): SManga = SManga.create().apply {
+ val infoElement = document.select(".block.left.common").first()
+ url = document.location().substringAfter(PATH_URL)
+ title = infoElement.select("h2").first().text()
+ thumbnail_url = infoElement.select("img").first().attr("src")
+ description = infoElement.select("p").last()?.text()
+ author = infoElement.select("tr:contains(Издательство)").text()
+ genre = infoElement.select("tr:contains(Жанр) a").joinToString { it.text() }
+ }
+
+ override fun fetchChapterList(manga: SManga): Observable> {
+ val document = client.newCall(GET(baseUrl + PATH_URL + manga.url, headers)).execute().asJsoup()
+ val pages = mutableListOf(1)
+ val dataStrArray = document.toString()
+ .substringAfter("new Paginator(")
+ .substringBefore(");")
+ .split(", ")
+ if (dataStrArray[1].toInt() > 1) {
+ pages += (2..dataStrArray[1].toInt()).toList()
+ }
+ return Observable.just(
+ pages.flatMap { page ->
+ chapterListParse(client.newCall(chapterPageListRequest(manga, page)).execute(), manga)
+ }.reversed()
+ )
+ }
+ private fun chapterListParse(response: Response, manga: SManga): List {
+ val document = response.asJsoup()
+ return document.select(chapterListSelector()).map { chapterFromElement(it) }
+ }
+ private fun chapterPageListRequest(manga: SManga, page: Int): Request {
+ return GET("$baseUrl$PATH_URL${manga.url}/page/$page", headers)
+ }
+
+ override fun chapterListSelector() = "div.right_comics"
+
+ override fun chapterFromElement(element: Element): SChapter {
+ val urlElement = element.select(".button.online a").first()
+ val chapter = SChapter.create()
+ element.select(".list_title").first().text().let {
+ chapter.name = it
+ if (it.contains(" №")) {
+ chapter.name = it.substringAfterLast(" ")
+ chapter.chapter_number = it.substringAfter(" №").toFloatOrNull() ?: -1f
+ }
+ }
+ chapter.setUrlWithoutDomain(urlElement.attr("href"))
+ return chapter
+ }
+
+ override fun pageListParse(document: Document): List {
+ val dataStrArray = document.toString()
+ .substringAfter("new Paginator(")
+ .substringBefore(");")
+ .split(", ")
+ return (1..dataStrArray[1].toInt()).mapIndexed { i, page ->
+ Page(i, document.location() + "/$page")
+ }
+ }
+ override fun imageUrlParse(document: Document): String {
+ return document.select("#b_image").attr("src")
+ }
+
+ companion object {
+ const val PREFIX_SLUG_SEARCH = "slug:"
+ private const val PATH_URL = "/comics/series/"
+ }
+}
diff --git a/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComicsActivity.kt b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComicsActivity.kt
new file mode 100644
index 000000000..addf7f0af
--- /dev/null
+++ b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComicsActivity.kt
@@ -0,0 +1,40 @@
+package eu.kanade.tachiyomi.extension.ru.unicomics
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import kotlin.system.exitProcess
+/**
+ * Springboard that accepts https://unicomics.ru/comics/series/xxx intents and redirects them to
+ * the main tachiyomi process. The idea is to not install the intent filter unless
+ * you have this extension installed, but still let the main tachiyomi app control
+ * things.
+ */
+class UniComicsActivity : Activity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ val pathSegments = intent?.data?.pathSegments
+ if (pathSegments != null && pathSegments.size > 2) {
+ val titleid = pathSegments[2]
+ val mainIntent = Intent().apply {
+ action = "eu.kanade.tachiyomi.SEARCH"
+ putExtra("query", "${UniComics.PREFIX_SLUG_SEARCH}$titleid")
+ putExtra("filter", packageName)
+ }
+
+ try {
+ startActivity(mainIntent)
+ } catch (e: ActivityNotFoundException) {
+ Log.e("UniComicsActivity", e.toString())
+ }
+ } else {
+ Log.e("UniComicsActivity", "could not parse uri from intent $intent")
+ }
+
+ finish()
+ exitProcess(0)
+ }
+}