diff --git a/README.md b/README.md index cd35e26..8b0a689 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - `patches` Модули патчей - `utils` Вспомогательные модули - `tools` Инструменты для модификации -- `patches/resources` Ресурсы, используемые патчами +- `resources` Ресурсы, используемые патчами - `todo_drafts` Заметки для новых патчей(можно в любом формате) ### Схема diff --git a/patches/compress.py b/patches/compress.py index 8711ef3..0ea85a5 100644 --- a/patches/compress.py +++ b/patches/compress.py @@ -104,7 +104,7 @@ def compress_png_files(config): def remove_AI_voiceover(config): - blank = "./patches/resources/blank.mp3" + blank = "./resources/blank.mp3" path = "./decompiled/res/raw" files = [ "reputation_1.mp3", diff --git a/patches/insert_new.py b/patches/insert_new.py index 0a430ea..ce24cf0 100644 --- a/patches/insert_new.py +++ b/patches/insert_new.py @@ -17,31 +17,20 @@ from utils.public import insert_after_public # Patch def apply(config: dict) -> bool: # Mod first launch window + shutil.copy("./resources/avatar.png", "./decompiled/assets/avatar.png") + shutil.copy( + "./resources/OpenSans-Regular.ttf", + "./decompiled/assets/OpenSans-Regular.ttf", + ) shutil.copytree( - "./patches/resources/smali_classes4/", "./decompiled/smali_classes4/" + "./resources/smali_classes4/", "./decompiled/smali_classes4/" ) # Mod assets - shutil.copy("./patches/resources/avatar.png", "./decompiled/assets/avatar.png") shutil.copy( - "./patches/resources/OpenSans-Regular.ttf", - "./decompiled/assets/OpenSans-Regular.ttf", - ) - shutil.copy( - "./patches/resources/ic_custom_crown.xml", - "./decompiled/res/drawable/ic_custom_crown.xml", - ) - shutil.copy( - "./patches/resources/ic_custom_telegram.xml", - "./decompiled/res/drawable/ic_custom_telegram.xml", - ) - shutil.copy( - "./patches/resources/ytsans_medium.ttf", + "./resources/ytsans_medium.ttf", "./decompiled/res/font/ytsans_medium.ttf", ) os.remove("./decompiled/res/font/ytsans_medium.otf") - insert_after_public("warning_error_counter_background", "ic_custom_telegram") - insert_after_public("warning_error_counter_background", "ic_custom_crown") - return True diff --git a/patches/settings_urls.py b/patches/settings_urls.py index 6a5de96..66ec52f 100644 --- a/patches/settings_urls.py +++ b/patches/settings_urls.py @@ -24,7 +24,9 @@ priority = 0 # imports +import shutil from lxml import etree +from utils.public import insert_after_public # Patch @@ -48,6 +50,18 @@ def make_category(ns, name, items): return cat def apply(config: dict) -> bool: + shutil.copy( + "./resources/ic_custom_crown.xml", + "./decompiled/res/drawable/ic_custom_crown.xml", + ) + insert_after_public("warning_error_counter_background", "ic_custom_crown") + + shutil.copy( + "./resources/ic_custom_telegram.xml", + "./decompiled/res/drawable/ic_custom_telegram.xml", + ) + insert_after_public("warning_error_counter_background", "ic_custom_telegram") + file_path = "./decompiled/res/xml/preference_main.xml" parser = etree.XMLParser(remove_blank_text=True) tree = etree.parse(file_path, parser) diff --git a/patches/resources/OpenSans-Regular.ttf b/resources/OpenSans-Regular.ttf similarity index 100% rename from patches/resources/OpenSans-Regular.ttf rename to resources/OpenSans-Regular.ttf diff --git a/patches/resources/avatar.png b/resources/avatar.png similarity index 100% rename from patches/resources/avatar.png rename to resources/avatar.png diff --git a/patches/resources/blank.mp3 b/resources/blank.mp3 similarity index 100% rename from patches/resources/blank.mp3 rename to resources/blank.mp3 diff --git a/patches/resources/ic_custom_crown.xml b/resources/ic_custom_crown.xml similarity index 100% rename from patches/resources/ic_custom_crown.xml rename to resources/ic_custom_crown.xml diff --git a/patches/resources/ic_custom_telegram.xml b/resources/ic_custom_telegram.xml similarity index 100% rename from patches/resources/ic_custom_telegram.xml rename to resources/ic_custom_telegram.xml diff --git a/patches/resources/smali_classes4/com/swiftsoft/about/$1.smali b/resources/smali_classes4/com/swiftsoft/about/$1.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/about/$1.smali rename to resources/smali_classes4/com/swiftsoft/about/$1.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/about/$2.smali b/resources/smali_classes4/com/swiftsoft/about/$2.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/about/$2.smali rename to resources/smali_classes4/com/swiftsoft/about/$2.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/about/$3.smali b/resources/smali_classes4/com/swiftsoft/about/$3.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/about/$3.smali rename to resources/smali_classes4/com/swiftsoft/about/$3.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/about/$4.smali b/resources/smali_classes4/com/swiftsoft/about/$4.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/about/$4.smali rename to resources/smali_classes4/com/swiftsoft/about/$4.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/authorization/AutoLogin.smali b/resources/smali_classes4/com/swiftsoft/authorization/AutoLogin.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/authorization/AutoLogin.smali rename to resources/smali_classes4/com/swiftsoft/authorization/AutoLogin.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/authorization/FirebaseDB.smali b/resources/smali_classes4/com/swiftsoft/authorization/FirebaseDB.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/authorization/FirebaseDB.smali rename to resources/smali_classes4/com/swiftsoft/authorization/FirebaseDB.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/authorization/Login.smali b/resources/smali_classes4/com/swiftsoft/authorization/Login.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/authorization/Login.smali rename to resources/smali_classes4/com/swiftsoft/authorization/Login.smali diff --git a/patches/resources/smali_classes4/com/swiftsoft/authorization/SaveLoginLocal.smali b/resources/smali_classes4/com/swiftsoft/authorization/SaveLoginLocal.smali similarity index 100% rename from patches/resources/smali_classes4/com/swiftsoft/authorization/SaveLoginLocal.smali rename to resources/smali_classes4/com/swiftsoft/authorization/SaveLoginLocal.smali diff --git a/patches/resources/ytsans_medium.ttf b/resources/ytsans_medium.ttf similarity index 100% rename from patches/resources/ytsans_medium.ttf rename to resources/ytsans_medium.ttf