Merge branch 'recloudstream:master' into master

(may fix building)

.github/workflows/build_to_archive.yml

@@ -1,76 +0,0 @@
-name: Archive build
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '*.md'
-      - '*.json'
-      - '**/wcokey.txt'
-  workflow_dispatch:
-
-concurrency: 
-  group: "Archive-build"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v1
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/secrets"
-    - name: Generate access token (archive)
-      id: generate_archive_token
-      uses: tibdex/github-app-token@v1
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Fetch keystore
-      id: fetch_keystore
-      run: |
-        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
-        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
-        KEY_PWD="$(cat keystore_password.txt)"
-        echo "::add-mask::${KEY_PWD}"
-        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
-    - name: Run Gradle
-      run: |
-        ./gradlew assemblePrerelease
-      env:
-        SIGNING_KEY_ALIAS: "key0"
-        SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-    - uses: actions/checkout@v3
-      with:
-        repository: "recloudstream/cloudstream-archive"
-        token: ${{ steps.generate_archive_token.outputs.token }}
-        path: "archive"
-
-    - name: Move build
-      run: |
-        cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
-    
-    - name: Push archive
-      run: |
-        cd $GITHUB_WORKSPACE/archive
-        git config --local user.email "actions@github.com"
-        git config --local user.name "GitHub Actions"
-        git add .
-        git commit --amend -m "Build $GITHUB_SHA" || exit 0   # do not error if nothing to commit
-        git push --force

.github/workflows/generate_dokka.yml

@@ -1,71 +0,0 @@
-name: Dokka
-
-# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
-concurrency: 
-  group: "dokka"
-  cancel-in-progress: true
-
-on:
-  push:
-    branches:
-      # choose your default branch
-      - master
-      - main
-    paths-ignore:
-      - '*.md'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Generate access token
-        id: generate_token
-        uses: tibdex/github-app-token@v1
-        with:
-          app_id: ${{ secrets.GH_APP_ID }}
-          private_key: ${{ secrets.GH_APP_KEY }}
-          repository: "recloudstream/dokka"
-      - name: Checkout
-        uses: actions/checkout@master
-        with:
-          path: "src"
-
-      - name: Checkout dokka
-        uses: actions/checkout@master
-        with:
-          repository: "recloudstream/dokka"
-          path: "dokka"
-          token: ${{ steps.generate_token.outputs.token }}
-      
-      - name: Clean old builds
-        run: |
-          cd $GITHUB_WORKSPACE/dokka/
-          rm -rf "./-cloudstream"
-
-      - name: Setup JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
-      - name: Generate Dokka
-        run: |
-          cd $GITHUB_WORKSPACE/src/
-          chmod +x gradlew
-          ./gradlew app:dokkaHtml
-
-      - name: Copy Dokka
-        run: |
-          cp -r $GITHUB_WORKSPACE/src/app/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
-
-      - name: Push builds
-        run: |
-          cd $GITHUB_WORKSPACE/dokka
-          touch .nojekyll
-          git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
-          git config --local user.name "recloudstream[bot]"
-          git add .
-          git commit --amend -m "Generate dokka for recloudstream/cloudstream@${GITHUB_SHA}" || exit 0   # do not error if nothing to commit
-          git push --force

.github/workflows/prerelease.yml

@@ -8,7 +8,7 @@ on:
       - '*.json'
       - '**/wcokey.txt'
 
-concurrency: 
+concurrency:
   group: "pre-release"
   cancel-in-progress: true
 
