Add Hachirumi and Guya deeplink optimization (#7642)

* Added Hachirumi

* Delete multisrc/overrides/guya/guya/src directory

* Delete AndroidManifest.xml

* Delete multisrc/overrides/guya/dankefurslesen/src directory

* Delete AndroidManifest.xml

* Delete AndroidManifest.xml

* Delete multisrc/overrides/guya/coloredcouncil/src directory

* Add Icons and AndroidManifest

* Add files via upload

* Changed pathPattern to work with Hachirumi

* Add NSFW flag

multisrc/overrides/guya/coloredcouncil/src/ColoredCouncil.kt

@@ -1,11 +0,0 @@
-package eu.kanade.tachiyomi.extension.en.coloredcouncil
-
-import eu.kanade.tachiyomi.multisrc.guya.Guya
-
-class ColoredCouncil : Guya("Colored Council", "https://coloredcouncil.moe", "en") {
-    companion object {
-        const val SLUG_PREFIX = "slug:"
-        const val PROXY_PREFIX = "proxy:"
-        const val NESTED_PROXY_API_PREFIX = "/proxy/api/"
-    }
-}

multisrc/overrides/guya/coloredcouncil/src/ColoredCouncilUrlActivity.kt

@@ -1,57 +0,0 @@
-package eu.kanade.tachiyomi.extension.en.coloredcouncil
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import kotlin.system.exitProcess
-
-/**
- * Accepts https://danke.moe/read/manga/xyz intents
- *
- * Added due to requests from various users to allow for opening of titles when given the
- * Guya URL whilst on mobile.
- */
-class ColoredCouncilUrlActivity : Activity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val host = intent?.data?.host
-        val pathSegments = intent?.data?.pathSegments
-
-        if (host != null && pathSegments != null) {
-            val query = fromColoredCouncil(pathSegments)
-
-            if (query == null) {
-                Log.e("ColoredCouncilUrlActivity", "Unable to parse URI from intent $intent")
-                finish()
-                exitProcess(1)
-            }
-
-            val mainIntent = Intent().apply {
-                action = "eu.kanade.tachiyomi.SEARCH"
-                putExtra("query", query)
-                putExtra("filter", packageName)
-            }
-
-            try {
-                startActivity(mainIntent)
-            } catch (e: ActivityNotFoundException) {
-                Log.e("ColoredCouncilUrlActivity", e.toString())
-            }
-        }
-
-        finish()
-        exitProcess(0)
-    }
-
-    private fun fromColoredCouncil(pathSegments: MutableList<String>): String? {
-        return if (pathSegments.size >= 3) {
-            val slug = pathSegments[2]
-            "${ColoredCouncil.SLUG_PREFIX}$slug"
-        } else {
-            null
-        }
-    }
-}

multisrc/overrides/guya/dankefurslesen/AndroidManifest.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi.extension">
-
-    <application>
-        <activity
-            android:name=".en.dankefurslesen.DankeFursLesenUrlActivity"
-            android:excludeFromRecents="true"
-            android:theme="@android:style/Theme.NoDisplay">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="danke.moe"
-                    android:pathPattern="/read/manga/..*"
-                    android:scheme="https" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

multisrc/overrides/guya/dankefurslesen/src/DankeFursLesen.kt

@@ -1,11 +0,0 @@
-package eu.kanade.tachiyomi.extension.en.dankefurslesen
-
-import eu.kanade.tachiyomi.multisrc.guya.Guya
-
-class DankeFursLesen : Guya("Danke fürs Lesen", "https://danke.moe", "en") {
-    companion object {
-        const val SLUG_PREFIX = "slug:"
-        const val PROXY_PREFIX = "proxy:"
-        const val NESTED_PROXY_API_PREFIX = "/proxy/api/"
-    }
-}

multisrc/overrides/guya/dankefurslesen/src/DankeFursLesenUrlActivity.kt

