Исправление создания релиза

settings_urls: ✔ enabled
  disable_ad: ✔ enabled
  disable_beta_banner: ✔ enabled
  insert_new: ✔ enabled
  color_theme: ✔ enabled
  change_server: ✘ disabled
  package_name: ✔ enabled
  replace_navbar: ✔ enabled
  compress: ✔ enabled, обновление описаний

.gitea/workflows/build.yml

@@ -1,7 +1,10 @@
-name: Build mod
+name: Сборка мода
 
 on:
   workflow_dispatch:
+  push:
+    tags:
+      - 'v*'
   #schedule:                 # раз в 36 часов
   #  - cron: "0 0 */3 * *"   # каждые 3 дня в 00:00
   #  - cron: "0 12 */3 * *"  # каждые 3 дня в 12:00
@@ -13,25 +16,25 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Download APK
+      - name: Скачивание APK
         run: |
           curl -L -o app.apk "https://mirror-dl.anixart-app.com/anixart-beta.apk"
 
-      - name: Ensure aapt is installed
+      - name: Проверка наличия aapt
         run: |
           if ! command -v aapt &> /dev/null; then
             echo "aapt не найден, устанавливаем..."
             sudo apt-get update && sudo apt-get install -y --no-install-recommends android-sdk-build-tools
           fi
 
-      - name: Ensure pngquant is installed
+      - name: Проверка наличия pngquant
         run: |
           if ! command -v pngquant &> /dev/null; then
             echo "pngquant не найден, устанавливаем..."
             sudo apt-get update && sudo apt-get install -y --no-install-recommends pngquant
           fi
 
-      - name: Export secrets
+      - name: Извлечение хранилища ключей
         env:
           KEYSTORE: ${{ secrets.KEYSTORE }}
           KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
@@ -40,7 +43,7 @@ jobs:
           echo "$KEYSTORE" | base64 -d > keystore.jks
           echo "$KEYSTORE_PASS" > keystore.pass
 
-      - name: Prepare to build APK
+      - name: Подготовка к модифицированию APK
         id: build
         run: |
           mkdir original
@@ -48,31 +51,39 @@ jobs:
           pip install -r ./requirements.txt --break-system-packages
           python ./main.py init
 
-      - name: Build APK
+      - name: Пересборка APK
         id: build
         run: |
           python ./main.py build -f
 
-      - name: Read title from report.log
+      - name: Чтение title из report.log
         id: get_title
         run: |
           TITLE=$(head -n 1 modified/report.log)
           echo "title=${TITLE}" >> $GITHUB_OUTPUT
 
-      - name: Setup go
+      - name: Чтение body из report.log
+        id: get_body
+        run: |
+          BODY=$(tail -n +2 modified/report.log)
+          echo "body<<EOF" >> $GITHUB_OUTPUT
+          echo "$BODY" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Установка go
         if: steps.build.outputs.BUILD_EXIT == '0'
         uses: actions/setup-go@v4
         with:
           go-version: '>=1.20'
 
-      - name: Make release
+      - name: Создание релиза
         if: steps.build.outputs.BUILD_EXIT == '0'
         uses: https://gitea.com/actions/release-action@main
         with:
           title: ${{ steps.get_title.outputs.title }}
-          body_path: modified/report.log
+          body: ${{ steps.get_body.outputs.body }}
           draft: true
           api_key: '${{secrets.RELEASE_TOKEN}}'
           files: |-
