update to 18.9.0

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       # set env variables
       - name: set variables
         run: |
-          echo "APK_URL https://www.dropbox.com/scl/fi/8m7pwt6nk1y6qm05e39cg/twitch-18.0.0.apk\?rlkey=amczmm56hkmp5cbd2blwjb6bw\&st=c8ic93h1\&dl=1" >> $GITHUB_ENV
+          echo "APK_URL https://www.dropbox.com/scl/fi/1fglq3uupo5j87ox7v3e0/twitch-18.9.0.apk\?rlkey=tjw6kdq0ynplycprjbtgr1u2a\&st=cce58kkj\&dl=1" >> $GITHUB_ENV
 
       # get keystore.kjs from secret
       - name: create keystore.kjs from secret

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 
 # master
-- rebase to v17.0.0
+- rebase to v18.9.0
 
 # 0.41.0-beta
 - rebase to v16.9.1

README.md

@@ -45,7 +45,7 @@ A mod of the Twitch Android Mobile<sup><a href="#no-tv">1</a></sup> App adding B
 
 # Build it yourself
 
-> This patch is meant to be applied to version **18.0.0** of the official twitch app
+> This patch is meant to be applied to version **18.9.0** of the official twitch app
 > Make sure you use this version before you create an issue!
 
 ## Easy way: Docker
@@ -128,7 +128,7 @@ Made with ♥️ by [@FoseFx](https://github.com/FoseFx) and contributors. MIT L
 [license-badge]: https://img.shields.io/github/license/bttv-android/bttv?style=flat-square
 [license-file]: ./LICENSE
 [bttv-version]: https://img.shields.io/github/v/release/bttv-android/bttv?style=flat-square
-[base-version]: https://img.shields.io/badge/build%20on-v18.0.0-blueviolet?style=flat-square
+[base-version]: https://img.shields.io/badge/build%20on-v18.9.0-blueviolet?style=flat-square
 [downloads-latest]: https://img.shields.io/github/downloads/bttv-android/bttv/latest/total?color=yellow&style=flat-square
 [downloads-total]: https://img.shields.io/github/downloads/bttv-android/bttv/total?color=yellowgreen&label=downloads%20total&style=flat-square
 [latest-release]: https://github.com/bttv-android/bttv/releases/latest

patches/AndroidManifest.xml.patch

@@ -6,8 +6,8 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
 +<?xml version="1.0" encoding="utf-8" standalone="no"?>
 +<manifest
 +    xmlns:android="http://schemas.android.com/apk/res/android"
-+    android:versionCode="${BTTVVERSIONCODE}"
-+    android:versionName="${BTTVVERSION}"
++    android:versionCode="01208000334"
++    android:versionName="0.41.0-beta"
 +    android:compileSdkVersion="34"
 +    android:compileSdkVersionCodename="14"
 +    android:installLocation="auto"

patches/ui/res.layout.settings_logout_footer.xml.patch

@@ -5,7 +5,7 @@ diff --git a/res/layout/settings_logout_footer.xml b/res/layout/settings_logout_
  <LinearLayout android:orientation="vertical" android:id="@id/settings_logout_footer" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true"
    xmlns:android="http://schemas.android.com/apk/res/android">
      <ImageView android:layout_gravity="center_horizontal" android:id="@id/app_settings_amazon_company_logo" android:padding="@dimen/default_margin" android:layout_width="fill_parent" android:layout_height="@dimen/settings_footer_amazon_logo_size" android:src="@drawable/ic_an_amazon_company" android:contentDescription="@string/amazon_logo_content_description" />
-+    <TextView android:textColor="@color/text_alt" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="BTTV ${BTTVVERSION}" />
++    <TextView android:textColor="@color/text_alt" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="BTTV 0.41.0-beta" />
      <TextView android:textColor="@color/text_alt" android:gravity="center" android:id="@id/app_settings_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/version_label" />
      <TextView android:textColor="@color/text_alt" android:gravity="center" android:id="@id/app_settings_build_date" android:layout_width="fill_parent" android:layout_height="wrap_content" />
      <FrameLayout android:id="@id/app_settings_logout_button" android:background="@drawable/settings_logout_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_margin">