@@ -1,57 +0,0 @@
-package eu.kanade.tachiyomi.extension.en.dankefurslesen
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import kotlin.system.exitProcess
-
-/**
- * Accepts https://danke.moe/read/manga/xyz intents
- *
- * Added due to requests from various users to allow for opening of titles when given the
- * Guya URL whilst on mobile.
- */
-class DankeFursLesenUrlActivity : Activity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val host = intent?.data?.host
-        val pathSegments = intent?.data?.pathSegments
-
-        if (host != null && pathSegments != null) {
-            val query = fromDankeFursLesen(pathSegments)
-
-            if (query == null) {
-                Log.e("DankeFursLesenUrlActivity", "Unable to parse URI from intent $intent")
-                finish()
-                exitProcess(1)
-            }
-
-            val mainIntent = Intent().apply {
-                action = "eu.kanade.tachiyomi.SEARCH"
-                putExtra("query", query)
-                putExtra("filter", packageName)
-            }
-
-            try {
-                startActivity(mainIntent)
-            } catch (e: ActivityNotFoundException) {
-                Log.e("DankeFursLesenUrlActivity", e.toString())
-            }
-        }
-
-        finish()
-        exitProcess(0)
-    }
-
-    private fun fromDankeFursLesen(pathSegments: MutableList<String>): String? {
-        return if (pathSegments.size >= 3) {
-            val slug = pathSegments[2]
-            "${DankeFursLesen.SLUG_PREFIX}$slug"
-        } else {
-            null
-        }
-    }
-}

multisrc/overrides/guya/default/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <application>
         <activity
-            android:name=".en.coloredcouncil.ColoredCouncilUrlActivity"
+            android:name="eu.kanade.tachiyomi.multisrc.guya.GuyaUrlActivity"
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
@@ -12,11 +12,10 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
-                    android:host="coloredcouncil.moe"
+                    android:host="${SOURCEHOST}"
-                    android:pathPattern="/read/manga/..*"
+                    android:pathPattern="/.*/.*/..*"
-                    android:scheme="https" />
+                    android:scheme="${SOURCESCHEME}" />
             </intent-filter>
         </activity>
     </application>

multisrc/overrides/guya/guya/AndroidManifest.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi.extension">
-
-    <application>
-        <activity
-            android:name=".en.guya.GuyaUrlActivity"
-            android:excludeFromRecents="true"
-            android:theme="@android:style/Theme.NoDisplay">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="guya.moe"
-                    android:pathPattern="/read/manga/..*"
-                    android:scheme="https" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

multisrc/overrides/guya/guya/src/Guya.kt

@@ -1,11 +0,0 @@
-package eu.kanade.tachiyomi.extension.en.guya
-
-import eu.kanade.tachiyomi.multisrc.guya.Guya
-
-class Guya : Guya("Guya", "https://guya.moe", "en"){
-    companion object {
-        const val SLUG_PREFIX = "slug:"
-        const val PROXY_PREFIX = "proxy:"
-        const val NESTED_PROXY_API_PREFIX = "/proxy/api/"
-    }
-}

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt

@@ -15,6 +15,7 @@ class GuyaGenerator : ThemeSourceGenerator {
         SingleLang("Guya", "https://guya.moe", "en", overrideVersionCode = 18),
         SingleLang("Danke fürs Lesen", "https://danke.moe", "en", className = "DankeFursLesen"),
         SingleLang("Colored Council", "https://coloredcouncil.moe", "en"),
+        SingleLang("Hachirumi", "https://hachirumi.com", "en", isNsfw = true),
     )
     companion object {
         @JvmStatic

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaUrlActivity.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.extension.en.guya
+package eu.kanade.tachiyomi.multisrc.guya
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -8,7 +8,7 @@ import android.util.Log
 import kotlin.system.exitProcess
 
 /**
- * Accepts https://guya.moe/read/manga/xyz intents
+ * Accepts $baseURL/read/manga/xyz intents
  *
  * Added due to requests from various users to allow for opening of titles when given the
  * Guya URL whilst on mobile.