@@ -16,46 +16,39 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v1
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/secrets"
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Fetch keystore
-      id: fetch_keystore
-      run: |
-        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
-        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
-        KEY_PWD="$(cat keystore_password.txt)"
-        echo "::add-mask::${KEY_PWD}"
-        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
-    - name: Run Gradle
-      run: |
-        ./gradlew assemblePrerelease makeJar androidSourcesJar
-      env:
-        SIGNING_KEY_ALIAS: "key0"
-        SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-    - name: Create pre-release
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "pre-release"
-        prerelease: true
-        title: "Pre-release Build"
-        files: |
-          app/build/outputs/apk/prerelease/release/*.apk
-          app/build/libs/app-sources.jar
-          app/build/classes.jar
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Fetch keystore
+        id: fetch_keystore
+        run: |
+          TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
+          mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
+          curl -H "Authorization: token ${{ secrets.PAT }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/KillerDogeEmpire/secrets/master/keystore.jks"
+          curl -H "Authorization: token ${{ secrets.PAT }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/KillerDogeEmpire/secrets/master/keystore_password.txt"
+          KEY_PWD="$(cat keystore_password.txt)"
+          echo "::add-mask::${KEY_PWD}"
+          echo "::set-output name=key_pwd::$KEY_PWD"
+      - name: Run Gradle
+        run: |
+          ./gradlew assemblePrerelease makeJar androidSourcesJar
+        env:
+          SIGNING_KEY_ALIAS: "key10"
+          SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+          SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+      - name: Create pre-release
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "pre-release"
+          prerelease: true
+          title: "Pre-release Build"
+          files: |
+            app/build/outputs/apk/prerelease/release/*.apk
+            app/build/libs/app-sources.jar
+            app/build/classes.jar

.github/workflows/update_locales.yml

@@ -1,42 +0,0 @@
-name: Fix locale issues
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - '**.xml'
-    branches:
-      - master
-
-concurrency: 
-  group: "locale"
-  cancel-in-progress: true
-
-jobs:
-  create:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v1
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/cloudstream"
-    - uses: actions/checkout@v2
-      with:
-        token: ${{ steps.generate_token.outputs.token }}
-    - name: Install dependencies
-      run: |
-        pip3 install lxml
-    - name: Edit files
-      run: |
-        python3 .github/locales.py
-    - name: Commit to the repo
-      run: |
-        git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
-        git config --local user.name "recloudstream[bot]"
-        git add .
-        # "echo" returns true so the build succeeds, even if no changed files
-        git commit -m 'chore(locales): fix locale issues' || echo
-        git push

.idea/.name

@@ -1 +0,0 @@
-CloudStream

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
-</project>
+</project>

.idea/gradle.xml

@@ -8,7 +8,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

README.md

@@ -1,9 +1,9 @@
-# CloudStream
+# AquaStream
 
 **⚠️ Warning: By default this app doesn't provide any video sources, you have to install extensions in order to add functionality to the app.**
 
 
-[![Discord](https://invidget.switchblade.xyz/5Hus6fM)](https://discord.gg/5Hus6fM)
+[![Discord](https://invidget.switchblade.xyz/4uAZXt97pG)](https://discord.gg/4uAZXt97pG)
 
 ### Features:
 + **AdFree**, No ads whatsoever

app/build.gradle.kts

@@ -19,7 +19,7 @@ fun String.execute() = ByteArrayOutputStream().use { baot ->
             workingDir = projectDir
             commandLine = this@execute.split(Regex("\\s"))
             standardOutput = baot
-    }.exitValue == 0)
+        }.exitValue == 0)
         String(baot.toByteArray()).trim()
     else null
 }
@@ -43,12 +43,12 @@ android {
     buildToolsVersion = "30.0.3"
 
     defaultConfig {
-        applicationId = "com.lagradost.cloudstream3"
+        applicationId = "com.killerdogeempire.aquastream"
         minSdk = 21
         targetSdk = 33
 
         versionCode = 59
-        versionName = "4.0.1"
+        versionName = "1.0.7"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
 
@@ -255,4 +255,4 @@ tasks.withType<DokkaTask>().configureEach {
             }
         }
     }
-}
+}

app/src/debug/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">CloudStream Debug</string>
+    <string name="app_name">AquaStream Debug</string>
 </resources>

app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt

@@ -228,13 +228,16 @@ object CommonActivity {
         val currentOverlayTheme =
             when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
                 "Normal" -> R.style.OverlayPrimaryColorNormal
+                "DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow
                 "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
+                "Orange" -> R.style.OverlayPrimaryColorOrange
                 "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
                 "Maroon" -> R.style.OverlayPrimaryColorMaroon
                 "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
                 "Grey" -> R.style.OverlayPrimaryColorGrey
-                "White" -> R.style.OverlayPrimaryColorWhite
+                "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
                 "Brown" -> R.style.OverlayPrimaryColorBrown
+                "Blue" -> R.style.OverlayPrimaryColorBlue
                 "Purple" -> R.style.OverlayPrimaryColorPurple
                 "Green" -> R.style.OverlayPrimaryColorGreen
                 "GreenApple" -> R.style.OverlayPrimaryColorGreenApple

app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt

@@ -31,8 +31,8 @@ import java.io.InputStreamReader
 
 class InAppUpdater {
     companion object {
-        const val GITHUB_USER_NAME = "recloudstream"
-        const val GITHUB_REPO = "cloudstream"
+        const val GITHUB_USER_NAME = "KillerDogeEmpire"
+        const val GITHUB_REPO = "AquaStream"
 
         const val LOG_TAG = "InAppUpdater"
 

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,60 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:name="vector">
-  <group android:scaleX="0.1755477"
-      android:scaleY="0.1755477"
-      android:translateX="29.16"
-      android:translateY="29.16">
-      <path android:name="path"
-            android:pathData="M 245.05 148.63 C 242.249 148.627 239.463 149.052 236.79 149.89 C 235.151 141.364 230.698 133.63 224.147 127.931 C 217.597 122.233 209.321 118.893 200.65 118.45 C 195.913 105.431 186.788 94.458 174.851 87.427 C 162.914 80.396 148.893 77.735 135.21 79.905 C 121.527 82.074 109.017 88.941 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.615 148.64 23.582 151.553 18.403 156.733 C 13.223 161.912 10.31 168.945 10.31 176.27 C 10.31 183.595 13.223 190.628 18.403 195.807 C 23.582 200.987 30.615 203.9 37.94 203.9 L 245.05 203.9 C 252.375 203.9 259.408 200.987 264.587 195.807 C 269.767 190.628 272.68 183.595 272.68 176.27 C 272.68 168.945 269.767 161.912 264.587 156.733 C 259.408 151.553 252.375 148.64 245.05 148.64 Z"
-            android:strokeWidth="1"
-            tools:ignore="VectorPath">
-          <aapt:attr name="android:fillColor">
-              <gradient
-                      android:startY="0"
-                      android:startX="200"
-                      android:endY="0"
-                      android:endX="300"
-                      android:type="linear">
-                  <item android:offset="0" android:color="#2309db"/>
-                  <item android:offset="1" android:color="#1B08A1"/>
-              </gradient>
-          </aapt:attr>
-      </path>
-
-      <path android:name="path_1" android:pathData="M 208.61 125 C 208.61 123.22 208.55 121.45 208.48 119.69 C 205.919 119.01 203.296 118.595 200.65 118.45 C 195.913 105.431 186.788 94.458 174.851 87.427 C 162.914 80.396 148.893 77.735 135.21 79.905 C 121.527 82.074 109.017 88.941 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.615 148.64 23.582 151.553 18.403 156.733 C 13.223 161.912 10.31 168.945 10.31 176.27 C 10.31 183.595 13.223 190.628 18.403 195.807 C 23.582 200.987 30.615 203.9 37.94 203.9 L 179 203.9 C 198.116 182.073 208.646 154.015 208.61 125 Z"
-            android:strokeWidth="1">
-      <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="0"
-                  android:startX="200"
-                  android:endY="0"
-                  android:endX="000"
-                  android:type="linear">
-              <item android:offset="0" android:color="#254cdb"/>
-              <item android:offset="1" android:color="#1138DD"/>
-          </gradient>
-      </aapt:attr>
-      </path>
-
-      <path android:name="path_2" android:pathData="M 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.783 148.665 23.909 151.471 18.779 156.461 C 13.648 161.452 10.653 168.246 10.43 175.399 C 10.207 182.553 12.773 189.52 17.583 194.82 C 22.392 200.121 29.079 203.349 36.22 203.82 C 67.216 202.93 96.673 189.98 118.284 167.742 C 139.895 145.504 151.997 115.689 152 84.68 C 152 83 151.94 81.33 151.87 79.68 C 149.443 79.361 146.998 79.194 144.55 79.18 C 136.095 79.171 127.735 80.962 120.026 84.434 C 112.317 87.907 105.435 92.982 99.84 99.32 Z"
-             android:strokeWidth="1">
-      <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="0"
-                  android:startX="150"
-                  android:endY="0"
-                  android:endX="000"
-                  android:type="linear">
-              <item android:offset="0" android:color="#407EF1"/>
-              <item android:offset="1" android:color="#428CC5"/>
-          </gradient>
-      </aapt:attr>
-  </path>
-  </group>
-</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_cloudstream_monochrome"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_cloudstream_monochrome"/>
 </adaptive-icon>

app/src/main/res/values-es/array.xml

@@ -195,6 +195,7 @@
     <string-array name="themes_overlay_names">
         <item>Normal</item>
         <item>Rosa clavel</item>
+        <item>Naranja</item>
         <item>Verde oscuro</item>
         <item>Vino</item>
         <item>Azul marino</item>
@@ -215,6 +216,7 @@
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>

app/src/main/res/values-pl/array.xml

@@ -204,6 +204,7 @@
     <string-array name="themes_overlay_names">
         <item>Normalny</item>
         <item>Goździk różowy</item>
+        <item>Pomarańczowy</item>
         <item>Ciemnozielony</item>
         <item>Kasztanowaty</item>
         <item>Ciemnoniebieski</item>
@@ -224,6 +225,7 @@
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>

app/src/main/res/values-tr/array.xml

@@ -230,6 +230,7 @@
     <string-array name="themes_overlay_names">
         <item>Normal</item>
         <item>Karanfil Pembesi</item>
+        <item>Portakal</item>
         <item>Koyu Yeşil</item>
         <item>Kestane</item>
         <item>Lacivert</item>
@@ -250,6 +251,7 @@
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>

app/src/main/res/values-vi/array.xml

@@ -196,6 +196,7 @@
     <string-array name="themes_overlay_names">
         <item>Mặc định</item>
         <item>Hồng nhạt</item>
+        <item>Quả cam</item>
         <item>Xanh lam đậm</item>
         <item>Nâu sẫm</item>
         <item>Xanh lục</item>
@@ -216,6 +217,7 @@
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>

app/src/main/res/values/array.xml

@@ -239,12 +239,14 @@
 
     <string-array name="themes_overlay_names">
         <item>Normal</item>
+        <item>Dandelion Yellow</item>
         <item>Carnation Pink</item>
+        <item>Orange</item>
         <item>Dark Green</item>
         <item>Maroon</item>
         <item>Navy Blue</item>
         <item>Grey</item>
-        <item>White</item>
+        <item>Cool Blue</item>
         <item>Brown</item>
         <item>Cool</item>
         <item>Fire</item>
@@ -259,12 +261,14 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>DandelionYellow</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>
         <item>Grey</item>
-        <item>White</item>
+        <item>CoolBlue</item>
         <item>Brown</item>
         <item>Blue</item>
         <item>Red</item>

app/src/main/res/values/colors.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3d50fa</color>
+    <color name="colorPrimary">#cccccc</color>
     <color name="colorPrimarySecond">@color/colorPrimary</color>
     <color name="colorSearch">#303135</color> <!--#3444D1 @color/itemBackground-->
     <color name="colorOngoing">#F53B66</color> <!--FF8181-->
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#3b65f5</color> <!-- 818fff-->
+    <color name="colorPrimaryDark">#a3a3a3</color>
+    <color name="colorAccent">#cccccc</color> <!-- 818fff-->
 
     <color name="primaryGrayBackground">#2B2C30</color> <!--0f0f10 0E0E10 303135 2B2C30-->
     <color name="primaryBlackBackground">#111111</color> <!--1C1C20 191a1f 19181E 202125 1C1C20-->
@@ -28,12 +28,12 @@
 
     <color name="progressBackgroundColor">#1AFFFFFF</color>
 
-    <color name="dubColorText">#121950</color> <!--3b65f5 f18c82 8294F1-->
+    <color name="dubColorText">#ffffff</color> <!--3b65f5 f18c82 8294F1-->
     <color name="amoledModeLight">#121213</color>
 
-    <color name="dubColorBg">#3B65F5</color>
-    <color name="subColorText">#571711</color> <!--F53B66 FA3D79-->
-    <color name="subColorBg">#F53B66</color>
+    <color name="dubColorBg">#12204e</color>
+    <color name="subColorText">#ffffff</color> <!--F53B66 FA3D79-->
+    <color name="subColorBg">#3e0e1a</color>
     <color name="typeColorText">#BEC8FF</color>
     <color name="typeColorBg">?attr/colorPrimaryDark</color>
     <color name="ratingColor">#4C3115</color>
@@ -80,9 +80,11 @@
     <color name="colorPrimaryMaroon">#451010</color>
     <color name="colorPrimaryNavyBlue">#000080</color>
     <color name="colorPrimaryGrey">#515151</color>
-    <color name="colorPrimaryWhite">#FFFFFF</color>
+    <color name="colorPrimaryCoolBlue">#408cac</color>
     <color name="colorPrimaryBrown">#622C00</color>
+    <color name="colorPrimaryOrange">#CE8500</color>
+    <color name="colorPrimaryDandelionYellow">#F5BB00</color>
 
     <color name="colorTestPass">#48E484</color>
     <color name="colorTestFail">#ea596e</color>
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -46,7 +46,7 @@
     <string name="dns_key" translatable="false">dns_key</string>
     <string name="jsdelivr_proxy_key" translatable="false">jsdelivr_proxy_key</string>
     <string name="download_path_key" translatable="false">download_path_key</string>
-    <string name="app_name_download_path" translatable="false">Cloudstream</string>
+    <string name="app_name_download_path" translatable="false">AquaStream</string>
     <string name="app_layout_key" translatable="false">app_layout_key</string>
     <string name="primary_color_key" translatable="false">primary_color_key</string>
     <string name="restore_key" translatable="false">restore_key</string>
@@ -99,8 +99,8 @@
     <string name="new_update_format" formatted="true">New update found!\n%s -&gt; %s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
-    <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">Play with CloudStream</string>
+    <string name="app_name">AquaStream</string>
+    <string name="play_with_app_name">Play with AquaStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Search</string>
     <string name="title_downloads">Downloads</string>
@@ -261,6 +261,7 @@
     <string name="lightnovel">Light novel app by the same devs</string>
     <string name="anim">Anime app by the same devs</string>
     <string name="discord">Join Discord</string>
+    <string name="discord_fork">Please Join My Fork\'s Discord. You can suggest new features. (It will also help me out alot)</string>
     <string name="benene">Give a benene to the devs</string>
     <string name="benene_des">Given benene</string>
     <string name="app_language">App Language</string>
@@ -402,14 +403,14 @@
 
         The app is purely for educational and personal use.
 
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
+        AquaStream does not host any content on the app, and has no control over what media is put up or taken down.
+        AquaStream functions like any other search engine, such as Google. AquaStream does not host, upload or
         manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
         user-friendly interface.
 
         It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
         responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
+        AquaStream at your own risk.
     </string>
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="pref_category_links">Links</string>
@@ -578,7 +579,7 @@
     <string name="plugins_disabled" formatted="true">Disabled: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Not downloaded: %d</string>
     <string name="plugins_updated" formatted="true">Updated %d plugins</string>
-    <string name="blank_repo_message">CloudStream has no sites installed by default. You need to install the sites from repositories.
+    <string name="blank_repo_message">AquaStream has no sites installed by default. You need to install the sites from repositories.
 \n
 \nBecause of a brainless DMCA takedown by Sky UK Limited 🤮 we cannot link the repository site in app.
 \n

app/src/main/res/values/styles.xml

@@ -315,14 +315,14 @@
         <item name="android:colorAccent">@color/colorPrimaryGrey</item>
     </style>
 
-    <style name="OverlayPrimaryColorWhite">
-        <item name="colorPrimary">@color/colorPrimaryWhite</item>
-        <item name="android:colorPrimary">@color/colorPrimaryWhite</item>
-        <item name="colorPrimaryDark">#CCCCCC</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="colorOnPrimary">@color/blackText</item>
-        <!--   Needed for leanback fuckery   -->
-        <item name="android:colorAccent">@color/colorPrimaryWhite</item>
+    <style name="OverlayPrimaryColorCoolBlue">
+        <item name="colorPrimary">@color/colorPrimaryCoolBlue</item>
+        <item name="android:colorPrimary">@color/colorPrimaryCoolBlue</item>
+        <item name="colorPrimaryDark">#306981</item>
+        <item name="colorAccent">#51b0d7</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
+        <!--    Needed for leanback fuckery    -->
+        <item name="android:colorAccent">@color/colorPrimaryCoolBlue</item>
     </style>
 
     <style name="OverlayPrimaryColorBrown">
@@ -335,6 +335,26 @@
         <item name="android:colorAccent">@color/colorPrimaryBrown</item>
     </style>
 
+    <style name="OverlayPrimaryColorOrange">
+        <item name="colorPrimary">@color/colorPrimaryOrange</item>
+        <item name="android:colorPrimary">@color/colorPrimaryOrange</item>
+        <item name="colorPrimaryDark">#A66B00</item>
+        <item name="colorAccent">#CE8500</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
+        <!--    Needed for leanback fuckery    -->
+        <item name="android:colorAccent">@color/colorPrimaryOrange</item>
+    </style>
+
+    <style name="OverlayPrimaryColorDandelionYellow">
+        <item name="colorPrimary">@color/colorPrimaryDandelionYellow</item>
+        <item name="android:colorPrimary">@color/colorPrimaryDandelionYellow</item>
+        <item name="colorPrimaryDark">#C49600</item>
+        <item name="colorAccent">#F5BB00</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
+        <!--    Needed for leanback fuckery    -->
+        <item name="android:colorAccent">@color/colorPrimaryDandelionYellow</item>
+    </style>
+
     <style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar">
 
         <item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item>

app/src/main/res/xml/settings_player.xml

@@ -72,7 +72,7 @@
             android:icon="@drawable/ic_baseline_speed_24"
             android:summary="@string/eigengraumode_settings_des"
             android:title="@string/eigengraumode_settings"
-            app:defaultValue="false"
+            app:defaultValue="true"
             app:key="@string/playback_speed_enabled_key" />
         <SwitchPreference
             android:icon="@drawable/ic_baseline_skip_next_24"
@@ -94,7 +94,7 @@
             android:icon="@drawable/ic_baseline_ondemand_video_24"
             android:summary="@string/swipe_to_seek_settings_des"
             android:title="@string/swipe_to_seek_settings"
-            app:defaultValue="true"
+            app:defaultValue="false"
             app:key="@string/swipe_enabled_key" />
         <SwitchPreference
             android:icon="@drawable/ic_baseline_ondemand_video_24"
@@ -106,7 +106,7 @@
             android:icon="@drawable/ic_baseline_touch_app_24"
             android:summary="@string/double_tap_to_seek_settings_des"
             android:title="@string/double_tap_to_seek_settings"
-            app:defaultValue="false"
+            app:defaultValue="true"
             app:key="@string/double_tap_enabled_key" />
         <SwitchPreference
             android:icon="@drawable/netflix_pause"

app/src/main/res/xml/settins_general.xml

@@ -1,20 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <Preference
         android:key="@string/locale_key"
         android:title="@string/app_language"
         android:icon="@drawable/ic_baseline_language_24" />
 
     <Preference
-            android:key="@string/download_path_key"
-            android:title="@string/download_path_pref"
-            android:icon="@drawable/netflix_download" />
+        android:key="@string/override_site_key"
+        android:title="@string/add_site_pref"
+        android:summary="@string/add_site_summary"
+        android:icon="@drawable/ic_baseline_add_24" />
 
     <Preference
-            android:key="@string/legal_notice_key"
-            android:title="@string/legal_notice"
-            android:icon="@drawable/ic_baseline_warning_24" />
+        android:key="@string/dns_key"
+        android:title="@string/dns_pref"
+        android:summary="@string/dns_pref_summary"
+        android:icon="@drawable/ic_baseline_dns_24" />
+
+    <Preference
+        android:key="@string/download_path_key"
+        android:title="@string/download_path_pref"
+        android:icon="@drawable/netflix_download" />
+
+    <Preference
+        android:key="@string/legal_notice_key"
+        android:title="@string/legal_notice"
+        android:icon="@drawable/ic_baseline_warning_24" />
 
     <Preference
         android:key="@string/benene_count"
@@ -23,26 +35,26 @@
         app:summary="@string/benene_des" />
 
     <PreferenceCategory
-            android:title="@string/pref_category_bypass">
+        android:title="@string/pref_category_bypass">
 
         <Preference
-                android:key="@string/override_site_key"
-                android:title="@string/add_site_pref"
-                android:summary="@string/add_site_summary"
-                android:icon="@drawable/ic_baseline_add_24" />
+            android:key="@string/override_site_key"
+            android:title="@string/add_site_pref"
+            android:summary="@string/add_site_summary"
+            android:icon="@drawable/ic_baseline_add_24" />
 
         <Preference
-                android:key="@string/dns_key"
-                android:title="@string/dns_pref"
-                android:summary="@string/dns_pref_summary"
-                android:icon="@drawable/ic_baseline_dns_24" />
+            android:key="@string/dns_key"
+            android:title="@string/dns_pref"
+            android:summary="@string/dns_pref_summary"
+            android:icon="@drawable/ic_baseline_dns_24" />
 
         <SwitchPreference
-                android:defaultValue="false"
-                android:icon="@drawable/ic_github_logo"
-                android:key="@string/jsdelivr_proxy_key"
-                android:title="@string/jsdelivr_proxy"
-                android:summary="@string/jsdelivr_proxy_summary" />
+            android:defaultValue="false"
+            android:icon="@drawable/ic_github_logo"
+            android:key="@string/jsdelivr_proxy_key"
+            android:title="@string/jsdelivr_proxy"
+            android:summary="@string/jsdelivr_proxy_summary" />
 
     </PreferenceCategory>
 
@@ -50,30 +62,55 @@
             android:title="@string/pref_category_links">
 
         <Preference
-                android:title="@string/github"
-                android:icon="@drawable/ic_github_logo"
-                app:summary="https://github.com/recloudstream/cloudstream">
+            android:title="@string/github"
+            android:icon="@drawable/ic_github_logo"
+            app:summary="https://github.com/KillerDogeEmpire/AquaStream">
             <intent
-                    android:action="android.intent.action.VIEW"
-                    android:data="https://github.com/recloudstream/cloudstream" />
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/KillerDogeEmpire/AquaStream" />
         </Preference>
 
         <Preference
-                android:title="@string/lightnovel"
-                android:icon="@drawable/quick_novel_icon"
-                app:summary="https://github.com/LagradOst/QuickNovel">
+            android:title="Main App"
+            android:icon="@drawable/ic_github_logo"
+            app:summary="https://github.com/recloudstream/cloudstream">
             <intent
-                    android:action="android.intent.action.VIEW"
-                    android:data="https://github.com/LagradOst/QuickNovel" />
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/recloudstream/cloudstream" />
+        </Preference>
+
+        <Preference
+            android:title="@string/lightnovel"
+            android:icon="@drawable/quick_novel_icon"
+            app:summary="https://github.com/KillerDogeEmpire/QuickNovel">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/KillerDogeEmpire/QuickNovel" />
         </Preference>
         <Preference
-                android:title="@string/discord"
-                android:icon="@drawable/ic_baseline_discord_24"
-                app:summary="https://discord.gg/5Hus6fM">
+            android:title="Main Quick Novel"
+            android:icon="@drawable/quick_novel_icon"
+            app:summary="https://github.com/LagradOst/QuickNovel">
             <intent
-                    android:action="android.intent.action.VIEW"
-                    android:data="https://discord.gg/5Hus6fM" />
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/LagradOst/QuickNovel" />
         </Preference>
-    
+        <Preference
+            android:title="@string/discord_fork"
+            android:icon="@drawable/ic_baseline_discord_24"
+            app:summary="https://discord.gg/4uAZXt97pG">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://discord.gg/4uAZXt97pG" />
+        </Preference>
+        <Preference
+            android:title="@string/discord"
+            android:icon="@drawable/ic_baseline_discord_24"
+            app:summary="https://discord.gg/5Hus6fM">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://discord.gg/5Hus6fM" />
+        </Preference>
+
     </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>

app/src/main/res/xml/settins_ui.xml

@@ -50,13 +50,13 @@
                 android:key="@string/show_fillers_key"
                 android:icon="@drawable/ic_baseline_skip_next_24"
                 android:title="@string/show_fillers_settings"
-                android:defaultValue="false" />
+                android:defaultValue="true" />
         <SwitchPreference
                 android:icon="@drawable/ic_baseline_play_arrow_24"
                 app:key="@string/random_button_key"
                 android:title="@string/random_button_settings"
                 android:summary="@string/random_button_settings_desc"
-                app:defaultValue="false" />
+                app:defaultValue="true" />
         <Preference
             android:icon="@drawable/ic_baseline_filter_list_24"
             android:key="@string/pref_filter_search_quality_key"

app/src/prerelease/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,60 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:name="vector">
-  <group android:scaleX="0.1755477"
-      android:scaleY="0.1755477"
-      android:translateX="29.16"
-      android:translateY="29.16">
-      <path android:name="path"
-            android:pathData="M 245.05 148.63 C 242.249 148.627 239.463 149.052 236.79 149.89 C 235.151 141.364 230.698 133.63 224.147 127.931 C 217.597 122.233 209.321 118.893 200.65 118.45 C 195.913 105.431 186.788 94.458 174.851 87.427 C 162.914 80.396 148.893 77.735 135.21 79.905 C 121.527 82.074 109.017 88.941 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.615 148.64 23.582 151.553 18.403 156.733 C 13.223 161.912 10.31 168.945 10.31 176.27 C 10.31 183.595 13.223 190.628 18.403 195.807 C 23.582 200.987 30.615 203.9 37.94 203.9 L 245.05 203.9 C 252.375 203.9 259.408 200.987 264.587 195.807 C 269.767 190.628 272.68 183.595 272.68 176.27 C 272.68 168.945 269.767 161.912 264.587 156.733 C 259.408 151.553 252.375 148.64 245.05 148.64 Z"
-            android:strokeWidth="1"
-            tools:ignore="VectorPath">
-          <aapt:attr name="android:fillColor">
-              <gradient
-                      android:startY="0"
-                      android:startX="200"
-                      android:endY="0"
-                      android:endX="300"
-                      android:type="linear">
-                  <item android:offset="0" android:color="#DB0909"/>
-                  <item android:offset="1" android:color="#A10808"/>
-              </gradient>
-          </aapt:attr>
-      </path>
-
-      <path android:name="path_1" android:pathData="M 208.61 125 C 208.61 123.22 208.55 121.45 208.48 119.69 C 205.919 119.01 203.296 118.595 200.65 118.45 C 195.913 105.431 186.788 94.458 174.851 87.427 C 162.914 80.396 148.893 77.735 135.21 79.905 C 121.527 82.074 109.017 88.941 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.615 148.64 23.582 151.553 18.403 156.733 C 13.223 161.912 10.31 168.945 10.31 176.27 C 10.31 183.595 13.223 190.628 18.403 195.807 C 23.582 200.987 30.615 203.9 37.94 203.9 L 179 203.9 C 198.116 182.073 208.646 154.015 208.61 125 Z"
-            android:strokeWidth="1">
-      <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="0"
-                  android:startX="200"
-                  android:endY="0"
-                  android:endX="000"
-                  android:type="linear">
-              <item android:offset="0" android:color="#E23A3A"/>
-              <item android:offset="1" android:color="#DD1130"/>
-          </gradient>
-      </aapt:attr>
-      </path>
-
-      <path android:name="path_2" android:pathData="M 99.84 99.32 C 89.871 95.945 79.051 96.024 69.133 99.545 C 59.215 103.065 50.765 109.826 45.155 118.73 C 39.545 127.634 37.094 138.174 38.2 148.64 L 37.94 148.64 C 30.783 148.665 23.909 151.471 18.779 156.461 C 13.648 161.452 10.653 168.246 10.43 175.399 C 10.207 182.553 12.773 189.52 17.583 194.82 C 22.392 200.121 29.079 203.349 36.22 203.82 C 67.216 202.93 96.673 189.98 118.284 167.742 C 139.895 145.504 151.997 115.689 152 84.68 C 152 83 151.94 81.33 151.87 79.68 C 149.443 79.361 146.998 79.194 144.55 79.18 C 136.095 79.171 127.735 80.962 120.026 84.434 C 112.317 87.907 105.435 92.982 99.84 99.32 Z"
-             android:strokeWidth="1">
-      <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="0"
-                  android:startX="150"
-                  android:endY="0"
-                  android:endX="000"
-                  android:type="linear">
-              <item android:offset="0" android:color="#E44D4D"/>
-              <item android:offset="1" android:color="#E76161"/>
-          </gradient>
-      </aapt:attr>
-  </path>
-  </group>
-</vector>

app/src/prerelease/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_cloudstream_monochrome"/>
 </adaptive-icon>

app/src/prerelease/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_cloudstream_monochrome"/>
 </adaptive-icon>

app/src/prerelease/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">CloudStream Beta</string>
+    <string name="app_name">AquaStream Beta</string>
 </resources>