-            modified/**-mod.apk
+            modified/*-mod.apk
             modified/report.log

README.md

@@ -11,7 +11,7 @@
 - `patches` Модули патчей
 - `utils` Вспомогательные модули
 - `tools` Инструменты для модификации
-- `patches/resources` Ресурсы, используемые патчами
+- `resources` Ресурсы, используемые патчами
 - `todo_drafts` Заметки для новых патчей(можно в любом формате)
 
 ### Схема
@@ -52,7 +52,7 @@ flowchart TD
    git clone https://git.wowlikon.tech/anixart-mod/patcher.git
    ```
    Требования:
-   - Python 3.6+
+   - Python 3.8+
    - Java 8+
    - zipalign
    - apksigner
@@ -76,6 +76,6 @@ flowchart TD
 Этот проект лицензирован под лицензией MIT. См. [LICENSE](./LICENSE) для получения подробной информации.
 
 ### Вклад в проект:
-- Seele - Оригинальные патчи в начале разработки основаны на модификации от Seele [[GitHub](https://github.com/seeleme) | [Telegram](https://t.me/seele_off)]
+- [Kentai Radiquum](https://git.0x174.su/Radiquum) - Значительный вклад в развитие патчера, разработка [anix](https://github.com/AniX-org/AniX) и помощь с API [[GitHub](https://github.com/adiquum) | [Telegram](https://t.me/radiquum)]
-- Kentai Radiquum - Значительный вклад в развитие патчера, разработка [anix](https://github.com/AniX-org/AniX) и помощь с API [[GitHub](https://github.com/Radiquum) | [Telegram](https://t.me/radiquum)]
+- [Seele](https://git.0x174.su/seele_archive) - Оригинальные патчи в начале разработки основаны на модификации от Seele
-- ReCode Liner - Помощь в модификации приложения [[Telegram](https://t.me/recodius)]
+- [ReCode Liner](https://git.0x174.su/ReCodeLiner) - Помощь в изучении моддинга приложения [[Telegram](https://t.me/recodius)]

config.json

@@ -1,85 +1,12 @@
 {
+  "tools": {
+    "apktool_jar_url": "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.12.0.jar",
+    "apktool_wrapper_url": "https://raw.githubusercontent.com/iBotPeaches/Apktool/master/scripts/linux/apktool"
+  },
   "base": {
-    "tools": {
-      "apktool_jar_url": "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.12.0.jar",
-      "apktool_wrapper_url": "https://raw.githubusercontent.com/iBotPeaches/Apktool/master/scripts/linux/apktool"
-    },
     "xml_ns": {
       "android": "http://schemas.android.com/apk/res/android",
       "app": "http://schemas.android.com/apk/res-auto"
     }
-  },
-  "patches": {
-    "package_name": {
-      "new_package_name": "com.wowlikon.anixart"
-    },
-    "compress": {
-      "remove_language_files": true,
-      "remove_AI_voiceover": true,
-      "remove_debug_lines": true,
-      "remove_drawable_files": false,
-      "remove_unknown_files": true,
-      "remove_unknown_files_keep_dirs": ["META-INF", "kotlin"],
-      "compress_png_files": true
-    },
-    "change_server": {
-      "server": "https://anixarty.wowlikon.tech/modding"
-    },
-    "color_theme": {
-      "colors": {
-        "primary": "#ccff00",
-        "secondary": "#ffffd700",
-        "background": "#ffffff",
-        "text": "#000000"
-      },
-      "gradient": {
-        "angle": "135.0",
-        "from": "#ffff6060",
-        "to": "#ffccff00"
-      }
-    },
-    "replace_navbar": {
-      "items": ["home", "discover", "feed", "bookmarks", "profile"]
-    },
-    "custom_speed": {
-      "speeds": [9.0]
-    },
-    "settings_urls": {
-      "menu": {
-        "Мы в социальных сетях": [
-          {
-            "title": "wowlikon",
-            "description": "Разработчик",
-            "url": "https://t.me/wowlikon",
-            "icon": "@drawable/ic_custom_telegram",
-            "icon_space_reserved": "false"
-          },
-          {
-            "title": "Kentai Radiquum",
-            "description": "Разработчик",
-            "url": "https://t.me/radiquum",
-            "icon": "@drawable/ic_custom_telegram",
-            "icon_space_reserved": "false"
-          },
-          {
-            "title": "Мы в Telegram",
-            "description": "Подпишитесь на канал, чтобы быть в курсе последних новостей.",
-            "url": "https://t.me/http_teapod",
-            "icon": "@drawable/ic_custom_telegram",
-            "icon_space_reserved": "false"
-          }
-        ],
-        "Прочее": [
-          {
-            "title": "Помочь проекту",
-            "description": "Вы можете помочь нам в разработке мода, написании кода или тестировании.",
-            "url": "https://t.me/wowlikon",
-            "icon": "@drawable/ic_custom_crown",
-            "icon_space_reserved": "false"
-          }
-        ]
-      },
-      "version": " by wowlikon"
-    }
   }
 }

configs/change_server.json

@@ -0,0 +1 @@
+{"enabled":true,"server":"https://anixarty.0x174.su/patch"}

configs/color_theme.json

@@ -0,0 +1 @@
+{"enabled":true,"logo":{"gradient":{"angle":0.0,"start_color":"#ffccff00","end_color":"#ffcccc00"},"ears_color":"#ffd0d0d0"},"colors":{"primary":"#ccff00","secondary":"#ffcccc00","background":"#ffffff","text":"#000000"}}

configs/comment_vote.json

@@ -0,0 +1 @@
+{"enabled":true,"replace":true,"custom_icons":true,"icon_size":"18.0dip"}

configs/compress.json

@@ -0,0 +1 @@
+{"enabled":true,"remove_language_files":true,"remove_AI_voiceover":true,"remove_debug_lines":false,"remove_drawable_files":false,"remove_unknown_files":true,"remove_unknown_files_keep_dirs":["META-INF","kotlin"],"compress_png_files":true}

configs/disable_ad.json

@@ -0,0 +1 @@
+{"enabled":true}

configs/disable_beta_banner.json

@@ -0,0 +1 @@
+{"enabled":true}

configs/package_name.json

@@ -0,0 +1 @@
+{"enabled":true,"package_name":"com.wowlikon.anixart"}

configs/replace_navbar.json

@@ -0,0 +1 @@
+{"enabled":true,"items":["home","discover","feed","bookmarks","profile"]}

configs/selectable_text.json

@@ -0,0 +1 @@
+{"enabled":true}

configs/settings_urls.json

@@ -0,0 +1 @@
+{"enabled":true,"version":" by wowlikon","menu":{"Мы в социальных сетях":[{"title":"wowlikon","description":"Разработчик","url":"https://t.me/wowlikon","icon":"@drawable/ic_custom_telegram","icon_space_reserved":"false"},{"title":"Kentai Radiquum","description":"Разработчик","url":"https://t.me/radiquum","icon":"@drawable/ic_custom_telegram","icon_space_reserved":"false"},{"title":"Мы в Telegram","description":"Подпишитесь на канал, чтобы быть в курсе последних новостей.","url":"https://t.me/http_teapod","icon":"@drawable/ic_custom_telegram","icon_space_reserved":"false"}],"Прочее":[{"title":"Помочь проекту","description":"Вы можете помочь нам в разработке мода, написании кода или тестировании.","url":"https://git.wowlikon.tech/anixart-mod","icon":"@drawable/ic_custom_crown","icon_space_reserved":"false"}]}}

configs/share_links.json

@@ -0,0 +1 @@
+{"enabled":true,"format":{"share_channel_text":"Канал: «%1$s»\n%2$schannel/%3$d","share_collection_text":"Коллекция: «%1$s»\n%2$scollection/%3$d","share_profile_text":"Профиль пользователя «%1$s»\n%2$sprofile/%3$d","share_release_text":"Релиз: «%1$s»\n%2$srelease/%3$d"}}

configs/welcome.json

@@ -0,0 +1 @@
+{"enabled":true,"title":"Anixarty","description":"Описание","link_text":"МЫ В TELEGRAM","link_url":"https://t.me/http_teapod","skip_text":"Пропустить","title_bg_color":"#FFFFFF"}

main.py

@@ -1,107 +1,66 @@
-from pathlib import Path
+from typing import List, Dict, Any
-from typing import List
 
-import httpx
 import typer
 import importlib
 import traceback
 import yaml
 
-from pydantic import BaseModel, ValidationError
 from plumbum import local, ProcessExecutionError
 from rich.console import Console
 from rich.progress import Progress
 from rich.prompt import Prompt
-from rich.table import Table
 
-# --- Paths ---
+from utils.config import *
-TOOLS = Path("tools")
+from utils.tools import *
-ORIGINAL = Path("original")
+
-MODIFIED = Path("modified")
-DECOMPILED = Path("decompiled")
-PATCHES = Path("patches")
 
 console = Console()
 app = typer.Typer()
 
 
-# ======================= CONFIG =========================
+# ======================= PATCHING =========================
-class ToolsConfig(BaseModel):
+class Patch:
-    apktool_jar_url: str
+    def __init__(self, name: str, module):
-    apktool_wrapper_url: str
+        self.name = name
+        self.module = module
+        self.applied = False
+        self.priority = getattr(module, "priority", 0)
+        try:
+            self.config = module.Config.model_validate_json((CONFIGS / f"{name}.json").read_text())
+        except Exception as e:
+            console.print(f"[red]Ошибка при загрузке конфигурации патча {name}: {e}")
+            console.print(f"[yellow]Используются значения по умолчанию")
+            self.config = module.Config()
+
+    def apply(self, conf: Dict[str, Any]) -> bool:
+        try:
+            self.applied = bool(self.module.apply(self.config, conf))
+            return self.applied
+        except Exception as e:
+            console.print(f"[red]Ошибка в патче {self.name}: {e}")
+            traceback.print_exc()
+            return False
 
 
-class XmlNamespaces(BaseModel):
+# ========================= INIT =========================
-    android: str
-    app: str
-
-
-class BaseSection(BaseModel):
-    tools: ToolsConfig
-    xml_ns: XmlNamespaces
-
-
-class Config(BaseModel):
-    base: BaseSection
-    patches: dict
-
-
-def load_config() -> Config:
-    try:
-        return Config.model_validate_json(Path("config.json").read_text())
-    except FileNotFoundError:
-        console.print("[red]Файл config.json не найден")
-        raise typer.Exit(1)
-    except ValidationError as e:
-        console.print("[red]Ошибка валидации config.json:", e)
-        raise typer.Exit(1)
-
-
-# ======================= UTILS =========================
-def ensure_dirs():
-    for d in [TOOLS, ORIGINAL, MODIFIED, DECOMPILED, PATCHES]:
-        d.mkdir(exist_ok=True)
-
-
-def run(cmd: List[str], hide_output=True):
-    prog = local[cmd[0]][cmd[1:]]
-    try:
-        prog() if hide_output else prog & FG
-    except ProcessExecutionError as e:
-        console.print(f"[red]Ошибка при выполнении команды: {' '.join(cmd)}")
-        console.print(e.stderr)
-        raise typer.Exit(1)
-
-
-def download(url: str, dest: Path):
-    console.print(f"[cyan]Скачивание {url} → {dest.name}")
-
-    with httpx.Client(follow_redirects=True, timeout=60.0) as client:
-        with client.stream("GET", url) as response:
-            response.raise_for_status()
-            total = int(response.headers.get("Content-Length", 0))
-
-            dest.parent.mkdir(parents=True, exist_ok=True)
-
-            with open(dest, "wb") as f, Progress(console=console) as progress:
-                task = progress.add_task("Загрузка", total=total if total else None)
-                for chunk in response.iter_bytes(chunk_size=8192):
-                    f.write(chunk)
-                    progress.update(task, advance=len(chunk))
-
-
-# ======================= INIT =========================
 @app.command()
 def init():
     """Создание директорий и скачивание инструментов"""
     ensure_dirs()
-    conf = load_config()
+    conf = load_config(console)
+
+    for f in PATCHES.glob("*.py"):
+        if f.name.startswith("todo_") or f.name == "__init__.py":
+            continue
+        patch = Patch(f.stem, __import__(f"patches.{f.stem}", fromlist=[""]))
+        json_string = patch.config.model_dump_json()
+        (CONFIGS / f"{patch.name}.json").write_text(json_string)
 
     if not (TOOLS / "apktool.jar").exists():
-        download(conf.base.tools.apktool_jar_url, TOOLS / "apktool.jar")
+        download(console, conf.tools.apktool_jar_url, TOOLS / "apktool.jar")
 
     if not (TOOLS / "apktool").exists():
-        download(conf.base.tools.apktool_wrapper_url, TOOLS / "apktool")
+        download(console, conf.tools.apktool_wrapper_url, TOOLS / "apktool")
         (TOOLS / "apktool").chmod(0o755)
 
     try:
@@ -112,24 +71,46 @@ def init():
         raise typer.Exit(1)
 
 
-# ======================= PATCHING =========================
+# ========================= INFO =========================
-class Patch:
+@app.command()
-    def __init__(self, name: str, module):
+def info(patch_name: str = ""):
-        self.name = name
+    """Вывод информации о патче"""
-        self.module = module
+    conf = load_config(console).model_dump()
-        self.applied = False
+    if patch_name:
-        self.priority = getattr(module, "priority", 0)
+        patch = Patch(patch_name, __import__(f"patches.{patch_name}", fromlist=[""]))
+        console.print(f"[green]Информация о патче {patch.name}:")
+        console.print(f"  [yellow]Приоритет: {patch.priority}")
+        console.print(f"  [yellow]Описание: {patch.module.__doc__}")
 
-    def apply(self, conf: dict) -> bool:
+        console.print(f"[blue]Поля конфигурации")
-        try:
+        for field_name, field_info in type(patch.config).model_fields.items():
-            self.applied = bool(self.module.apply(conf))
+            field_data = {
-            return self.applied
+                'type': field_info.annotation.__name__,
-        except Exception as e:
+                'description': field_info.description,
-            console.print(f"[red]Ошибка в патче {self.name}: {e}")
+                'default': field_info.default,
-            traceback.print_exc()
+                'json_schema_extra': field_info.json_schema_extra,
-            return False
+            }
+            console.print(f'{field_name} {field_data}')
+        console.print("\n[blue]" + "="*50 + "\n")
+
+    else:
+        conf = load_config(console)
+        console.print("[cyan]Список патчей:")
+        patch_list = []
+        for f in PATCHES.glob("*.py"):
+            if f.name == "__init__.py": continue
+            if f.name.startswith("todo_"):
+                try: priority = __import__(f"patches.{f.stem}.priority", fromlist=[""])
+                except: priority = None
+                patch_list.append((priority, f"  [{priority}] [yellow]{f.stem}: [yellow]⚠ в разработке"))
+                continue
+            patch = Patch(f.stem, __import__(f"patches.{f.stem}", fromlist=[""]))
+            if patch.config.enabled: patch_list.append((patch.priority, f"  [{patch.priority}] [yellow]{f.stem}: [green]✔ включен"))
+            else: patch_list.append((patch.priority, f"  [{patch.priority}] [yellow]{f.stem}: [red]✘ выключен"))
+        for _, patch in sorted(patch_list, key=lambda x: (x[0] is None, x[0]), reverse=True): console.print(patch)
 
 
+# ========================= UTIL =========================
 def select_apk() -> Path:
     apks = [f for f in ORIGINAL.glob("*.apk")]
     if not apks:
@@ -151,14 +132,12 @@ def select_apk() -> Path:
 def decompile(apk: Path):
     console.print("[yellow]Декомпиляция apk...")
     run(
+        console,
         [
             "java",
-            "-jar",
+            "-jar", str(TOOLS / "apktool.jar"),
-            str(TOOLS / "apktool.jar"),
+            "d", "-f",
-            "d",
+            "-o", str(DECOMPILED),
-            "-f",
-            "-o",
-            str(DECOMPILED),
             str(apk),
         ]
     )
@@ -166,76 +145,75 @@ def decompile(apk: Path):
 
 def compile(apk: Path, patches: List[Patch]):
     console.print("[yellow]Сборка apk...")
-    out_apk = MODIFIED / apk.name
+
+    with open(DECOMPILED / "apktool.yml", encoding="utf-8") as f:
+        meta = yaml.safe_load(f)
+        version_info = meta.get("versionInfo", {})
+        version_code = version_info.get("versionCode", 0)
+        version_name = version_info.get("versionName", "unknown")
+
+    filename_version = version_name.lower().replace(" ", "-").replace(".", "-")
+    out_apk = MODIFIED / f"Anixarty-mod-v{filename_version}.apk"
     aligned = out_apk.with_stem(out_apk.stem + "-aligned")
     signed = out_apk.with_stem(out_apk.stem + "-mod")
 
     run(
+        console,
         [
             "java",
-            "-jar",
+            "-jar", str(TOOLS / "apktool.jar"),
-            str(TOOLS / "apktool.jar"),
+            "b", str(DECOMPILED),
-            "b",
+            "-o", str(out_apk),
-            str(DECOMPILED),
-            "-o",
-            str(out_apk),
         ]
     )
-    run(["zipalign", "-v", "4", str(out_apk), str(aligned)])
     run(
+        console,
+        ["zipalign", "-v", "4", str(out_apk), str(aligned)]
+    )
+    run(
+        console,
         [
-            "apksigner",
+            "apksigner", "sign",
-            "sign",
+            "--v1-signing-enabled", "false",
-            "--v1-signing-enabled",
+            "--v2-signing-enabled", "true",
-            "false",
+            "--v3-signing-enabled", "true",
-            "--v2-signing-enabled",
+            "--ks", "keystore.jks",
-            "true",
+            "--ks-pass", "file:keystore.pass",
-            "--v3-signing-enabled",
+            "--out", str(signed),
-            "true",
-            "--ks",
-            "keystore.jks",
-            "--ks-pass",
-            "file:keystore.pass",
-            "--out",
-            str(signed),
             str(aligned),
         ]
     )
 
-    with open(DECOMPILED / "apktool.yml", encoding="utf-8") as f:
+    console.print("[green]✔ APK успешно собран и подписан")
-        meta = yaml.safe_load(f)
-        version_str = " ".join(
-            f"{k}:{v}" for k, v in meta.get("versionInfo", {}).items()
-        )
 
     with open(MODIFIED / "report.log", "w", encoding="utf-8") as f:
-        f.write(f"anixart mod {version_str}\n")
+        f.write(f"Anixarty mod v {version_name} ({version_code})\n")
         for p in patches:
-            f.write(f"{p.name}: {'applied' if p.applied else 'failed'}\n")
+            f.write(f"{'✔' if p.applied else '✘'} {p.name}\n")
 
 
+# ========================= BUILD =========================
 @app.command()
 def build(
     force: bool = typer.Option(False, "--force", "-f", help="Принудительная сборка"),
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Подробный вывод"),
 ):
     """Декомпиляция, патчи и сборка apk"""
-    conf = load_config().model_dump()
+    conf = load_config(console)
     apk = select_apk()
     decompile(apk)
 
-    patch_settings = conf.get("patches", {})
     patch_objs: List[Patch] = []
+    conf.base |= {"verbose": verbose}
 
     for f in PATCHES.glob("*.py"):
         if f.name.startswith("todo_") or f.name == "__init__.py":
             continue
         name = f.stem
-        settings = patch_settings.get(name, {})
+        module = importlib.import_module(f"patches.{name}")
-        if not settings.get("enable", True):
+        if not module.Config.model_validate_json((CONFIGS / f"{name}.json").read_text()):
             console.print(f"[yellow]≫ Пропускаем {name}")
             continue
-        module = importlib.import_module(f"patches.{name}")
         patch_objs.append(Patch(name, module))
 
     patch_objs.sort(key=lambda p: p.priority, reverse=True)
@@ -244,7 +222,7 @@ def build(
     with Progress() as progress:
         task = progress.add_task("Патчи", total=len(patch_objs))
         for p in patch_objs:
-            ok = p.apply(patch_settings.get(p.name, {}) | conf.get("base", {}))
+            ok = p.apply(conf.base)
             progress.console.print(f"{'✔' if ok else '✘'} {p.name}")
             progress.advance(task)
 
@@ -260,5 +238,4 @@ def build(
         raise typer.Exit(1)
 
 
-if __name__ == "__main__":
+if __name__ == "__main__": app()
-    app()

patches/change_server.py

@@ -1,45 +1,62 @@
-"""
+"""Заменяет сервер api
-Заменяет сервер api
 
 "change_server": {
-    "server": "https://anixarty.wowlikon.tech/modding"
+  "enabled": true,
+  "server": "https://anixarty.0x174.su/patch"
 }
 """
+
 priority = 0
 
+# imports
 import json
 import requests
 from tqdm import tqdm
+from typing import Dict, Any
+from pydantic import Field
 
+from utils.config import PatchConfig
 
-def apply(config: dict) -> bool:
+#Config
-    response = requests.get(config['server'])
+class Config(PatchConfig):
+    server: str = Field("https://anixarty.0x174.su/patch", description="URL сервера")
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
+    response = requests.get(config.server) # Получаем данные для патча
     assert response.status_code == 200, f"Failed to fetch data {response.status_code} {response.text}"
+
     new_api = json.loads(response.text)
-    for item in new_api['modifications']:
+    for item in new_api['modifications']: # Применяем замены API
         tqdm.write(f"Изменение {item['file']}")
         filepath = './decompiled/smali_classes2/com/swiftsoft/anixartd/network/api/'+item['file']
+
         with open(filepath, 'r') as f:
             content = f.read()
+
         with open(filepath, 'w') as f:
             if content.count(item['src']) == 0:
                 tqdm.write(f"⚠ Не найдено {item['src']}")
             f.write(content.replace(item['src'], item['dst']))
 
-    tqdm.write(f"Изменение Github ссылки")
+    tqdm.write(f"Изменение Github ссылки") # Обновление ссылки на поиск серверов в Github
     filepath = './decompiled/smali_classes2/com/swiftsoft/anixartd/utils/anixnet/GithubPagesNetFetcher.smali'
+
     with open(filepath, 'r') as f:
         content = f.read()
+
     with open(filepath, 'w') as f:
         f.write(content.replace('const-string v1, "https://anixhelper.github.io/pages/urls.json"', f'const-string v1, "{new_api["gh"]}"'))
 
-    content = ""
+    tqdm.write("Удаление динамического выбора сервера") # Отключение автовыбора сервера
-    tqdm.write("Удаление динамического выбора сервера")
     filepath = './decompiled/smali_classes2/com/swiftsoft/anixartd/DaggerApp_HiltComponents_SingletonC$SingletonCImpl$SwitchingProvider.smali'
+
+    content = ""
     with open(filepath, 'r') as f:
         for line in f.readlines():
             if "addInterceptor" in line: continue
             content += line
+
     with open(filepath, 'w') as f:
         f.write(content)
 

patches/color_theme.py

@@ -1,39 +1,64 @@
-"""
+"""Изменяет цветовую тему приложения и иконку
-Изменяет цветовую тему приложения и иконку
 
 "color_theme": {
+  "enabled": true,
+  "logo": {
+    "gradient": {
+      "angle": 0.0,
+      "start_color": "#ffccff00",
+      "end_color": "#ffcccc00"
+    },
+    "ears_color": "#ffffd0d0"
+  },
   "colors": {
     "primary": "#ccff00",
-    "secondary": "#ffffd700",
+    "secondary": "#ffcccc00",
     "background": "#ffffff",
     "text": "#000000"
-  },
-  "gradient": {
-    "angle": "135.0",
-    "from": "#ffff6060",
-    "to": "#ffccff00"
   }
 }
 """
+
 priority = 0
 
+# imports
 from lxml import etree
+from typing import Dict, Any
+from pydantic import Field, BaseModel
 
+from utils.config import PatchConfig
 from utils.public import (
     insert_after_public,
     insert_after_color,
     change_color,
 )
 
+#Config
+class Gradient(BaseModel):
+    angle: float = Field(0.0, description="Угол градиента")
+    start_color: str = Field("#ffccff00", description="Начальный цвет градиента")
+    end_color: str = Field("#ffcccc00", description="Конечный цвет градиента")
 
-def apply(config: dict) -> bool:
+class Logo(BaseModel):
-    main_color = config["colors"]["primary"]
+    gradient: Gradient = Field(Gradient(), description="Настройки градиента") # type: ignore [reportCallIssue]
-    splash_color = config["colors"]["secondary"]
+    ears_color: str = Field("#ffd0d0d0", description="Цвет ушей логотипа")
-    gradient_angle = config["gradient"]["angle"]
-    gradient_from = config["gradient"]["from"]
-    gradient_to = config["gradient"]["to"]
 
-    # No connection alert coolor
+class Colors(BaseModel):
+    primary: str = Field("#ccff00", description="Основной цвет")
+    secondary: str = Field("#ffcccc00", description="Вторичный цвет")
+    background: str = Field("#ffffff", description="Фоновый цвет")
+    text: str = Field("#000000", description="Цвет текста")
+
+class Config(PatchConfig):
+    logo: Logo = Field(Logo(), description="Настройки цветов логотипа") # type: ignore [reportCallIssue]
+    colors: Colors = Field(Colors(), description="Настройки цветов")    # type: ignore [reportCallIssue]
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
+    main_color = config.colors.primary
+    splash_color = config.colors.secondary
+
+    # Обновление сообщения об отсутствии подключения
     with open("./decompiled/assets/no_connection.html", "r", encoding="utf-8") as file:
         file_contents = file.read()
 
@@ -42,39 +67,40 @@ def apply(config: dict) -> bool:
     with open("./decompiled/assets/no_connection.html", "w", encoding="utf-8") as file:
         file.write(new_contents)
 
-    # For logo
+    # Суффиксы лого
     drawable_types = ["", "-night"]
 
     for drawable_type in drawable_types:
-        # Application logo gradient colors
+        # Градиент лого приложения
         file_path = f"./decompiled/res/drawable{drawable_type}/$logo__0.xml"
 
         parser = etree.XMLParser(remove_blank_text=True)
         tree = etree.parse(file_path, parser)
         root = tree.getroot()
 
-        # Change attributes with namespace
+        # Замена атрибутов значениями из конфигурации
-        root.set(f"{{{config['xml_ns']['android']}}}angle", gradient_angle)
+        root.set(f"{{{base['xml_ns']['android']}}}angle", str(config.logo.gradient.angle))
-        root.set(f"{{{config['xml_ns']['android']}}}startColor", gradient_from)
+        root.set(f"{{{base['xml_ns']['android']}}}startColor", config.logo.gradient.start_color)
-        root.set(f"{{{config['xml_ns']['android']}}}endColor", gradient_to)
+        root.set(f"{{{base['xml_ns']['android']}}}endColor", config.logo.gradient.end_color)
 
-        # Save back
+        # Сохранение
         tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
-        # Application logo anim color
+        # Замена анимации лого
         file_path = f"./decompiled/res/drawable{drawable_type}/$logo_splash_anim__0.xml"
 
         parser = etree.XMLParser(remove_blank_text=True)
         tree = etree.parse(file_path, parser)
         root = tree.getroot()
 
-        # Finding "path"
+        for el in root.findall("path", namespaces=base["xml_ns"]):
-        for el in root.findall("path", namespaces=config["xml_ns"]):
+            name = el.get(f"{{{base['xml_ns']['android']}}}name")
-            name = el.get(f"{{{config['xml_ns']['android']}}}name")
             if name == "path":
-                el.set(f"{{{config['xml_ns']['android']}}}fillColor", splash_color)
+                el.set(f"{{{base['xml_ns']['android']}}}fillColor", config.colors.secondary)
+            elif name in ["path_1", "path_2"]:
+                el.set(f"{{{base['xml_ns']['android']}}}fillColor", config.logo.ears_color)
 
-        # Save back
+        # Сохранение
         tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
     for filename in ["$ic_launcher_foreground__0", "$ic_banner_foreground__0"]:
@@ -84,25 +110,28 @@ def apply(config: dict) -> bool:
         tree = etree.parse(file_path, parser)
         root = tree.getroot()
 
-        # Change attributes with namespace
+        # Замена атрибутов значениями из конфигурации
-        root.set(f"{{{config['xml_ns']['android']}}}angle", gradient_angle)
+        root.set(f"{{{base['xml_ns']['android']}}}angle", str(config.logo.gradient.angle))
-        items = root.findall("item", namespaces=config['xml_ns'])
+        items = root.findall("item", namespaces=base['xml_ns'])
         assert len(items) == 2
-        items[0].set(f"{{{config['xml_ns']['android']}}}color", gradient_from)
+        items[0].set(f"{{{base['xml_ns']['android']}}}color", config.logo.gradient.start_color)
-        items[1].set(f"{{{config['xml_ns']['android']}}}color", gradient_to)
+        items[1].set(f"{{{base['xml_ns']['android']}}}color", config.logo.gradient.end_color)
 
-        # Save back
+        # Сохранение
         tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
+    # Добаление новых цветов для темы
     insert_after_public("carmine", "custom_color")
     insert_after_public("carmine_alpha_10", "custom_color_alpha_10")
     insert_after_color("carmine", "custom_color", main_color[0]+'ff'+main_color[1:])
     insert_after_color("carmine_alpha_10", "custom_color_alpha_10", main_color[0]+'1a'+main_color[1:])
 
+    # Замена цветов
     change_color("accent_alpha_10", main_color[0]+'1a'+main_color[1:])
     change_color("accent_alpha_20", main_color[0]+'33'+main_color[1:])
     change_color("accent_alpha_50", main_color[0]+'80'+main_color[1:])
     change_color("accent_alpha_70", main_color[0]+'b3'+main_color[1:])
+
     change_color("colorAccent", main_color[0]+'ff'+main_color[1:])
     change_color("link_color", main_color[0]+'ff'+main_color[1:])
     change_color("link_color_alpha_70", main_color[0]+'b3'+main_color[1:])

patches/comment_vote.py

@@ -0,0 +1,99 @@
+"""Меняет местами кнопки лайка и дизлайка у коментария и иконки
+
+"comment_vote": {
+  "enabled": true,
+  "replace": true,
+  "custom_icons": true,
+  "icons_size": "14.0dip"
+}
+"""
+
+priority = 0
+
+# imports
+import os
+import shutil
+from tqdm import tqdm
+from lxml import etree
+from pydantic import Field
+from typing import Dict, Any
+from utils.config import PatchConfig
+
+#Config
+class Config(PatchConfig):
+    replace: bool = Field(True, description="Менять местами лайк/дизлайк")
+    custom_icons: bool = Field(True, description="Кастомные иконки")
+    icon_size: str = Field("18.0dip", description="Размер иконки")
+
+# Patch
+def apply(config, base: Dict[str, Any]) -> bool:
+    file_path = "./decompiled/res/layout/item_comment.xml"
+    parser = etree.XMLParser(remove_blank_text=True)
+    tree = etree.parse(file_path, parser)
+    root = tree.getroot()
+
+    tqdm.write("Меняем размер иконок лайка и дизлайка...")
+    for icon in root.xpath(
+        ".//*[@android:id='@id/votePlusInactive']//ImageView | "
+        ".//*[@android:id='@id/votePlusActive']//ImageView | "
+        ".//*[@android:id='@id/voteMinusInactive']//ImageView | "
+        ".//*[@android:id='@id/voteMinusActive']//ImageView",
+        namespaces=base['xml_ns'],
+    ):
+        icon.set(f"{{{base['xml_ns']['android']}}}layout_width", config.icon_size)
+        # icon.set(f"{{{base['xml_ns']['android']}}}layout_height", config.icon_size)
+
+    if config.replace:
+        tqdm.write("Меняем местами лайк и дизлайк комментария...")
+
+        containers = root.xpath(
+            ".//LinearLayout[.//*[@android:id='@id/voteMinus'] and .//*[@android:id='@id/votePlus']]",
+            namespaces=base["xml_ns"],
+        )
+
+        found = False
+        for container in containers:
+            children = list(container)
+            vote_plus = None
+            vote_minus = None
+
+            for ch in children:
+                cid = ch.get(f'{{{base["xml_ns"]["android"]}}}id')
+                if cid == "@id/votePlus":
+                    vote_plus = ch
+                elif cid == "@id/voteMinus":
+                    vote_minus = ch
+
+            if vote_plus is not None and vote_minus is not None:
+                found = True
+                i_plus = children.index(vote_plus)
+                i_minus = children.index(vote_minus)
+                children[i_plus], children[i_minus] = children[i_minus], children[i_plus]
+                container[:] = children
+                tqdm.write("Кнопки лайк и дизлайк поменялись местами.")
+                break
+
+        if not found:
+            tqdm.write("Не удалось найти оба узла votePlus/voteMinus даже в общих LinearLayout.")
+
+    if config.custom_icons:
+        tqdm.write("Заменяем иконки лайка и дизлайка на кастомные...")
+        for suffix in ["up", "up_40", "down", "down_40"]:
+            shutil.copy(
+                f"./resources/ic_chevron_{suffix}.xml",
+                f"./decompiled/res/drawable/ic_chevron_{suffix}.xml",
+            )
+
+        for inactive in root.xpath(
+            ".//*[@android:id='@id/votePlusInactive'] | .//*[@android:id='@id/voteMinusInactive']",
+            namespaces=base["xml_ns"],
+        ):
+            for img in inactive.xpath(".//ImageView[@android:src]", namespaces=base["xml_ns"]):
+                src = img.get(f'{{{base["xml_ns"]["android"]}}}src', "")
+                if src.startswith("@drawable/") and not src.endswith("_40"):
+                    img.set(f'{{{base["xml_ns"]["android"]}}}src', src + "_40")
+
+    # Сохраняем
+    tree.write(file_path, encoding="utf-8", xml_declaration=True, pretty_print=True)
+
+    return True

patches/compress.md

@@ -1,30 +0,0 @@
-# Compress
-
-Патч удаляет ненужные ресурсы что-бы уменьшить размер АПК
-
-## настройки (compress в config.json)
-
-- remove_unknown_files: true/false - удаляет файлы из директории decompiled/unknown
-- remove_unknown_files_keep_dirs: list[str] - оставляет указанные директории в decompiled/unknown
-- remove_debug_lines: true/false - удаляет строки `.line n` из декомпилированных smali файлов использованные для дебага
-- remove_AI_voiceover: true/false - заменяет ИИ озвучку маскота аниксы пустыми mp3 файлами
-- compress_png_files: true/false - сжимает PNG в директории decompiled/res
-- remove_drawable_files: true/false - удаляет неиспользованные drawable-* из директории decompiled/res
-- remove_language_files: true/false - удаляет все языки кроме русского и английского
-
-## efficiency
-
-Проверено с версией 9.0 Beta 7
-
-разница = оригинальный размер апк - патченный размер апк, не учитывая другие патчи
-
-|   Настройка  |     Размер файла      |       Разница       |   %   |
-| :----------- | :-------------------: | :-----------------: |  :-:  |
-| None         | 17092 bytes - 17.1 MB |         -           |   -   |
-| Compress PNG | 17072 bytes - 17.1 MB |   20 bytes - 0.0 MB | 0.11% |
-| Remove files | 17020 bytes - 17.0 MB |   72 bytes - 0.1 MB | 0.42% |
-| Remove draws | 16940 bytes - 16.9 MB |  152 bytes - 0.2 MB | 0.89% |
-| Remove lines | 16444 bytes - 16.4 MB |  648 bytes - 0.7 MB | 3.79% |
-| Remove ai vo | 15812 bytes - 15.8 MB | 1280 bytes - 1.3 MB | 7.49% |
-| Remove langs | 15764 bytes - 15.7 MB | 1328 bytes - 1.3 MB | 7.76% |
-| Все включены | 13592 bytes - 13.6 MB | 3500 bytes - 4.8 MB | 20.5% |

patches/compress.py

@@ -1,4 +1,30 @@
-"""Remove and compress resources"""
+"""Удаляет ненужное и сжимает ресурсы что-бы уменьшить размер АПК
+
+Эффективность на проверена на версии 9.0 Beta 7
+разница = оригинальный размер апк - патченный размер апк, не учитывая другие патчи
+
+|    Настройка     |     Размер файла      |       Разница       |   %   |
+| :--------------: | :-------------------: | :-----------------: |  :-:  |
+| Ничего           | 17092 bytes - 17.1 MB |         -           |   -   |
+| Сжатие PNG       | 17072 bytes - 17.1 MB |   20 bytes - 0.0 MB | 0.11% |
+| Удалить unknown  | 17020 bytes - 17.0 MB |   72 bytes - 0.1 MB | 0.42% |
+| Удалить draws    | 16940 bytes - 16.9 MB |  152 bytes - 0.2 MB | 0.89% |
+| Удалить lines    | 16444 bytes - 16.4 MB |  648 bytes - 0.7 MB | 3.79% |
+| Удалить ai voice | 15812 bytes - 15.8 MB | 1280 bytes - 1.3 MB | 7.49% |
+| Удалить языки    | 15764 bytes - 15.7 MB | 1328 bytes - 1.3 MB | 7.76% |
+| Все включены     | 13592 bytes - 13.6 MB | 3500 bytes - 4.8 MB | 20.5% |
+
+"compress": {
+  "enabled": true,
+  "remove_language_files": true,                            // удаляет все языки кроме русского и английского
+  "remove_AI_voiceover": true,                              // заменяет ИИ озвучку маскота аниксы пустыми mp3 файлами
+  "remove_debug_lines": false,                              // удаляет строки `.line n` из smali файлов использованные для дебага
+  "remove_drawable_files": false,                           // удаляет неиспользованные drawable-* из директории decompiled/res
+  "remove_unknown_files": true,                             // удаляет файлы из директории decompiled/unknown
+  "remove_unknown_files_keep_dirs": ["META-INF", "kotlin"], // оставляет указанные директории в decompiled/unknown
+  "compress_png_files": true                                // сжимает PNG в директории decompiled/res
+}
+"""
 
 priority = -1
 
@@ -7,28 +33,41 @@ import os
 import shutil
 import subprocess
 from tqdm import tqdm
+from pydantic import Field
+from typing import Dict, List, Any
+
+from utils.config import PatchConfig
 from utils.smali_parser import get_smali_lines, save_smali_lines
 
+#Config
+class Config(PatchConfig):
+    remove_language_files: bool = Field(True, description="Удаляет все языки кроме русского и английского")
+    remove_AI_voiceover: bool = Field(True, description="Заменяет ИИ озвучку маскота аниксы пустыми mp3 файлами")
+    remove_debug_lines: bool = Field(False, description="Удаляет строки `.line n` из smali файлов использованные для дебага")
+    remove_drawable_files: bool = Field(False, description="Удаляет неиспользованные drawable-* из директории decompiled/res")
+    remove_unknown_files: bool = Field(True, description="Удаляет файлы из директории decompiled/unknown")
+    remove_unknown_files_keep_dirs: List[str] = Field(["META-INF", "kotlin"], description="Оставляет указанные директории в decompiled/unknown")
+    compress_png_files: bool = Field(True, description="Сжимает PNG в директории decompiled/res")
 
 # Patch
-def remove_unknown_files(config):
+def remove_unknown_files(config: Config, base: Dict[str, Any]):
     path = "./decompiled/unknown"
     items = os.listdir(path)
     for item in items:
         item_path = f"{path}/{item}"
         if os.path.isfile(item_path):
             os.remove(item_path)
-            if config.get("verbose", False):
+            if base.get("verbose", False):
                 tqdm.write(f"Удалён файл: {item_path}")
         elif os.path.isdir(item_path):
-            if item not in config["remove_unknown_files_keep_dirs"]:
+            if item not in config.remove_unknown_files_keep_dirs:
                 shutil.rmtree(item_path)
-                if config.get("verbose", False):
+                if base.get("verbose", False):
                     tqdm.write(f"Удалёна директория: {item_path}")
     return True
 
 
-def remove_debug_lines(config):
+def remove_debug_lines(config: Dict[str, Any]):
     for root, _, files in os.walk("./decompiled"):
         for filename in files:
             file_path = os.path.join(root, filename)
@@ -45,14 +84,13 @@ def remove_debug_lines(config):
     return True
 
 
-def compress_png(config, png_path: str):
+def compress_png(config: Dict[str, Any], png_path: str):
     try:
         assert subprocess.run(
             [
                 "pngquant",
                 "--force",
-                "--ext",
+                "--ext", ".png",
-                ".png",
                 "--quality=65-90",
                 png_path,
             ],
@@ -66,7 +104,7 @@ def compress_png(config, png_path: str):
         return False
 
 
-def compress_png_files(config):
+def compress_png_files(config: Dict[str, Any]):
     compressed = []
     for root, _, files in os.walk("./decompiled"):
         for file in files:
@@ -76,8 +114,8 @@ def compress_png_files(config):
     return len(compressed) > 0 and any(compressed)
 
 
-def remove_AI_voiceover(config):
+def remove_AI_voiceover(config: Dict[str, Any]):
-    blank = "./patches/resources/blank.mp3"
+    blank = "./resources/blank.mp3"
     path = "./decompiled/res/raw"
     files = [
         "reputation_1.mp3",
@@ -108,7 +146,7 @@ def remove_AI_voiceover(config):
     return True
 
 
-def remove_language_files(config):
+def remove_language_files(config: Dict[str, Any]):
     path = "./decompiled/res"
     folders = [
         "values-af",
@@ -209,7 +247,7 @@ def remove_language_files(config):
     return True
 
 
-def remove_drawable_files(config):
+def remove_drawable_files(config: Dict[str, Any]):
     path = "./decompiled/res"
     folders = [
         "drawable-en-hdpi",
@@ -242,29 +280,29 @@ def remove_drawable_files(config):
     return True
 
 
-def apply(config) -> bool:
+def apply(config: Config, base: Dict[str, Any]) -> bool:
-    if config["remove_unknown_files"]:
+    if config.remove_unknown_files:
         tqdm.write(f"Удаление неизвестных файлов...")
-        remove_unknown_files(config)
+        remove_unknown_files(config, base)
 
-    if config["remove_drawable_files"]:
+    if config.remove_drawable_files:
         tqdm.write(f"Удаление директорий drawable-xx...")
-        remove_drawable_files(config)
+        remove_drawable_files(base)
 
-    if config["compress_png_files"]:
+    if config.compress_png_files:
         tqdm.write(f"Сжатие PNG файлов...")
-        compress_png_files(config)
+        compress_png_files(base)
 
-    if config["remove_language_files"]:
+    if config.remove_language_files:
         tqdm.write(f"Удаление языков...")
-        remove_language_files(config)
+        remove_language_files(base)
 
-    if config["remove_AI_voiceover"]:
+    if config.remove_AI_voiceover:
         tqdm.write(f"Удаление ИИ озвучки...")
-        remove_AI_voiceover(config)
+        remove_AI_voiceover(base)
 
-    if config["remove_debug_lines"]:
+    if config.remove_debug_lines:
         tqdm.write(f"Удаление дебаг линий...")
-        remove_debug_lines(config)
+        remove_debug_lines(base)
 
     return True

patches/disable_ad.py

@@ -1,8 +1,18 @@
+"""Удаляет баннеры рекламы
+
+"disable_ad": {
+  "enabled": true
+}
 """
-Удаляет баннеры рекламы
+
-"""
 priority = 0
 
+# imports
+import textwrap
+from tqdm import tqdm
+from typing import Dict, Any
+
+from utils.config import PatchConfig
 from utils.smali_parser import (
     find_smali_method_end,
     find_smali_method_start,
@@ -11,15 +21,18 @@ from utils.smali_parser import (
 )
 
 
-replace = """    .locals 0
+#Config
-
+class Config(PatchConfig): ...
-    const/4 p0, 0x1
-
-    return p0
-"""
 
 
-def apply(config) -> bool:
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
+    replacement = [f'\t{line}\n' for line in textwrap.dedent("""\
+        .locals 0
+        const/4 p0, 0x1
+        return p0
+    """).splitlines()]
+
     path = "./decompiled/smali_classes2/com/swiftsoft/anixartd/Prefs.smali"
     lines = get_smali_lines(path)
     for index, line in enumerate(lines):
@@ -27,7 +40,7 @@ def apply(config) -> bool:
             method_start = find_smali_method_start(lines, index)
             method_end = find_smali_method_end(lines, index)
             new_content = replace_smali_method_body(
-                lines, method_start, method_end, replace
+                lines, method_start, method_end, replacement
             )
 
             with open(path, "w", encoding="utf-8") as file:

patches/disable_beta_banner.py

@@ -1,14 +1,26 @@
+"""Удаляет баннеры бета-версии
+
+"disable_beta_banner": {
+  "enabled": true
+}
 """
-Удаляет баннеры бета-версии
+
-"""
 priority = 0
 
+# imports
 import os
 from tqdm import tqdm
 from lxml import etree
+from typing import Dict, Any
 
+from utils.config import PatchConfig
+from utils.smali_parser import get_smali_lines, save_smali_lines
 
-def apply(config) -> bool:
+#Config
+class Config(PatchConfig): ...
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
     attributes = [
         "paddingTop",
         "paddingBottom",
@@ -29,8 +41,9 @@ def apply(config) -> bool:
         root = tree.getroot()
 
         for attr in attributes:
-            # tqdm.write(f"set {attr} = 0.0dip")
+            if base.get("verbose", False):
-            root.set(f"{{{config["xml_ns"]['android']}}}{attr}", "0.0dip")
+                tqdm.write(f"set {attr} = 0.0dip")
+            root.set(f"{{{base['xml_ns']['android']}}}{attr}", "0.0dip")
 
         tree.write(
             beta_banner_xml, pretty_print=True, xml_declaration=True, encoding="utf-8"

patches/insert_new.py

@@ -1,41 +0,0 @@
-"""
-Вставляет новые файлы в проект
-"""
-priority = 0
-
-import shutil
-import os
-
-from utils.public import insert_after_public
-
-
-def apply(config: dict) -> bool:
-    # Mod first launch window
-    shutil.copytree(
-        "./patches/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",
-        "./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

patches/package_name.py

@@ -1,48 +1,63 @@
-"""
+"""Изменяет имя пакета в apk, удаляет вход по google и vk
-Изменяет имя пакета в apk, удаляет вход по google и vk
 
 "package_name": {
+  "enabled": true,
   "new_package_name": "com.wowlikon.anixart"
 }
 """
+
 priority = -1
 
+# imports
 import os
+from tqdm import tqdm
 from lxml import etree
+from typing import Dict, Any
+from pydantic import Field
 
+from utils.config import PatchConfig
 
+#Config
+class Config(PatchConfig):
+    package_name: str = Field("com.wowlikon.anixart", description="Название пакета")
+
+# Patch
 def rename_dir(src, dst):
     os.makedirs(os.path.dirname(dst), exist_ok=True)
     os.rename(src, dst)
 
 
-def apply(config: dict) -> bool:
+def apply(config: Config, base: Dict[str, Any]) -> bool:
     for root, dirs, files in os.walk("./decompiled"):
         for filename in files:
             file_path = os.path.join(root, filename)
 
             if os.path.isfile(file_path):
-                try:
+                try: # Изменяем имя пакета в файлах
                     with open(file_path, "r", encoding="utf-8") as file:
                         file_contents = file.read()
 
                     new_contents = file_contents.replace(
-                        "com.swiftsoft.anixartd", config["new_package_name"]
+                        "com.swiftsoft.anixartd", config.package_name
                     )
                     new_contents = new_contents.replace(
                         "com/swiftsoft/anixartd",
-                        config["new_package_name"].replace(".", "/"),
+                        config.package_name.replace(".", "/"),
+                    ).replace(
+                        "com/swiftsoft",
+                        "/".join(config.package_name.split(".")[:2]),
                     )
                     with open(file_path, "w", encoding="utf-8") as file:
                         file.write(new_contents)
                 except:
                     pass
 
+    # Изменяем названия папок
     if os.path.exists("./decompiled/smali/com/swiftsoft/anixartd"):
         rename_dir(
             "./decompiled/smali/com/swiftsoft/anixartd",
             os.path.join(
-                "./decompiled", "smali", config["new_package_name"].replace(".", "/")
+                "./decompiled", "smali", config.package_name.replace(".", "/")
             ),
         )
     if os.path.exists("./decompiled/smali_classes2/com/swiftsoft/anixartd"):
@@ -51,7 +66,7 @@ def apply(config: dict) -> bool:
             os.path.join(
                 "./decompiled",
                 "smali_classes2",
-                config["new_package_name"].replace(".", "/"),
+                config.package_name.replace(".", "/"),
             ),
         )
     if os.path.exists("./decompiled/smali_classes4/com/swiftsoft"):
@@ -60,7 +75,7 @@ def apply(config: dict) -> bool:
             os.path.join(
                 "./decompiled",
                 "smali_classes4",
-                "/".join(config["new_package_name"].split(".")[:-1]),
+                "/".join(config.package_name.split(".")[:2]),
             ),
         )
 
@@ -73,6 +88,7 @@ def apply(config: dict) -> bool:
     #    ),
     # )
 
+    # Замена названия пакета для smali_classes4
     for root, dirs, files in os.walk("./decompiled/smali_classes4/"):
         for filename in files:
             file_path = os.path.join(root, filename)
@@ -84,24 +100,22 @@ def apply(config: dict) -> bool:
 
                     new_contents = file_contents.replace(
                         "com/swiftsoft",
-                        "/".join(config["new_package_name"].split(".")[:-1]),
+                        "/".join(config.package_name.split(".")[:-1]),
                     )
                     with open(file_path, "w", encoding="utf-8") as file:
                         file.write(new_contents)
                 except:
                     pass
 
+    # Скрытие входа по Google и VK (НЕ РАБОТАЮТ В МОДАХ)
     file_path = "./decompiled/res/layout/fragment_sign_in.xml"
     parser = etree.XMLParser(remove_blank_text=True)
     tree = etree.parse(file_path, parser)
     root = tree.getroot()
 
     last_linear = root.xpath("//LinearLayout/LinearLayout[4]")[0]
-    last_linear.set(f"{{{config['xml_ns']['android']}}}visibility", "gone")
+    last_linear.set(f"{{{base['xml_ns']['android']}}}visibility", "gone")
 
     tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
     return True
-
-
-# smali_classes2/com/wowlikon/anixart/utils/DeviceInfoUtil.smali: const-string v3, "\u0411\u0430\u0433-\u0440\u0435\u043f\u043e\u0440\u0442 9.0 BETA 5 (25062213)"

patches/replace_navbar.py

@@ -1,42 +1,57 @@
 """
-Меняет порядок вкладок в панели навигации
+        Меняет порядок вкладок в панели навигации
 
 "replace_navbar": {
+  "enabled": true,
   "items": ["home", "discover", "feed", "bookmarks", "profile"]
 }
 """
+
 priority = 0
 
+# imports
 from lxml import etree
 from tqdm import tqdm
+from typing import Dict, List, Any
+from pydantic import Field
 
-def apply(config: dict) -> bool:
+from utils.config import PatchConfig
+
+#Config
+class Config(PatchConfig):
+    items: List[str] = Field(["home", "discover", "feed", "bookmarks", "profile"], description="Список элементов в панели навигации")
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
     file_path = "./decompiled/res/menu/bottom.xml"
 
     parser = etree.XMLParser(remove_blank_text=True)
     tree = etree.parse(file_path, parser)
     root = tree.getroot()
 
-    items = root.findall("item", namespaces=config['xml_ns'])
+    # Получение элементов панели навигации
+    items = root.findall("item", namespaces=base['xml_ns'])
 
     def get_id_suffix(item):
-        full_id = item.get(f"{{{config['xml_ns']['android']}}}id")
+        full_id = item.get(f"{{{base['xml_ns']['android']}}}id")
         return full_id.split("tab_")[-1] if full_id else None
 
     items_by_id = {get_id_suffix(item): item for item in items}
     existing_order = [get_id_suffix(item) for item in items]
 
+    # Размещение в новом порядке
     ordered_items = []
-    for key in config['items']:
+    for key in config.items:
         if key in items_by_id:
             ordered_items.append(items_by_id[key])
 
-    extra = [i for i in items if get_id_suffix(i) not in config['items']]
+    # Если есть не указанные в конфиге они помещаются в конец списка
+    extra = [i for i in items if get_id_suffix(i) not in config.items]
     if extra:
         tqdm.write("⚠Найдены лишние элементы: " + str([get_id_suffix(i) for i in extra]))
         ordered_items.extend(extra)
 
-    for i in root.findall("item", namespaces=config['xml_ns']):
+    for i in root.findall("item", namespaces=base['xml_ns']):
         root.remove(i)
 
     for item in ordered_items:

patches/selectable_text.py

@@ -0,0 +1,42 @@
+"""Делает текст в описании аниме копируемым
+
+"selectable_text": {
+  "enabled": true
+}
+"""
+
+priority = 0
+
+# imports
+from tqdm import tqdm
+from lxml import etree
+from typing import Dict, Any
+from pydantic import Field
+
+from utils.config import PatchConfig
+
+#Config
+class Config(PatchConfig): ...
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
+
+    file_path = "./decompiled/res/layout/release_info.xml"
+
+    parser = etree.XMLParser(remove_blank_text=True)
+    tree = etree.parse(file_path, parser)
+    root = tree.getroot()
+
+    # Список тегов, к которым нужно добавить атрибут
+    tags = ["TextView", "at.blogc.android.views.ExpandableTextView"]
+
+    for tag in tags:
+        for element in root.findall(f".//{tag}", namespaces=base["xml_ns"]):
+            # Проверяем, нет ли уже атрибута
+            if f"{{{base['xml_ns']['android']}}}textIsSelectable" not in element.attrib:
+                element.set(f"{{{base['xml_ns']['android']}}}textIsSelectable", "true")
+
+    # Сохраняем
+    tree.write(file_path, encoding="utf-8", xml_declaration=True, pretty_print=True)
+
+    return True

patches/settings_urls.py

@@ -1,7 +1,7 @@
-"""
+"""Добавляет в настройки ссылки и добвляет текст к версии приложения
-Добавляет в настройки ссылки и доавляет текст к версии приложения
 
 "settings_urls": {
+  "enabled": true,
   "menu": {
     "Раздел": [
       {
@@ -19,11 +19,60 @@
   "version": " by wowlikon"
 }
 """
+
 priority = 0
 
+# imports
+import shutil
 from lxml import etree
+from tqdm import tqdm
+from typing import Dict, List, Any
+from pydantic import Field
 
+from utils.config import PatchConfig
+from utils.public import insert_after_public
 
+#Config
+DEFAULT_MENU = {
+  "Мы в социальных сетях": [
+    {
+      "title": "wowlikon",
+      "description": "Разработчик",
+      "url": "https://t.me/wowlikon",
+      "icon": "@drawable/ic_custom_telegram",
+      "icon_space_reserved": "false"
+    },
+    {
+      "title": "Kentai Radiquum",
+      "description": "Разработчик",
+      "url": "https://t.me/radiquum",
+      "icon": "@drawable/ic_custom_telegram",
+      "icon_space_reserved": "false"
+    },
+    {
+      "title": "Мы в Telegram",
+      "description": "Подпишитесь на канал, чтобы быть в курсе последних новостей.",
+      "url": "https://t.me/http_teapod",
+      "icon": "@drawable/ic_custom_telegram",
+      "icon_space_reserved": "false"
+    }
+  ],
+  "Прочее": [
+    {
+      "title": "Помочь проекту",
+      "description": "Вы можете помочь нам с идеями, написанием кода или тестированием.",
+      "url": "https://git.wowlikon.tech/anixart-mod",
+      "icon": "@drawable/ic_custom_crown",
+      "icon_space_reserved": "false"
+    }
+  ]
+}
+
+class Config(PatchConfig):
+    version: str = Field(" by wowlikon", description="Суффикс версии")
+    menu: Dict[str, List[Dict[str, str]]] = Field(DEFAULT_MENU, description="Меню")
+
+# Patch
 def make_category(ns, name, items):
     cat = etree.Element("PreferenceCategory", nsmap=ns)
     cat.set(f"{{{ns['android']}}}title", name)
@@ -43,22 +92,35 @@ def make_category(ns, name, items):
 
     return cat
 
-def apply(config: dict) -> bool:
+def apply(config: Config, base: Dict[str, Any]) -> 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)
     root = tree.getroot()
 
-    # Insert new PreferenceCategory before the last element
+    # Вставка новых пунктов перед последним
-    last = root[-1]  # last element
+    pos = root.index(root[-1])
-    pos = root.index(last)
+    for section, items in config.menu.items():
-    for section, items in config["menu"].items():
+        root.insert(pos, make_category(base["xml_ns"], section, items))
-        root.insert(pos, make_category(config["xml_ns"], section, items))
         pos += 1
 
-    # Save back
+    # Сохранение
     tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
+    # Добавление суффикса версии
     filepaths = [
         "./decompiled/smali_classes2/com/swiftsoft/anixartd/ui/activity/UpdateActivity.smali",
         "./decompiled/smali_classes2/com/swiftsoft/anixartd/ui/fragment/main/preference/MainPreferenceFragment.smali",
@@ -68,7 +130,7 @@ def apply(config: dict) -> bool:
         with open(filepath, "r", encoding="utf-8") as file:
             for line in file.readlines():
                 if '"\u0412\u0435\u0440\u0441\u0438\u044f'.encode("unicode_escape").decode() in line:
-                    content += line[:line.rindex('"')] + config["version"] + line[line.rindex('"'):]
+                    content += line[:line.rindex('"')] + config.version + line[line.rindex('"'):]
                 else:
                     content += line
         with open(filepath, "w", encoding="utf-8") as file:

patches/share_links.py

@@ -0,0 +1,53 @@
+"""Изменяет формат "поделиться"
+
+"selectable_text": {
+  "enabled": true,
+  "format": {
+    "share_channel_text": "Канал: «%1$s»\n%2$schannel/%3$d",
+    "share_collection_text": "Коллекция: «%1$s»\n%2$scollection/%3$d",
+    "share_profile_text": "Профиль пользователя «%1$s»\n%2$sprofile/%3$d",
+    "share_release_text": "Релиз: «%1$s»\n%2$srelease/%3$d"
+  }
+}
+"""
+
+priority = 0
+
+# imports
+from tqdm import tqdm
+from lxml import etree
+from typing import Dict, Any
+from pydantic import Field
+
+from utils.config import PatchConfig
+
+#Config
+DEFAULT_FORMATS = {
+    "share_channel_text": "Канал: «%1$s»\n%2$schannel/%3$d",
+    "share_collection_text": "Коллекция: «%1$s»\n%2$scollection/%3$d",
+    "share_profile_text": "Профиль пользователя «%1$s»\n%2$sprofile/%3$d",
+    "share_release_text": "Релиз: «%1$s»\n%2$srelease/%3$d"
+}
+
+class Config(PatchConfig):
+    format: Dict[str, str] = Field(DEFAULT_FORMATS, description="Строки для замены в `strings.xml`")
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
+
+    file_path = "./decompiled/res/values/strings.xml"
+
+    parser = etree.XMLParser(remove_blank_text=True)
+    tree = etree.parse(file_path, parser)
+    root = tree.getroot()
+
+    # Обновляем значения
+    for string in root.findall("string"):
+        name = string.get("name")
+        if name in config.format:
+            string.text = config.format[name]
+
+    # Сохраняем обратно
+    tree.write(file_path, encoding="utf-8", xml_declaration=True, pretty_print=True)
+
+    return True

patches/todo_application_icon.py

@@ -1,6 +0,0 @@
-"""Change application icon"""
-priority = 0
-
-
-def apply(config: dict) -> bool:
-    return False

patches/todo_custom_speed.py

@@ -1,23 +1,36 @@
-"""
+"""Добавляет пользовательские скорости воспроизведения видео
-Добавляет пользовательские скорости воспроизведения видео
 
 "custom_speed": {
+  "enabled": true,
   "speeds": [9.0]
 }
 """
+
 priority = 0
 
+# imports
+from tqdm import tqdm
+from typing import Dict, List, Any
+from pydantic import Field
+
+from utils.config import PatchConfig
 from utils.smali_parser import float_to_hex
 from utils.public import (
     insert_after_public,
     insert_after_id,
 )
 
-def apply(config: dict) -> bool:
+#Config
+class Config(PatchConfig):
+    speeds: List[float] = Field([9.0], description="Список пользовательских скоростей воспроизведения")
+
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
     assert float_to_hex(1.5) == "0x3fc00000"
 
     last = "speed75"
-    for speed in config.get("speeds", []):
+    for speed in config.speeds:
         insert_after_public(last, f"speed{int(float(speed)*10)}")
         insert_after_id(last, f"speed{int(float(speed)*10)}")
         last = f"speed{int(float(speed)*10)}"

patches/todo_example.py

@@ -0,0 +1,48 @@
+"""Шаблон патча
+
+Здесь вы можете добавить описание патча, его назначение и другие детали.
+
+Каждый патч должен независеть от других патчей и проверять себя при применении. Он не должен вернуть True, если есть проблемы.
+На данный момент каждый патч должен иметь функцию `apply`, которая принимает на вход конфигурацию и возвращает True или False.
+И модель `Config`, которая наследуется от `PatchConfig` (поле `enabled` добавлять не нужно).
+Это позволяет упростить конфигурирование и проверять типы данных, и делать значения по умолчанию.
+При успешном применении патча, функция apply должна вернуть True, иначе False.
+Ошибка будет интерпретирована как False. С выводом ошибки в консоль.
+Ещё патч должен иметь переменную `priority`, которая указывает приоритет патча, чем выше, тем раньше он будет применен.
+
+Коротко о конфигурации. Она состоит из двух частей `config` (на основе модели `Config` и из файла `configs/название_патча.json`).
+И постоянной не типизированной переменной `base` из `config.json` и флага `verbose`.
+```
+python ./main.py build --verbose
+```
+
+В конце docstring может быть дополнительное описание конфигурации патча (основное описание получается из модели `Config`).
+Это может быть как короткий фрагмент из названия патча и одной опции "enabled", которая обрабатывается в коде патчера.
+
+"todo_template": {
+    "enabled": true, // Пример описания тк этот текст просто пример
+    "example": true  // Пример кастомного параметра
+}
+"""
+
+priority = 0 # Приоритет патча, чем выше, тем раньше он будет применен
+
+# imports
+from tqdm import tqdm
+from typing import Dict, List, Any
+from pydantic import Field
+
+from utils.config import PatchConfig
+
+#Config
+class Config(PatchConfig):
+    example: bool = Field(True, description="Пример кастомного параметра")
+
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool: # Анотации типов для удобства, читаемости и поддержки IDE
+    tqdm.write("Вывод информации через tqdm, чтобы не мешать прогресс-бару")
+    tqdm.write("Пример включен" if config.example else "Пример отключен")
+    if base["verbose"]:
+        tqdm.write("Для вывода подробной и отладочной информации используйте флаг --verbose")
+    return True

patches/welcome.py

@@ -0,0 +1,56 @@
+"""Добавляет всплывающее окно при первом входе
+
+"welcome": {
+  "enabled": true,
+  "title": "Anixarty",
+  "description": "Описание",
+  "link_text": "МЫ В TELEGRAM",
+  "link_url": "https://t.me/http_teapod",
+  "skip_text": "Пропустить",
+  "title_bg_color": "#FFFFFF"
+}
+"""
+
+priority = 0
+
+# imports
+import os
+import shutil
+from pydantic import Field
+from typing import Dict, Any
+from utils.config import PatchConfig
+from utils.smali_parser import (
+    find_and_replace_smali_line,
+    get_smali_lines,
+    save_smali_lines
+)
+
+#Config
+class Config(PatchConfig):
+    title: str = Field("Anixarty", description="Заголовок")
+    description: str = Field("Описание", description="Описание")
+    link_text: str = Field("МЫ В TELEGRAM", description="Текст ссылки")
+    link_url: str = Field("https://t.me/http_teapod", description="Ссылка")
+    skip_text: str = Field("Пропустить", description="Текст кнопки пропуска")
+    title_bg_color: str = Field("#FFFFFF", description="Цвет фона заголовка")
+
+
+# Patch
+def apply(config: Config, base: Dict[str, Any]) -> bool:
+    # Добавление ресурсов окна первого входа
+    shutil.copy("./resources/avatar.png", "./decompiled/assets/avatar.png")
+    shutil.copy(
+        "./resources/OpenSans-Regular.ttf",
+        "./decompiled/assets/OpenSans-Regular.ttf",
+    )
+    shutil.copytree(
+        "./resources/smali_classes4/", "./decompiled/smali_classes4/"
+    )
+
+    file_path = "./decompiled/smali_classes2/com/swiftsoft/anixartd/ui/activity/MainActivity.smali"
+    method = "invoke-super {p0}, Lmoxy/MvpAppCompatActivity;->onResume()V"
+    lines = get_smali_lines(file_path)
+    lines = find_and_replace_smali_line(lines, method, method+"\ninvoke-static {p0}, Lcom/swiftsoft/about/$2;->oooooo(Landroid/content/Context;)Ljava/lang/Object;")
+    save_smali_lines(file_path, lines)
+
+    return True

resources/ic_chevron_down.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.59 23.26l-0.01 0-0.07 0.03-0.02 0.01-0.01-0.01-0.07-0.03q-0.02-0.01-0.03 0l0 0.01-0.02 0.43 0.01 0.02 0.01 0.02 0.1 0.07 0.02 0 0.01 0 0.1-0.07 0.01-0.02 0.01-0.02-0.02-0.42q0-0.02-0.02-0.02m0.27-0.12l-0.01 0.01-0.19 0.09-0.01 0.01 0 0.01 0.02 0.43 0 0.01 0.01 0.01 0.2 0.09q0.02 0.01 0.03-0.01l0-0.01-0.03-0.61q-0.01-0.02-0.02-0.03m-0.72 0.01a0.02 0.02 0 0 0-0.02 0l-0.01 0.02-0.03 0.61q0 0.02 0.01 0.02l0.02 0 0.2-0.09 0.01-0.01 0-0.01 0.02-0.43 0-0.01-0.01-0.01z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15 16h2.4a4 4 0 0 0 3.94-4.72l-0.91-5A4 4 0 0 0 16.5 3H8v12l1.82 5.79c0.3 0.69 1.06 1.32 2.02 1.13C13.37 21.63 15 20.43 15 18.5z m-9-1a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3z"/>
+</vector>

resources/ic_chevron_down_40.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.59 23.26l-0.01 0-0.07 0.03-0.02 0.01-0.01-0.01-0.07-0.03q-0.02-0.01-0.03 0l0 0.01-0.02 0.43 0.01 0.02 0.01 0.02 0.1 0.07 0.02 0 0.01 0 0.1-0.07 0.01-0.02 0.01-0.02-0.02-0.42q0-0.02-0.02-0.02m0.27-0.12l-0.01 0.01-0.19 0.09-0.01 0.01 0 0.01 0.02 0.43 0 0.01 0.01 0.01 0.2 0.09q0.02 0.01 0.03-0.01l0-0.01-0.03-0.61q-0.01-0.02-0.02-0.03m-0.72 0.01a0.02 0.02 0 0 0-0.02 0l-0.01 0.02-0.03 0.61q0 0.02 0.01 0.02l0.02 0 0.2-0.09 0.01-0.01 0-0.01 0.02-0.43 0-0.01-0.01-0.01z"/>
+    <path
+        android:fillType="evenOdd"
+        android:fillColor="#FF000000"
+        android:pathData="M16.5 3a4 4 0 0 1 3.93 3.28l0.91 5a4 4 0 0 1-3.94 4.72H15v2.5c0 1.93-1.63 3.12-3.15 3.42-0.96 0.18-1.73-0.44-2.03-1.13l-2.48-5.79H6a3 3 0 0 1-3-3v-6a3 3 0 0 1 3-3z m0 2H9v8.59a1 1 0 0 0 0.08 0.39l2.54 5.94c0.88-0.22 1.38-0.83 1.38-1.42v-2.5a2 2 0 0 1 2-2h2.4a2 2 0 0 0 1.97-2.36l-0.91-5a2 2 0 0 0-1.96-1.64M7 5H6a1 1 0 0 0-0.99 0.88L5 6v6a1 1 0 0 0 0.88 0.99l0.12 0.01h1z"/>
+</vector>

resources/ic_chevron_up.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.59 23.26l-0.01 0-0.07 0.03-0.02 0.01-0.01-0.01-0.07-0.03q-0.02-0.01-0.03 0l0 0.01-0.02 0.43 0.01 0.02 0.01 0.02 0.1 0.07 0.02 0 0.01 0 0.1-0.07 0.01-0.02 0.01-0.02-0.02-0.42q0-0.02-0.02-0.02m0.27-0.12l-0.01 0.01-0.19 0.09-0.01 0.01 0 0.01 0.02 0.43 0 0.01 0.01 0.01 0.2 0.09q0.02 0.01 0.03-0.01l0-0.01-0.03-0.61q-0.01-0.02-0.02-0.03m-0.72 0.01a0.02 0.02 0 0 0-0.02 0l-0.01 0.02-0.03 0.61q0 0.02 0.01 0.02l0.02 0 0.2-0.09 0.01-0.01 0-0.01 0.02-0.43 0-0.01-0.01-0.01z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15 8h2.4a4 4 0 0 1 3.94 4.72l-0.91 5A4 4 0 0 1 16.5 21H8V9l1.82-5.79c0.3-0.69 1.06-1.32 2.02-1.13C13.37 2.38 15 3.57 15 5.5zM6 9a3 3 0 0 0-3 3v6a3 3 0 0 0 3 3z"/>
+</vector>

resources/ic_chevron_up_40.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12.59 23.26l-0.01 0-0.07 0.03-0.02 0.01-0.01-0.01-0.07-0.03q-0.02-0.01-0.03 0l0 0.01-0.02 0.43 0.01 0.02 0.01 0.02 0.1 0.07 0.02 0 0.01 0 0.1-0.07 0.01-0.02 0.01-0.02-0.02-0.42q0-0.02-0.02-0.02m0.27-0.12l-0.01 0.01-0.19 0.09-0.01 0.01 0 0.01 0.02 0.43 0 0.01 0.01 0.01 0.2 0.09q0.02 0.01 0.03-0.01l0-0.01-0.03-0.61q-0.01-0.02-0.02-0.03m-0.72 0.01a0.02 0.02 0 0 0-0.02 0l-0.01 0.02-0.03 0.61q0 0.02 0.01 0.02l0.02 0 0.2-0.09 0.01-0.01 0-0.01 0.02-0.43 0-0.01-0.01-0.01z"/>
+    <path
+        android:fillType="evenOdd"
+        android:fillColor="#FF000000"
+        android:pathData="M9.82 3.21c0.3-0.69 1.06-1.32 2.02-1.13 1.47 0.28 3.04 1.4 3.15 3.22L15 5.5V8h2.4a4 4 0 0 1 3.97 4.52l-0.03 0.2-0.91 5a4 4 0 0 1-3.74 3.28l-0.19 0H6a3 3 0 0 1-3-2.82L3 18v-6a3 3 0 0 1 2.82-3L6 9h1.34zM7 11H6a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h1z m4.63-6.92l-2.55 5.94a1 1 0 0 0-0.07 0.26L9 10.41V19h7.5a2 2 0 0 0 1.93-1.49l0.03-0.15 0.91-5a2 2 0 0 0-1.82-2.35L17.41 10H15a2 2 0 0 1-2-1.85L13 8V5.5c0-0.55-0.43-1.12-1.21-1.37z"/>
+</vector>

utils/config.py

@@ -0,0 +1,30 @@
+from pydantic import BaseModel, Field, ValidationError
+from rich.console import Console
+from typing import Dict, Any
+from pathlib import Path
+import typer
+
+
+class ToolsConfig(BaseModel):
+    apktool_jar_url: str
+    apktool_wrapper_url: str
+
+
+class Config(BaseModel):
+    tools: ToolsConfig
+    base: Dict[str, Any]
+
+
+class PatchConfig(BaseModel):
+    enabled: bool = Field(True, description="Включить или отключить патч")
+
+
+def load_config(console: Console) -> Config:
+    try:
+        return Config.model_validate_json(Path("config.json").read_text())
+    except FileNotFoundError:
+        console.print("[red]Файл config.json не найден")
+        raise typer.Exit(1)
+    except ValidationError as e:
+        console.print("[red]Ошибка валидации config.json:", e)
+        raise typer.Exit(1)

utils/hex.py

@@ -1,6 +0,0 @@
-import struct
-
-
-def float_to_hex(f):
-    b = struct.pack(">f", f)
-    return b.hex()

utils/public.py

@@ -1,8 +1,9 @@
-from lxml import etree
+from typing_extensions import Optional
 from copy import deepcopy
+from lxml import etree
 
 
-def insert_after_public(anchor_name: str, elem_name: str):
+def insert_after_public(anchor_name: str, elem_name: str) -> Optional[int]:
     file_path = "./decompiled/res/values/public.xml"
     parser = etree.XMLParser(remove_blank_text=True)
     tree = etree.parse(file_path, parser)
@@ -19,6 +20,8 @@ def insert_after_public(anchor_name: str, elem_name: str):
             anchor = (elem, attrs)
         types[attrs["type"]] = types.get(attrs["type"], []) + [int(attrs["id"], 16)]
 
+    assert anchor != None
+
     free_ids = set()
     group = types[anchor[1]["type"]]
     for i in range(min(group), max(group) + 1):
@@ -47,7 +50,7 @@ def insert_after_public(anchor_name: str, elem_name: str):
     return new_id
 
 
-def insert_after_id(anchor_name: str, elem_name: str):
+def insert_after_id(anchor_name: str, elem_name: str) -> None:
     file_path = "./decompiled/res/values/ids.xml"
     parser = etree.XMLParser(remove_blank_text=True)
     tree = etree.parse(file_path, parser)
@@ -62,13 +65,15 @@ def insert_after_id(anchor_name: str, elem_name: str):
             assert anchor == None
             anchor = (elem, attrs)
 
+    assert anchor != None
+
     new_elem = deepcopy(anchor[0])
     new_elem.set("name", elem_name)
     anchor[0].addnext(new_elem)
     tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
 
-def change_color(name: str, value: str):
+def change_color(name: str, value: str) -> None:
     file_path = "./decompiled/res/values/colors.xml"
     parser = etree.XMLParser(remove_blank_text=True)
     tree = etree.parse(file_path, parser)
@@ -86,7 +91,8 @@ def change_color(name: str, value: str):
     assert replacements >= 1
     tree.write(file_path, pretty_print=True, xml_declaration=True, encoding="utf-8")
 
-def insert_after_color(anchor_name: str, elem_name: str, elem_value: str):
+
+def insert_after_color(anchor_name: str, elem_name: str, elem_value: str) -> None:
     file_path = "./decompiled/res/values/colors.xml"
     parser = etree.XMLParser(remove_blank_text=True)
     tree = etree.parse(file_path, parser)
@@ -101,6 +107,8 @@ def insert_after_color(anchor_name: str, elem_name: str, elem_value: str):
             assert anchor == None
             anchor = (elem, attrs)
 
+    assert anchor != None
+
     new_elem = deepcopy(anchor[0])
     new_elem.set("name", elem_name)
     anchor[0].addnext(new_elem)

utils/smali_parser.py

@@ -67,3 +67,11 @@ def find_and_replace_smali_line(
 def float_to_hex(f):
     b = struct.pack(">f", f)
     return b.hex()
+
+
+def quick_replace(file: str) -> None:
+    content = ""
+    with open(file, "r", encoding="utf-8") as smali:
+        content = smali.read()
+    with open(file, "w", encoding="utf-8") as f:
+        f.writelines(content)

utils/tools.py

@@ -0,0 +1,47 @@
+from plumbum import local, ProcessExecutionError
+from rich.progress import Progress
+from rich.console import Console
+from pathlib import Path
+from typing import List
+import httpx
+import typer
+
+
+TOOLS = Path("tools")
+ORIGINAL = Path("original")
+MODIFIED = Path("modified")
+DECOMPILED = Path("decompiled")
+PATCHES = Path("patches")
+CONFIGS = Path("configs")
+
+
+def ensure_dirs():
+    for d in [TOOLS, ORIGINAL, MODIFIED, DECOMPILED, PATCHES, CONFIGS]:
+        d.mkdir(exist_ok=True)
+
+
+def run(console: Console, cmd: List[str], hide_output=True):
+    prog = local[cmd[0]][cmd[1:]]
+    try:
+        prog() if hide_output else prog & FG # type: ignore [reportUndefinedVariable]
+    except ProcessExecutionError as e:
+        console.print(f"[red]Ошибка при выполнении команды: {' '.join(cmd)}")
+        console.print(e.stderr)
+        raise typer.Exit(1)
+
+
+def download(console: Console, url: str, dest: Path):
+    console.print(f"[cyan]Скачивание {url} → {dest.name}")
+
+    with httpx.Client(follow_redirects=True, timeout=60.0) as client:
+        with client.stream("GET", url) as response:
+            response.raise_for_status()
+            total = int(response.headers.get("Content-Length", 0))
+
+            dest.parent.mkdir(parents=True, exist_ok=True)
+
+            with open(dest, "wb") as f, Progress(console=console) as progress:
+                task = progress.add_task("Загрузка", total=total if total else None)
+                for chunk in response.iter_bytes(chunk_size=8192):
+                    f.write(chunk)
+                    progress.update(task, advance=len(chunk))