Merge pull request #91 from snehilrx/fix_url

Fix url

Author: snehilrx

app/build.gradle

@@ -79,6 +79,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$versions.work"
     implementation project(path: ':kickassanime')
     implementation 'com.google.firebase:firebase-perf:20.5.0'
+    implementation project(path: ':shinebar')
     androidTestImplementation "io.github.rascaler:assertj:$versions.assertJ"
     testImplementation "junit:junit:$versions.junit"
     androidTestImplementation "androidx.test.ext:junit:$versions.androidx_junit"

app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "210529357737",
+    "project_id": "fetch-kaa",
+    "storage_bucket": "fetch-kaa.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:210529357737:android:26cb4f33050ba558553eb8",
+        "android_client_info": {
+          "package_name": "com.otaku.fetch"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "210529357737-nfvrqu7uas8a5p2ehjpbrcna7128tnf0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD9ThkGRRDB_fb8Y1lO6F0Ba-hOb9qK_DQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "210529357737-nfvrqu7uas8a5p2ehjpbrcna7128tnf0.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/AndroidManifest.xml

@@ -17,6 +17,10 @@
             android:supportsRtl="true"
             android:theme="@style/Theme.KickassAnime"
             android:usesCleartextTraffic="true">
+        <profileable
+                android:shell="true"
+                tools:targetApi="q" />
+
         <activity
                 android:name=".MainActivity"
                 android:exported="true">

app/src/main/java/com/otaku/fetch/ModuleActivity.kt

@@ -3,6 +3,7 @@ package com.otaku.fetch
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -25,16 +26,19 @@ import com.otaku.fetch.base.settings.Settings
 import com.otaku.fetch.base.settings.dataStore
 import com.otaku.fetch.base.ui.BindingActivity
 import com.otaku.fetch.base.ui.SearchInterface
+import com.otaku.fetch.base.ui.ShineBarInterface
 import com.otaku.fetch.base.utils.UiUtils.statusBarHeight
 import com.otaku.fetch.databinding.ActivityModuleBinding
 import dagger.hilt.android.AndroidEntryPoint
+import io.github.snehilrx.shinebar.Shinebar
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
 
 @AndroidEntryPoint
 class ModuleActivity :
-    BindingActivity<ActivityModuleBinding>(R.layout.activity_module), SearchInterface {
+    BindingActivity<ActivityModuleBinding>(R.layout.activity_module), SearchInterface,
+    ShineBarInterface {
 
     inner class SearchComponents(
         val suggestionsList: RecyclerView,
@@ -44,12 +48,31 @@ class ModuleActivity :
 
     private lateinit var searchUi: SearchComponents
 
+    override val shinebar: Shinebar
+        get() = binding.shinebar
+
+    private fun setupShineBar(shinebar: Shinebar) {
+        val start = TypedValue()
+        val end = TypedValue()
+        theme?.resolveAttribute(
+            com.google.android.material.R.attr.colorPrimary,
+            start,
+            true
+        )
+        theme?.resolveAttribute(com.google.android.material.R.attr.colorAccent, end, true)
+        shinebar.apply {
+            setStartColor(start.data)
+            setEndColor(end.data)
+        }
+    }
+
     override fun onBind(binding: ActivityModuleBinding, savedInstanceState: Bundle?) {
         super.onBind(binding, savedInstanceState)
         initNavigationView()
         setTransparentStatusBar()
         initSearchView(binding)
         checkPermissions()
+        setupShineBar(shinebar)
     }
 
     private fun checkPermissions() {

app/src/main/res/layout-land/activity_module.xml

@@ -7,6 +7,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+        <io.github.snehilrx.shinebar.Shinebar
+                android:id="@+id/shinebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fitsSystemWindows="false" />
+
         <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/fragmentContainerView"
                 android:name="androidx.navigation.fragment.NavHostFragment"
@@ -22,12 +28,11 @@
         <com.google.android.material.navigationrail.NavigationRailView
                 android:id="@+id/railNavigation"
                 android:layout_gravity="bottom"
+                android:background="@android:color/transparent"
                 app:menuAlignmentMode="auto"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/cardview_margin"
-                android:paddingEnd="@dimen/cardview_margin"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_module.xml

@@ -8,6 +8,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+        <io.github.snehilrx.shinebar.Shinebar
+                android:id="@+id/shinebar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fitsSystemWindows="false" />
+
         <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/container"
                 android:fitsSystemWindows="false"

app/src/main/res/xml/network_security_config.xml

@@ -3,6 +3,7 @@
     <domain-config>
         <domain includeSubdomains="true">kaaplayer.com</domain>
         <domain includeSubdomains="true">kaas.am</domain>
+        <domain includeSubdomains="true">kickassanime.mx</domain>
         <domain includeSubdomains="true">localhost</domain>
     </domain-config>
 </network-security-config>

base/cloudflarebypass/src/main/java/com/fetch/cloudflarebypass/CloudflareInterceptor.kt

@@ -61,7 +61,7 @@ class CloudflareInterceptor(
      */
     private val headers = Headers.headersOf(
         "User-Agent",
-        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0",
+        "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1",
         "Upgrade-Insecure-Requests",
         "1",
         "Accept-Language",

base/src/main/java/com/otaku/fetch/base/di/modules/ApplicationModule.kt

@@ -53,15 +53,16 @@ object ApplicationModule {
             .header("origin", origin)
             .header(
                 "user-agent",
-                "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1"
+                "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1"
             )
             .method(original.method, original.body)
             .build()
 
         chain.proceed(request)
     }).callTimeout(4, TimeUnit.MINUTES)
         .connectTimeout(4, TimeUnit.MINUTES)
-        .addInterceptor(logger).build()
+        .addInterceptor(logger)
+        .build()
 
     private const val MAX_CACHE_SIZE: Long = 2000000000
 

base/src/main/java/com/otaku/fetch/base/download/DownloadScreens.kt

@@ -49,8 +49,7 @@ import kotlin.math.min
 @androidx.annotation.OptIn(UnstableApi::class)
 fun DownloadScreen(
     downloadsVM: DownloadViewModel,
-    statusBarHeight: Float? = null,
-    setupShineBar: (Shinebar) -> Unit = { _ -> run {} }
+    statusBarHeight: Float? = null
 ) {
 
     val items = downloadsVM.anime()
@@ -65,7 +64,6 @@ fun DownloadScreen(
                 downloadsVM.resume(context)
             }, isPaused = downloadsVM.isDownloadPaused)
         },
-        setupShineBar = setupShineBar
     ) {
         DownloadList(items.toItemTreeIndex(downloadsVM))
     }