diff --git a/BUILDING.md b/BUILDING.md index 5c92a3d..84e7886 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -21,7 +21,6 @@ CTCCI requires python3.6+, and also likely requires Linux (I haven't tried it on #### Initial setup - Follow the "Toolchain setup" steps above in case you haven't already. -- Install dependencies (`python3 -m pip install -Ur requirements.txt`) - Copy `ctcci/ctcconfig.example.py` to `ctcci/ctcconfig.py` and configure contents to your local data and your personal preferences. - If you don't want to always automatically be required to use the latest discord version, edit the `$REPO_FOLDER/patchport-state.json` file. - Set up a local distok-style file storage for your APKs, and copy your APKs on it, and name them properly (the format is `$DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk`, example: `/home/ave/distok/android/com.discord-909.apk`). @@ -61,11 +60,11 @@ To get the diff, run `diff -crB -x "dist" -x "res/raw" -x "build" CleanFolder Pa #### Porting patches -You can use `patchport.py` to easily attempt to port patches. This is what I use to port between every single version. +You can use `patchport.py` to easily attempt to port patches. This is what I use to port between every single version. Note that while CTCCI requires python3.6+, `patchport.py` requires python3.7+. It's not really intelligent and doesn't do much more than manually preparing necessary patch, checking if an existing patch can be applied to a given version, replacing relevant variables required for porting various patches and eliminating offsets caused by updates, but it saves a lot of time if used carefully. -Example command: `python3 patchport.py /home/ave/workbench/ctc/com.discord-968` +Example command: `python3.7 patchport.py /home/ave/workbench/ctc/com.discord-968` #### Figuring out which patch is causing your build to break diff --git a/README.md b/README.md index e1b29e6..661a1bf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 53.0 (1356), released on 2020-12-13. +**Latest supported Discord Android version:** 56.0 (1371), released on 2021-01-05. New patch development will be done for the latest supported version. diff --git a/ctcci/.gitignore b/ctcci/.gitignore index 88dab90..2246658 100644 --- a/ctcci/.gitignore +++ b/ctcci/.gitignore @@ -1 +1,2 @@ -ctcconfig.py \ No newline at end of file +ctcconfig.py +__pycache__ \ No newline at end of file diff --git a/patches/betterdmheader/1358.patch b/patches/betterdmheader/1358.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1358.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1361.patch b/patches/betterdmheader/1361.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1361.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1362.patch b/patches/betterdmheader/1362.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1362.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1365.patch b/patches/betterdmheader/1365.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1365.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1367.patch b/patches/betterdmheader/1367.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1367.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1368.patch b/patches/betterdmheader/1368.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1368.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1370.patch b/patches/betterdmheader/1370.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1370.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1371.patch b/patches/betterdmheader/1371.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1371.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md index 7810c7f..dc52b81 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -41,4 +41,536 @@ This patch replaces the call button on DM headers with search button. The call b - 49.13 - 52.3 - 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 diff --git a/patches/betterrotation/1358.patch b/patches/betterrotation/1358.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1358.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1361.patch b/patches/betterrotation/1361.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1361.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1362.patch b/patches/betterrotation/1362.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1362.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1365.patch b/patches/betterrotation/1365.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1365.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1367.patch b/patches/betterrotation/1367.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1367.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1368.patch b/patches/betterrotation/1368.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1368.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1370.patch b/patches/betterrotation/1370.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1370.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1371.patch b/patches/betterrotation/1371.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1371.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/README.md b/patches/betterrotation/README.md index b0fac2e..06af3bb 100644 --- a/patches/betterrotation/README.md +++ b/patches/betterrotation/README.md @@ -8,4 +8,536 @@ Contributed by [clienthax](https://gitdab.com/clienthax). - 49.13 - 52.3 - 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 diff --git a/patches/bettertmlight/bettertm.sh b/patches/bettertmlight/bettertm.sh deleted file mode 120000 index 504e2d9..0000000 --- a/patches/bettertmlight/bettertm.sh +++ /dev/null @@ -1 +0,0 @@ -../bettertm/bettertm.sh \ No newline at end of file diff --git a/patches/bettertmlight/bettertm.sh b/patches/bettertmlight/bettertm.sh new file mode 100644 index 0000000..756d8ac --- /dev/null +++ b/patches/bettertmlight/bettertm.sh @@ -0,0 +1,3 @@ +#!/bin/bash +\cp "$1/emoji_2122_fe0f.png" res/raw/emoji_2122_fe0f.png +\cp "$1/emoji_ae_fe0f.png" res/raw/emoji_ae_fe0f.png diff --git a/patches/branding/1358.patch b/patches/branding/1358.patch new file mode 100644 index 0000000..8b96c72 --- /dev/null +++ b/patches/branding/1358.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1358' +! versionName: '53.1' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1358CTCBUILD' +! versionName: '53.1-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1361.patch b/patches/branding/1361.patch new file mode 100644 index 0000000..21675e5 --- /dev/null +++ b/patches/branding/1361.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1361' +! versionName: '53.3' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1361CTCBUILD' +! versionName: '53.3-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1362.patch b/patches/branding/1362.patch new file mode 100644 index 0000000..00a8e73 --- /dev/null +++ b/patches/branding/1362.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1362' +! versionName: '54.0' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1362CTCBUILD' +! versionName: '54.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1365.patch b/patches/branding/1365.patch new file mode 100644 index 0000000..899aa17 --- /dev/null +++ b/patches/branding/1365.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1365' +! versionName: '53.6' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1365CTCBUILD' +! versionName: '53.6-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1367.patch b/patches/branding/1367.patch new file mode 100644 index 0000000..ab46d7f --- /dev/null +++ b/patches/branding/1367.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1367' +! versionName: '53.8' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1367CTCBUILD' +! versionName: '53.8-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1368.patch b/patches/branding/1368.patch new file mode 100644 index 0000000..c4b5538 --- /dev/null +++ b/patches/branding/1368.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-01-05 01:57:20.951907000 -0500 +--- to/AndroidManifest.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-01-05 00:52:08.987558100 -0500 +--- to/apktool.yml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 82,86 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1368' +! versionName: '54.0' +--- 82,86 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1368CTCBUILD' +! versionName: '54.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-01-05 00:48:45.334596200 -0500 +--- to/res/values/strings.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1626,1632 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1626,1632 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4637,4643 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4637,4643 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6394,6400 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6394,6400 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 00:49:39.819431100 -0500 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 00:50:28.766751400 -0500 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1370.patch b/patches/branding/1370.patch new file mode 100644 index 0000000..75036e0 --- /dev/null +++ b/patches/branding/1370.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-01-05 01:57:20.951907000 -0500 +--- to/AndroidManifest.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-01-05 00:52:08.987558100 -0500 +--- to/apktool.yml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 82,86 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1370' +! versionName: '55.1' +--- 82,86 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1370CTCBUILD' +! versionName: '55.1-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-01-05 00:48:45.334596200 -0500 +--- to/res/values/strings.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1626,1632 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1626,1632 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4637,4643 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4637,4643 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6394,6400 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6394,6400 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 00:49:39.819431100 -0500 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 00:50:28.766751400 -0500 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1371.patch b/patches/branding/1371.patch new file mode 100644 index 0000000..4999cf6 --- /dev/null +++ b/patches/branding/1371.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-01-05 01:57:20.951907000 -0500 +--- to/AndroidManifest.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-01-05 00:52:08.987558100 -0500 +--- to/apktool.yml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 82,86 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1371' +! versionName: '56.0' +--- 82,86 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1371CTCBUILD' +! versionName: '56.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-01-05 00:48:45.334596200 -0500 +--- to/res/values/strings.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1626,1632 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1626,1632 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4637,4643 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4637,4643 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6394,6400 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6394,6400 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 00:49:39.819431100 -0500 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 00:50:28.766751400 -0500 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/README.md b/patches/branding/README.md index e924283..a86ea19 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -222,4 +222,308 @@ You can use the following line to patch authorities: - 49.13 - 52.3 - 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 diff --git a/patches/customtheme/1358.patch b/patches/customtheme/1358.patch new file mode 100644 index 0000000..09fbad0 --- /dev/null +++ b/patches/customtheme/1358.patch @@ -0,0 +1,391 @@ +diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml +*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-12-13 04:52:09.201073466 +0000 +--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-12-13 04:52:26.076186978 +0000 +*************** +*** 1,6 **** + + +! + + +\ No newline at end of file +--- 1,6 ---- + + +! + + +\ No newline at end of file +diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml +*** from/res/drawable/drawable_circle_black.xml 2020-12-13 04:52:08.961140288 +0000 +--- to/res/drawable/drawable_circle_black.xml 2020-12-13 04:52:26.076186978 +0000 +*************** +*** 1,5 **** + + +! + +\ No newline at end of file +--- 1,5 ---- + + +! + +\ No newline at end of file +diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml +*** from/res/drawable/drawable_overlay_channels_active_dark.xml 2020-12-13 04:52:09.594965022 +0000 +--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-12-13 04:52:26.076186978 +0000 +*************** +*** 3,9 **** + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +--- 3,9 ---- + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +diff -crB from/res/layout/widget_chat_input.xml to/res/layout/widget_chat_input.xml +*** from/res/layout/widget_chat_input.xml 2020-12-13 04:52:09.660946856 +0000 +--- to/res/layout/widget_chat_input.xml 2020-12-13 04:52:26.076186978 +0000 +*************** +*** 7,13 **** + + + +! + + + +--- 7,13 ---- + + + +! + + + +*************** +*** 17,20 **** + + + +! +\ No newline at end of file +--- 17,20 ---- + + + +! +diff -crB from/res/values/colors.xml to/res/values/colors.xml +*** from/res/values/colors.xml 2020-12-13 04:52:10.452736607 +0000 +--- to/res/values/colors.xml 2020-12-13 04:52:26.076186978 +0000 +*************** +*** 107,116 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 +! #ff121212 + #ffcf6679 + #ffffffff + #ff000000 +--- 107,116 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 +! #ff000000 + #ffcf6679 + #ffffffff + #ff000000 +*************** +*** 122,128 **** + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff121212 + #ffffffff + #ffb00020 + #ff000000 +--- 122,128 ---- + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff000000 + #ffffffff + #ffb00020 + #ff000000 +*************** +*** 171,178 **** + #4d737f8d + #ff949494 + #0d4f545c +! #ff282b30 +! #ff8a8e94 + #6680cbc4 + #66009688 + #ff9c84ef +--- 171,178 ---- + #4d737f8d + #ff949494 + #0d4f545c +! #ff000000 +! #ff000000 + #6680cbc4 + #66009688 + #ff9c84ef +*************** +*** 182,188 **** + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +--- 182,188 ---- + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +*************** +*** 294,315 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 +! #ff292b2f +! #e6292b2f +! #ff202225 +! #80202225 +! #99202225 + #ff18191c + #8018191c + #9918191c +--- 294,315 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 +! #ff000000 +! #e6000000 +! #ff000000 +! #80000000 +! #990f0f0f + #ff18191c + #8018191c + #9918191c +*************** +*** 334,343 **** + #ff4f545c + #ff484c54 + #ff40444b +! #ff36393f +! #ff2f3136 + #ff292b2f +! #ff202225 + #ff1e1f22 + #ff1b1d20 + #ff18191c +--- 334,343 ---- + #ff4f545c + #ff484c54 + #ff40444b +! #ff000000 +! #ff000000 + #ff292b2f +! #ff000000 + #ff1e1f22 + #ff1b1d20 + #ff18191c +*************** +*** 381,389 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 381,389 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 518,524 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 518,524 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +diff -crB from/res/values/styles.xml to/res/values/styles.xml +*** from/res/values/styles.xml 2020-12-13 04:52:10.414746413 +0000 +--- to/res/values/styles.xml 2020-12-13 04:52:26.076186978 +0000 +*************** +*** 423,429 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 423,429 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 439,445 **** + #1afaa61a + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +! @color/primary_700 + @color/white_alpha_10 + @color/primary_600 + @drawable/img_empty_server_settings_emoji_dark +--- 439,445 ---- + #1afaa61a + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +! @color/primary_500 + @color/white_alpha_10 + @color/primary_600 + @drawable/img_empty_server_settings_emoji_dark +*************** +*** 677,686 **** + #ffe5e5e5 + @drawable/ic_img_selected_light_theme + @color/purple_brand +! #33faa61a + @drawable/drawable_bg_reaction_light + @drawable/drawable_reaction_text_color_light +! @color/primary_300 + @color/black_alpha_10 + @color/primary_300 + @drawable/img_empty_server_settings_emoji_light +--- 677,686 ---- + #ffe5e5e5 + @drawable/ic_img_selected_light_theme + @color/purple_brand +! @color/purple_brand_alpha_10 + @drawable/drawable_bg_reaction_light + @drawable/drawable_reaction_text_color_light +! @color/primary_500 + @color/black_alpha_10 + @color/primary_300 + @drawable/img_empty_server_settings_emoji_light +*************** +*** 784,790 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +