From 42069bfc616f7344e16a5ca35fc3d0c16f35d7f1 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:18 +0100 Subject: [PATCH 001/310] New translations strings.xml (French) --- app/src/main/res/values-fr-rFR/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 82733fbbe2..c9ec4125c2 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -37,7 +37,7 @@ Liens utiles Site web Supporte nous ! - %1$s version was copied! + La version de %1$s a été copiée ! Couleur d\'accentuation Bleu @@ -51,9 +51,9 @@ Préférences d\'installation sélectionnées Langue : %1$s Thème: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Utiliser les onglets personnalisés Chrome + Les liens s\'ouvriront dans les onglets personnalisés de Chrome + Les liens s\'ouvriront dans un navigateur externe Thème Suivre le paramètre système Thème sombre From 9043da50a000915197feafd0a546ce05a2c13a97 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:19 +0100 Subject: [PATCH 002/310] New translations strings.xml (Spanish) --- app/src/main/res/values-es-rES/strings.xml | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index f6ebcd3ec8..b5fc943a8d 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -11,7 +11,7 @@ Actualizaciones Descargando %1$s - Fallo al desinstalar paquete %1$s + Falla al desinstalar paquete %1$s Error al descargar %1$s Instalar Instalando %1$s @@ -22,12 +22,12 @@ La operación fallo porque la app es incompatible con tu dispositivo. La operación fallo debido a que los archivos apk son inválidos. Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado verificación de firmas?(signature verification) - Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado las Optimizaciones de MiUI? + Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado las Optimizaciones de MIUI? Operación fallo porque hubo un error con almacenamiento. Porfavor espera hasta que la instalación termine. Reinstalar Instalado: - Ultimo: + Más reciente: Instalación exitosa %1$s Conexion a la red no disponible Sin MicroG! @@ -37,7 +37,7 @@ Links Utiles Sitio Web Apoyanos! - %1$s version was copied! + Version de %1$s fue copiada! Color de Acento Azul @@ -48,19 +48,19 @@ Buscar actualizaciones Interfaz Manager - Valores de instalación escojidos + Valores de instalación escojidos Lenguaje: %1$s Tema: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Usar Chrome Custom Tabs + Links serán abiertos en Chrome Custom Tabs + Links serán abiertos en un Navegador Externo Tema Seguir Sistema Tema Oscuro Tema Claro URL del canal de actualizacion Notificaciones Push - Recibir notificaciones push cuando una actualizacion sea lanzada + Recibir notificaciones push cuando una actualización sea lanzada Reintentar Centro de Actualizaciones Actualización encontrada! @@ -69,10 +69,9 @@ Descartar Guía Un momento! - Parece que estas usando la versión Magisk de Vanced, que está descontinuado y no puede ser actualizada utilizando esta app. Porfavor retírelo primero quitando el módulo magisk. - Usuario MiUI detectado! - Hey! Parece que eres un usuario MiUI. Pará poder usar Vanced Manager apropiadamente necesitarás deshabilitar las Optimizaciones MiUI en ajustes de desarrollador. -Sin embargo, si estas en el ROM 20.2.20 que esta basado en xiaomi.eu, entonces puedes ignorar esta advertencia de forma segura. + Parece que estas usando la versión Magisk de Vanced, la cual esta descontinuada y no puede ser actualizada utilizando esta app. Porfavor retírelo primero quitando el módulo magisk. + MIUI detectado! + Hey! Parece que eres un usuario MIUI. Para poder usar esta aplicacion correctamente, necesitaras deshabilitar las optimizaciones MIUI en ajustes de desarrollador. (Puedes ignorar esta advertencia con seguridad si estas en un ROM 20.2.20 o posterior basado en xiaomi.eu) Error Porfavor asegurate de haver descargado la aplicacion mediante vanced.app, el server de Vanced en Discord, o Github Éxito! From 729c0288de265a25d79279dbe042e030562b901c Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:23 +0100 Subject: [PATCH 003/310] New translations strings.xml (Russian) --- app/src/main/res/values-ru-rRU/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 703f10febd..a450d9e2b5 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -5,7 +5,7 @@ Сброс Сохранить - О приложении + О нас Главная Настройки @@ -37,9 +37,9 @@ Полезные ссылки Сайт Поддержите нас! - %1$s version was copied! + %1$s Версия скопирована! - Акцент + Второстепенный цвет Синий Зелёный Пурпурный @@ -51,9 +51,9 @@ Выбранные значения установки Язык: %1$s Тема: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Использовать Chrome Custom Tabs + Открывать ссылки в Chrome Custom Tabs + Ссылки откроются во внешнем браузере Тема Как в системе Тёмная тема From 6ce28eb1f0895f85681081dad8c67eeedc47b588 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:26 +0100 Subject: [PATCH 004/310] New translations strings.xml (Vietnamese) --- app/src/main/res/values-vi-rVN/strings.xml | 103 ++++++++++----------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index e6343f43c8..3e999e5ffe 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -2,94 +2,93 @@ Đóng - Khởi động lại + Đặt lại Lưu Thông tin Trang chủ - Tùy chỉnh + Cài đặt - Lịch sử thay đổi - Đang tải %1$s - Gỡ cài đặt thất bại gói %1$s - Lỗi đang tải %1$s + Bản ghi các thay đổi + Đang tải xuống %1$s + Gỡ cài đặt thất bại %1$s + Lỗi khi tải xuống %1$s Cài đặt Đang cài đặt %1$s - Hoạt động thất bại do người dùng dừng tiến trình cài đặt - Hoạt động thất bại do người dùng chặn tiến trình cài đặt - Hoạt động thất bại do app xung đột với app đã cài - Hoạt động thất bại vì 1 lý do không rõ, báo lỗi với 1 logcat - Hoạt động thất bại do app không tương thích với thiết bị của bạn - Hoạt động thất bại do file apk bị vô hiệu - Lỗi bất ngờ xảy ra khi đang cài Vanced. Bạn đã vô hiệu hóa xác nhận chữ ký chưa? - Lỗi bất ngờ xảy ra khi đang cài Vanced. Bạn đã vô hiệu hóa MIUI Optimisations chưa? - Hoạt động thất bại do có lỗi với bộ nhớ. - Please wait until the installation finishes + Cài đặt thất bại do người dùng hủy. + Cài đặt thất bại do người dùng chặn. + Cài đặt thất bại do xung đột với ứng dụng đã cài đặt. + Cài đặt thất bại do lỗi không xác định, tham gia Telegram hoặc Discord để được hỗ trợ. + Cài đặt thất bại do ứng dụng không tương thích với thiết bị. + Cài đặt thất bại do file apk bị lỗi. + Một lỗi bất ngờ đã xảy ra khi cài đặt Vanced. Bạn đã vô hiệu hóa Xác thực chứng chỉ apk chưa? + Một lỗi bất ngờ đã xảy ra khi cài đặt Vanced. Bạn đã vô hiệu hóa Tối ưu hóa của MIUI chưa? + Cài đặt thất bại do lỗi bộ nhớ. + Hãy đợi cho đến khi quá trình cài đặt hoàn tất Cài đặt lại Đã cài đặt: Mới nhất: Đã cài đặt thành công %1$s Không có kết nối mạng Không có MicroG! - Truy cập root không được cấp - Không có sẵn + Truy cập root không được cấp + Chưa cài đặt Cập nhật - Link hữu ích + Đường link hữu ích Trang web Hỗ trợ chúng tôi! - %1$s version was copied! + Số phiên bản của %1$s đã được copy! - Màu chính - Màu xanh dương - Màu xanh lá cây - Màu tím - Màu đỏ - Màu vàng + Màu Chính + Xanh dương + Xanh lá + Tím + Đỏ + Vàng Kiểm tra cập nhật Giao diện - Quản lý - Giá trị cài đặt đã chọn + Manager + Kiểu cài đặt ưa thích Ngôn ngữ: %1$s - Theme: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser - Theme - Như hệ thống - Theme tối - Theme sáng - URL nguồn cập nhật - Thông báo đẩy - Nhận thông báo đẩy khi cập nhật được phát hành + Nền: %1$s + Sử dụng Custom Tabs của Chrome + Các đường link sẽ mở trong Custom Tabs của Chrome + Các đường link sẽ mở trong một trình duyệt ngoài + Nền + Theo Hệ Thống + Nền Tối + Nền Sáng + URL Kênh Cập Nhật + Thông Báo Đẩy + Nhận thông báo đẩy khi một bản cập nhật được phát hành Kiểm tra lại Trung tâm cập nhật - Tìm thấy cập nhật! - Không có cập nhật mới + Có bản cập nhật mới! + Không có bản cập nhật mới Bỏ qua Hướng dẫn Khoan đã! - Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. - Phát hiện người dùng MiUI - Hình như bạn là 1 người dùng MiUI. Để dùng Vanced hiệu quả, bạn sẽ phải vô hiệu hóa MiUI optimisations trong cài đặt lập trình viên -Tuy nhiên, nếu bạn đang dùng ROM 20.2.20 từ xiaomi.eu, bạn có thể bỏ qua cảnh báo này. + Bạn đang dùng phiên bản Magisk của Vanced, hiện đã bị ngừng phát triển và không thể được cập nhập bằng ứng dụng này. Hãy gỡ module Magisk. + Phát hiện MIUI! + Có vẻ như bạn là người dùng MIUI. Để dùng ứng dụng này hiệu quả, bạn sẽ phải vô hiệu hóa Tối ưu hóa của MIUI trong cài đặt nhà phát triển. (Bạn có thể bỏ qua cảnh báo này nếu bạn đang dùng ROM 20.2.20+ dựa trên xiaomi.eu) Lỗi - Hãy đảm bảo bạn tải về app từ vanced.app, Vanced Discord server hoặc GitHub + Hãy đảm bảo rằng bạn tải xuống ứng dụng này từ vanced.app, server Discord Vanced hoặc Github Vanced Thành công! - Vanced được cài đặt thành công, bạn có muốn mở nó ngay không? + Vanced đã được cài đặt thành công! Mở ứng dụng? Mở Chào mừng - Chọn ngôn ngữ của bạn cho Vanced - Chú ý: Nếu bạn cài ngôn ngữ khác tiếng Anh, tiếng Anh sẽ được cài làm ngôn ngữ phụ - Chọn theme của bạn cho Vanced - Chế độ root được phát hiện! Để cho Manager cài Vanced chính xác, hãy đảm bảo bạn đã vô hiệu hóa xác nhận chữ ký. + Chọn ngôn ngữ mong muốn cho Vanced + Chú ý: Tiếng Anh sẽ luôn được cài đặt thêm. + Chọn nền mong muốn cho Vanced + Chế độ root được phát hiện! Để cài đặt Vanced, bạn sẽ phải vô hiệu hóa Xác thực chứng chỉ apk. Hoàn tất Sáng + Đen Sáng + Tối Tiếp theo - Quản lý nhà phát triển + Nhà phát triển Manager Nguồn Đội ngũ Vanced From 9dba12b2b0858e6abafb9a5e752a2fbd56c127b5 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:27 +0100 Subject: [PATCH 005/310] New translations strings.xml (Ukrainian) --- app/src/main/res/values-uk-rUA/strings.xml | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index d58362882d..9d9c7f730f 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -6,7 +6,7 @@ Зберегти Про нас - Додому + Головна Налаштування Список змін @@ -26,20 +26,20 @@ Операція не вдалася через помилку зберігання. Будь ласка, зачекайте доки встановлення не закінчиться. Перевстановити - Встановлено: - Найновіші: + Встановлена: + Найновіша: Успішно встановлено %1$s Немає з\'єднання з мережею Без MicroG! Права суперкористувача не були надані Недоступно - Оновлення + Оновити Корисні сторінки Вебсайт - Підтримайте нас! - %1$s version was copied! + Підтримай нас! + версія %1$s скопійована! - Головний Колір + Вторинний колір Синій Зелений Фіолетовий @@ -51,9 +51,9 @@ Вибрані налаштування встановлення Мова: %1$s Тема: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Використовувати Chrome Custom Tabs + Відкривати посилання в Chrome Custom Tabs + Відкривати посилання у зовнішньому браузері Тема Слідувати системі Темна тема @@ -61,7 +61,7 @@ URL-адреса до каналу з оновленнями Спливаючі Сповіщення Отримувати спливаючі сповіщення коли доступна нова версія додатку - Перевірити ще раз + Перепровірити Центр Оновлень Знайдено оновлення! Нових оновлень не виявлено @@ -73,11 +73,11 @@ Виявлено користувача MIUI! Привіт! Схоже, що ви використовуєте MIUI. Для того, щоб користуватися цим додатком, вам доведеться відключити MIUI оптимізацію. (Ви можете спокійно ігнорувати це попередження, якщо ви знаходитесь на 20.2.20 або новішому ПЗУ на основі xiaomi.eu) Помилка - Будь ласка, переконайтеся,що ви завантажили додаток з vanced.app,Vanced діскорд серверу або з GitHub + Будь ласка, переконайтеся, що ви завантажили додаток з Vanced.app, Vanced Discord серверу або з Vanced GitHub Успіх! - Vanced був успішно встановлений, чи хочете ви відкрити його прямо зараз? + Vanced був успішно встановлений, відкрити його прямо зараз? Відкрити - Ласкаво просимо + Привіт! Виберіть вашу головну мову для Vanced Примітка: Якщо ви встановите що-небудь, крім Англійської, Англійська мова все одно буде встановлена як додаткова мова @@ -86,7 +86,7 @@ Завершити Світла + Чорна Світла + Темна - Наступна + Далі Розробники Менеджера Джерела From 7b0c203db357c6c01abd78e1c53f01f765a0caec Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:28 +0100 Subject: [PATCH 006/310] New translations strings.xml (Chinese Simplified) --- app/src/main/res/values-zh-rCN/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6c3e01bc69..d2503d820c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -11,7 +11,7 @@ 变更日志 %1$s 下载中 - %1$s 包装下载失败 + %1$s 解除安装失败 %1$s 下载错误 安装 %1$s 安装中 @@ -24,10 +24,10 @@ 安装 Vanced 时发生意外的错误。您有关闭签名验证吗？ 安装 Vanced 时发生意外的错误。您有关闭 MiUI 优化吗？ 操作失败因为储存错误。 - 请稍后直到安装完成 + 请等待安装完成 重新安装 已安装： - 最新 + 最新： %1$s 成功安装 网络连接不可用 没有 MicroG！ @@ -36,8 +36,8 @@ 更新 有用的链接 网站 - 支持我们 - %1$s version was copied! + 支持我们！ + %1$s 版本已被复制！ 强调色 蓝色 From b5fa8954ae987de2666cd58ac92a000c11414a85 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:30 +0100 Subject: [PATCH 007/310] New translations strings.xml (Chinese Traditional) --- app/src/main/res/values-zh-rTW/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b349951cc9..8f8e251a1c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -10,11 +10,11 @@ 設定 更新日誌 - 下載 %1$s 中 - 未能解除安裝 %1$s + %1$s 下載中 + %1$s 解除安裝失敗 %1$s 下載錯誤 安裝 - 安裝 %1$s 中 + %1$s 安裝中 操作失敗因為用戶放棄了安裝。 操作失敗因為用戶封鎖了安裝。 操作失敗因為應用程式與已安裝的應用程式發生衝突。 @@ -24,7 +24,7 @@ 安裝 Vanced 時發生意外的錯誤。您有關閉 APK 簽名驗證嗎？ 安裝 Vanced 時發生意外的錯誤。您有禁用 MIUI 優化嗎？ 操作失敗因為儲存錯誤。 - 請等候直至安裝完成 + 請等候安裝完成 重新安裝 已安裝： 最新： @@ -37,7 +37,7 @@ 有用的網址 網頁 支持我們！ - %1$s version was copied! + %1$s 版本已被複製！ 強調色 藍色 @@ -60,7 +60,7 @@ 淺色主題 更新路徑網址 推送通知 - 當有更新被發布時接收推送通知 + 當有更新發布時接收推送通知 重新檢查 Manager 更新中心 找到更新！ @@ -70,8 +70,8 @@ 指南 等一下！ 嘿！看來您正使用 Vanced 的 Magisk 版本，它已被中斷及使用時不能被更新。請先透過移除 Magisk 模組來移除它。 - 檢測到 MiUI ！ - 嘿! 您似乎是 MiUI 用戶。 為了能夠正確地使用 Vanced Manager ，您將需要在開發人員設定中禁用 MiUI 優化。（如果您使用的是基於 xiaomi.eu 的20.2.20 ROM 或更新的版本，則可以放心地忽略此警告。） + 檢測到 MIUI ！ + 嘿! 您似乎是 MIUI 用戶。 為了能夠正確地使用 Vanced Manager ，您將需要在開發人員設定中禁用 MiUI 優化。（如果您使用的是基於 xiaomi.eu 的20.2.20 ROM 或更新的版本，則可以放心地忽略此警告。） 錯誤 請確保您於 vanced.app 、 Vanced 的 Discord 伺服器或 GitHub 下載 Vanced 成功！ @@ -88,7 +88,7 @@ 淺色 + 深色 下一個 - 管理員開發者 + Manager 開發人員 程式碼 Vanced 團隊 From 94a1cedd78f817a1af473d1e07423d42af483870 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:32 +0100 Subject: [PATCH 008/310] New translations strings.xml (Portuguese, Brazilian) --- app/src/main/res/values-pt-rBR/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b30e7e8aad..34ace7e7fe 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -37,7 +37,7 @@ Links úteis Site Apoie-nos! - %1$s version was copied! + %1$s versão foi copiado! Cor de destaque Azul @@ -51,9 +51,9 @@ Valores de instalação escolhidos Idioma: %1$s Tema: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Usar abas personalizadas do Chrome + Os links serão abertos nas abas personalizadas do Chrome + Os links serão abertos em um navegador externo Tema Padrão do sistema Escuro From 62d33fb279dcf5af51c9fec566e6283b0930514e Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:33 +0100 Subject: [PATCH 009/310] New translations strings.xml (Polish) --- app/src/main/res/values-pl-rPL/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index fb3f986420..612da420cd 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -37,7 +37,7 @@ Przydatne linki Oficjalna strona Vanced Wesprzyj nas, pobierając Brave - %1$s version was copied! + Wersja %1$s została skopiowana! Kolor Akcentu Niebieski @@ -51,9 +51,9 @@ Wybrane preferencje instalacji Język: %1$s Motyw: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Używaj niestandardowych kart Chrome + Linki zostaną otwarte w niestandardowych kartach Chrome + Linki zostaną otwarte w zewnętrznej przeglądarce Motyw Śledź system Ciemny Motyw From 5a0e6a495c80f4fa0e2affd9945bbdbd98619ec7 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:35 +0100 Subject: [PATCH 010/310] New translations strings.xml (Japanese) --- app/src/main/res/values-ja-rJP/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index d15aea7bad..01966bd0be 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -37,7 +37,7 @@ リンク集 Vanced の公式Webサイト Brave をダウンロードして支援する - %1$s version was copied! + %1$s のバージョンがコピーされました！ アクセントカラー 青 @@ -51,9 +51,9 @@ 選択されたインストール設定 言語: %1$s テーマ: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Chrome カスタムタブを使用する + Chrome カスタムタブでリンクを開く + 外部ブラウザでリンクを開く テーマ システムに従う ダークテーマ From 7c3e764bdbc288440836fa1813feaf82809f7976 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:37 +0100 Subject: [PATCH 011/310] New translations strings.xml (Georgian) --- app/src/main/res/values-ka-rGE/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml index 97c4809877..caebf1f061 100644 --- a/app/src/main/res/values-ka-rGE/strings.xml +++ b/app/src/main/res/values-ka-rGE/strings.xml @@ -37,7 +37,7 @@ საჭირო ლინკები Vanced-ის ოფიციალური ვებსაიტი დაგვიჭირეთ მხარი Brave-ის გადმოწერით - %1$s version was copied! + %1$s-ის ვერსია დაკოპირდა! აქცენტის ფერი ლურჯი From f2b0ddaa4397148775727ea280836e1c33fd1fdf Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:39 +0100 Subject: [PATCH 012/310] New translations strings.xml (Indonesian) --- app/src/main/res/values-in-rID/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 634cc12a6d..5aadf6d48b 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -37,7 +37,7 @@ Tautan Berguna Situs Dukung kami! - %1$s version was copied! + Versi %1$s baru saja disalin! Aksen Warna Biru @@ -51,9 +51,9 @@ Preferensi instalasi yang dipilih Bahasa: %1$s Tema: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Pakai Chrome Custom Tabs + Tautan akan terbuka di Chrome Custom Tabs + Tautan akan terbuka di Browser Eksternal Tema Ikuti Sistem Tema Gelap From 5b78eaba7924812b3cbdc725417409bd384d7ecb Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:40 +0100 Subject: [PATCH 013/310] New translations strings.xml (Italian) --- app/src/main/res/values-it-rIT/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index f3a2562ad0..e99873b1c0 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -37,7 +37,7 @@ Link utili Sito web Sostienici! - %1$s version was copied! + La versione %1$s è stata copiata! Colore evidenziatore Blu From 11d3dfa8024ef6ab585406b32c7545963a1dd971 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:42 +0100 Subject: [PATCH 014/310] New translations strings.xml (Hebrew) --- app/src/main/res/values-iw-rIL/strings.xml | 116 ++++++++++----------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index 287fd90272..b35be9e11a 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -1,20 +1,20 @@ - Close - Reset - Save + סגור + אפס + שמור - About - Home - Settings + אודות + בית + הגדרות - Changelogs - Downloading %1$s - Failed to uninstall package %1$s - Error Downloading %1$s - Install - Installing %1$s + שינויים + מוריד את %1$s + יש בעיה במחיקת החבילה %1$s + בעיה בהורדה של %1$s + התקנה + מתקין את %1$s Operation failed because the user aborted the installation. Operation failed because the user blocked the installation. Operation failed because the app conflicts with an already installed app. @@ -25,27 +25,27 @@ An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? Operation failed due to a storage error. Please wait until the installation finishes - Reinstall - Installed: - Latest: + התקן מחדש + מותקן: + החדש ביותר: Successfully installed %1$s Network connection unavailable - No MicroG! - Root access not granted - Unavailable - Update - Useful Links - Website - Support us! - %1$s version was copied! + MicroG אינו מותקן! + הרשאות Root אינן הוענקו + אינו זמין + עדכן + קישורים שימושיים + אתר + תמכו בנו! + הגרסה של %1$s הועתקה! - Accent Color - Blue - Green - Purple - Red - Yellow - Check for updates + צבע הדגשה + כחול + ירוק + סגול + אדום + צהוב + בדוק אחר עדכונים Interface Manager Chosen installation preferences @@ -53,42 +53,42 @@ Theme: %1$s Use Chrome Custom Tabs Links will open in Chrome Custom Tabs - Links will open in an External Browser - Theme - Follow System - Dark Theme - Light Theme + קישורים יפתחו בדפדפן חיצוני + ערכת נושא + בהתאם למערכת + ערכת נושא כהה + ערכת נושא בהירה Update Channel URL - Push Notifications - Receive push notifications when an update is released - Re-check - Manager Update Center - Update found! - No new updates + התראות + קבל הודעה ברגע שעדכון משתחרר + בדיקה מחדש + מרכז העדכונים + עדכון נמצא! + אין עדכונים חדשים - Dismiss - Guide - Hold on! - Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. - MIUI detected! + התעלם + מדריך + רק רגע! + נדמה שאתה משתמש בגרסת הMagisk של Vanced, שתמיכה בה הופסקה והגרסה אינה יכולה להתעדכן בעזרת האפליקציה הזו. אנא מחק אותה קודם על ידי מחיקת מודול בMagisk. + MIUI זוהה! Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) - Error + בעיה Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub Success! Vanced has successfully been installed! Launch now? Launch - Welcome + ברוכים הבאים - Choose your preferred language for Vanced - Note: English will always be installed as an additional language as well. - Choose your preferred theme for Vanced + בחר את השפה המועדפת עליך לVanced + תזכורת: אנגלית תמיד תהיה מותקנת בתור שפה נוספת. + בחר את המראה מועדף שלך בשביל Vanced Root mode detected! To install Vanced, you will need to disable the apk signature verification. - Finish - Light + Black - Light + Dark - Next + סיום + בהיר + שחור + בהיר + כהה + הבא - Manager Dev - Sources - Vanced Team + מפתח המנהל + מקורות + צוות Vanced From 3b98fce692c64d1de55a9a1031df0dcb4a92513f Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:45 +0100 Subject: [PATCH 015/310] New translations strings.xml (German) --- app/src/main/res/values-de-rDE/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 096398724b..38d4f52ddf 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -37,7 +37,7 @@ Nützliche Links Webseite Ünterstütze uns! - %1$s version was copied! + %1$s-Version erfolgreich kopiert! Akzentfarbe Blau From ba3ab3f3a5b361d8edfccb09915b061d6aa2fd81 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 05:47:47 +0100 Subject: [PATCH 016/310] New translations strings.xml (Bengali, India) --- app/src/main/res/values-bn-rIN/strings.xml | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 4f222d67b0..00e9e7e47a 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -1,26 +1,26 @@ - Close + বন্ধ করুন রিসেট করুন সেভ করুন - About - Home - Settings + সম্বন্ধে + হোম + সেটিংস - Changelogs - Downloading %1$s - Failed to uninstall package %1$s - Error Downloading %1$s - Install - Installing %1$s - Operation failed because the user aborted the installation. - Operation failed because the user blocked the installation. - Operation failed because the app conflicts with an already installed app. - Operation failed for an unknown reason, please join our Telegram or Discord for support. - Operation failed because the app is incompatible with your device. - Operation failed because the apk files are invalid. + পরিবর্তনগুলি + %1$s ডাউনলোড করা হচ্ছে + %1$s পেকেজ আন‌ইনস্টল করা যাইনি + %1$s ডাউনলোড করতে ত্রুটি + ইনস্টল করুন + %1$s ইনস্টল করা হচ্ছে + অপারেশন ব্যর্থ হয়েছে কারণ ব্যবহারকারী বাতিল করে দিয়েছে। + অপারেশন ব্যর্থ হয়েছে কারণ ব্যবহারকারী আটকিয়ে দিয়েছে। + অপারেশন ব্যর্থ হয়েছে কারণ অ্যাপটি অন্য একটি ইনস্টল করা অ্যাপের সঙ্গে সংঘর্ষে আছে। + অপারেশন ব্যর্থ হয়েছে অজানা কারণে, দয়া করে আমাদের Telegram বা Discord এ সংযু্ক্ত হ‌ন সাহায্যের জন্য। + অপারেশন ব্যর্থ হয়েছে কারণ অ্যাপটি আপনার ডিভাইস এর সঙ্গে ব্যবহারযোগ্য নয়। + অপারেশন ব্যর্থ হয়েছে কারণ apk ফাইলগুলো অকার্যকর। An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? Operation failed due to a storage error. From 1ba1d7f570f4222a32fa8e98c7b703ab924748ad Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 16:49:35 +0400 Subject: [PATCH 017/310] swiperefreshlayout test --- app/build.gradle | 6 +- .../manager/ui/viewmodels/HomeViewModel.kt | 81 +++---- .../com/vanced/manager/utils/ThemeHelper.kt | 4 +- app/src/main/res/layout/fragment_home.xml | 198 +++++++++--------- 4 files changed, 155 insertions(+), 134 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e520aa457..ccc3461f40 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,12 +66,14 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2' - implementation 'androidx.navigation:navigation-ui-ktx:2.2.2' + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' implementation 'androidx.preference:preference-ktx:1.1.1' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.google.android.material:material:1.1.0' // Other + implementation 'com.crowdin.platform:mobile-sdk:1.1.4' implementation 'com.github.100rabhkr:GetJSON:1.0' implementation 'com.github.topjohnwu.libsu:core:2.5.1' implementation 'com.mindorks.android:prdownloader:0.6.0' diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt index 6337499635..113d1a3771 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt @@ -34,27 +34,60 @@ class HomeViewModel(application: Application): AndroidViewModel(application) { val vancedInstallButtonTxt: MutableLiveData = MutableLiveData() val vancedInstallButtonIcon: MutableLiveData = MutableLiveData() - - val microgInstalled: Boolean = isPackageInstalled("com.mgoogle.android.gms", application.packageManager) - val vancedInstalled: Boolean = isPackageInstalled(vancedPkgName, application.packageManager) - + val microgInstalled: MutableLiveData = MutableLiveData() + val vancedInstalled: MutableLiveData = MutableLiveData() val vancedInstalledVersion: MutableLiveData = MutableLiveData() val microgInstalledVersion: MutableLiveData = MutableLiveData() - val vancedVersion: MutableLiveData = MutableLiveData() val microgVersion: MutableLiveData = MutableLiveData() + val microgInstallButtonTxt: MutableLiveData = MutableLiveData() + val microgInstallButtonIcon: MutableLiveData = MutableLiveData() - private val vancedInstalledVersionCode = getPkgVerCode(vancedInstalled, vancedPkgName) - private val microgInstalledVersionCode = getPkgVerCode(microgInstalled, "com.mgoogle.android.gms") - - private val vancedVersionCode = displayJsonInt("vanced.json", "versionCode", application) - private val microgVersionCode = displayJsonInt("microg.json", "versionCode", application) + private val vancedInstalledVersionCode: MutableLiveData = MutableLiveData() + private val microgInstalledVersionCode: MutableLiveData = MutableLiveData() - val microgInstallButtonTxt = compareInt(microgInstalledVersionCode, microgVersionCode, application) - val microgInstallButtonIcon = compareIntDrawable(microgInstalledVersionCode, microgVersionCode, application) + private val vancedVersionCode: MutableLiveData = MutableLiveData() + private val microgVersionCode: MutableLiveData = MutableLiveData() val nonrootModeSelected: Boolean = variant == "nonroot" + val fetching: MutableLiveData = MutableLiveData() + + fun fetchData() { + fetching.value = true + vancedVersion.value = displayJsonString("vanced.json", "version", getApplication()) + microgVersion.value = displayJsonString("microg.json", "version", getApplication()) + vancedInstalledVersion.value = getPkgInfo(vancedInstalled.value!!, vancedPkgName, getApplication()) + microgInstalledVersion.value = getPkgInfo(microgInstalled.value!!, "com.mgoogle.android.gms", getApplication()) + microgInstalled.value = isPackageInstalled("com.mgoogle.android.gms", pm) + vancedVersionCode.value = displayJsonInt("vanced.json", "versionCode", getApplication()) + microgVersionCode.value = displayJsonInt("microg.json", "versionCode", getApplication()) + vancedInstalledVersionCode.value = getPkgVerCode(vancedInstalled.value!!, vancedPkgName) + vancedInstalledVersionCode.value = getPkgVerCode(microgInstalled.value!!, "com.mgoogle.android.gms") + vancedInstalled.value = isPackageInstalled(vancedPkgName, pm) + microgInstallButtonTxt.value = compareInt(microgInstalledVersionCode.value!!, microgVersionCode.value!!, getApplication()) + microgInstallButtonIcon.value = compareIntDrawable(microgInstalledVersionCode.value!!, microgVersionCode.value!!, getApplication()) + vancedInstallButtonIcon.value = + if (variant == "nonroot") { + if (microgInstalled.value!!) + compareIntDrawable(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + else + null + } else + compareIntDrawable(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + + vancedInstallButtonTxt.value = + if (variant == "nonroot") { + if (microgInstalled.value!!) { + compareInt(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + } else { + getApplication().getString(R.string.no_microg) + } + } else + compareInt(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + fetching.value = false + } + fun openMicrogSettings() { try { val intent = Intent() @@ -132,29 +165,7 @@ class HomeViewModel(application: Application): AndroidViewModel(application) { } init { - vancedVersion.value = displayJsonString("vanced.json", "version", application) - microgVersion.value = displayJsonString("microg.json", "version", application) - vancedInstalledVersion.value = getPkgInfo(vancedInstalled, vancedPkgName, application) - microgInstalledVersion.value = getPkgInfo(microgInstalled, "com.mgoogle.android.gms", application) - vancedInstallButtonIcon.value = - if (variant == "nonroot") { - if (microgInstalled) - compareIntDrawable(vancedVersionCode, vancedInstalledVersionCode, application) - else - null - } else - compareIntDrawable(vancedVersionCode, vancedInstalledVersionCode, application) - - vancedInstallButtonTxt.value = - if (variant == "nonroot") { - if (microgInstalled) { - compareInt(vancedVersionCode, vancedInstalledVersionCode, application) - } else { - application.getString(R.string.no_microg) - } - } else - compareInt(vancedVersionCode, vancedInstalledVersionCode, application) - + fetchData() } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/utils/ThemeHelper.kt b/app/src/main/java/com/vanced/manager/utils/ThemeHelper.kt index a9449a52a2..7c1b0d4b78 100644 --- a/app/src/main/java/com/vanced/manager/utils/ThemeHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/ThemeHelper.kt @@ -1,13 +1,13 @@ package com.vanced.manager.utils +import android.app.Activity import android.content.res.Configuration import androidx.preference.PreferenceManager import com.vanced.manager.R -import com.vanced.manager.ui.MainActivity object ThemeHelper { - fun setFinalTheme(activity: MainActivity) { + fun setFinalTheme(activity: Activity) { val currentAccent = PreferenceManager.getDefaultSharedPreferences(activity).getString("accent_color", "Blue") when (PreferenceManager.getDefaultSharedPreferences(activity) .getString("theme_mode", "Follow System")) { diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fee06b9053..fe6b6fcc67 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -12,120 +12,128 @@ - + bind:refreshing="@{viewModel.fetching}" + bind:onRefreshListener="@{()-> viewModel.fetchData()}"> - + android:fillViewport="true" + android:scrollbars="none"> - + android:layout_height="match_parent" + android:layout_marginTop="4dp" + android:animateLayoutChanges="true" + android:orientation="vertical"> - + android:layout_marginStart="25dp" + android:layout_marginEnd="25dp" + android:orientation="horizontal"> - - - + + + + + + + + - - - - + + + + + + + + + + - - - - - - - - + android:layout_marginStart="@dimen/stdp" + android:layout_marginTop="@dimen/stdp" + android:layout_marginEnd="@dimen/stdp" + bind:viewModel="@{viewModel}" /> + + + + - - - - - + - + - + - + \ No newline at end of file From a5475985dfe90f7ac50a942f5729ee021da7dad3 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 17:11:34 +0400 Subject: [PATCH 018/310] fixed build --- .../main/java/com/vanced/manager/ui/fragments/HomeFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index af9bdffb87..2f11f3a90c 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt @@ -46,7 +46,7 @@ class HomeFragment : Home() { attachRootChangelog() else { attachNonrootChangelog() - if (!viewModel.microgInstalled) { + if (!viewModel.microgInstalled.value!!) { disableVancedButton() } } From 1ddd26604b79d18ac0222d5cb4bb3aad40a4cd90 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 17:23:47 +0400 Subject: [PATCH 019/310] fixed NullPointerException --- .../java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt index 113d1a3771..c075f6b6c7 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt @@ -57,14 +57,14 @@ class HomeViewModel(application: Application): AndroidViewModel(application) { fetching.value = true vancedVersion.value = displayJsonString("vanced.json", "version", getApplication()) microgVersion.value = displayJsonString("microg.json", "version", getApplication()) + microgInstalled.value = isPackageInstalled("com.mgoogle.android.gms", pm) + vancedInstalled.value = isPackageInstalled(vancedPkgName, pm) vancedInstalledVersion.value = getPkgInfo(vancedInstalled.value!!, vancedPkgName, getApplication()) microgInstalledVersion.value = getPkgInfo(microgInstalled.value!!, "com.mgoogle.android.gms", getApplication()) - microgInstalled.value = isPackageInstalled("com.mgoogle.android.gms", pm) vancedVersionCode.value = displayJsonInt("vanced.json", "versionCode", getApplication()) microgVersionCode.value = displayJsonInt("microg.json", "versionCode", getApplication()) vancedInstalledVersionCode.value = getPkgVerCode(vancedInstalled.value!!, vancedPkgName) - vancedInstalledVersionCode.value = getPkgVerCode(microgInstalled.value!!, "com.mgoogle.android.gms") - vancedInstalled.value = isPackageInstalled(vancedPkgName, pm) + microgInstalledVersionCode.value = getPkgVerCode(microgInstalled.value!!, "com.mgoogle.android.gms") microgInstallButtonTxt.value = compareInt(microgInstalledVersionCode.value!!, microgVersionCode.value!!, getApplication()) microgInstallButtonIcon.value = compareIntDrawable(microgInstalledVersionCode.value!!, microgVersionCode.value!!, getApplication()) vancedInstallButtonIcon.value = From 6909be380ba095314585c2e1625e2a7a84126917 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 19:05:09 +0400 Subject: [PATCH 020/310] switched to observable field --- .../manager/ui/fragments/HomeFragment.kt | 11 +-- .../manager/ui/viewmodels/HomeViewModel.kt | 77 ++++++++++--------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index 2f11f3a90c..cddb42a9b4 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt @@ -46,7 +46,7 @@ class HomeFragment : Home() { attachRootChangelog() else { attachNonrootChangelog() - if (!viewModel.microgInstalled.value!!) { + if (!viewModel.microgInstalled.get()!!) { disableVancedButton() } } @@ -94,13 +94,8 @@ class HomeFragment : Home() { private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { when (intent.action) { - MICROG_DOWNLOADED -> { - binding.includeMicrogLayout.microgInstalling.visibility = View.VISIBLE - //activity?.let { installApp(it, it.filesDir.path + "/microg.apk", "com.mgoogle.android.gms") } - } - VANCED_DOWNLOADED -> { - binding.includeVancedLayout.vancedInstalling.visibility = View.VISIBLE - } + MICROG_DOWNLOADED -> binding.includeMicrogLayout.microgInstalling.visibility = View.VISIBLE + VANCED_DOWNLOADED -> binding.includeVancedLayout.vancedInstalling.visibility = View.VISIBLE } } } diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt index c075f6b6c7..80e91a67a7 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt @@ -11,6 +11,7 @@ import android.widget.Toast import androidx.browser.customtabs.CustomTabsIntent import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat.startActivity +import androidx.databinding.ObservableField import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.preference.PreferenceManager.getDefaultSharedPreferences @@ -32,60 +33,62 @@ class HomeViewModel(application: Application): AndroidViewModel(application) { private val pm = application.packageManager - val vancedInstallButtonTxt: MutableLiveData = MutableLiveData() - val vancedInstallButtonIcon: MutableLiveData = MutableLiveData() - val microgInstalled: MutableLiveData = MutableLiveData() - val vancedInstalled: MutableLiveData = MutableLiveData() - val vancedInstalledVersion: MutableLiveData = MutableLiveData() - val microgInstalledVersion: MutableLiveData = MutableLiveData() - val vancedVersion: MutableLiveData = MutableLiveData() - val microgVersion: MutableLiveData = MutableLiveData() - val microgInstallButtonTxt: MutableLiveData = MutableLiveData() - val microgInstallButtonIcon: MutableLiveData = MutableLiveData() + val vancedInstallButtonTxt = ObservableField() + val vancedInstallButtonIcon = ObservableField() + val microgInstalled = ObservableField() + val vancedInstalled = ObservableField() + val vancedInstalledVersion = ObservableField() + val microgInstalledVersion = ObservableField() + val vancedVersion = ObservableField() + val microgVersion = ObservableField() + val microgInstallButtonTxt = ObservableField() + val microgInstallButtonIcon = ObservableField() - private val vancedInstalledVersionCode: MutableLiveData = MutableLiveData() - private val microgInstalledVersionCode: MutableLiveData = MutableLiveData() + private val vancedInstalledVersionCode = ObservableField() + private val microgInstalledVersionCode = ObservableField() - private val vancedVersionCode: MutableLiveData = MutableLiveData() - private val microgVersionCode: MutableLiveData = MutableLiveData() + private val vancedVersionCode = ObservableField() + private val microgVersionCode = ObservableField() val nonrootModeSelected: Boolean = variant == "nonroot" - val fetching: MutableLiveData = MutableLiveData() + val fetching = ObservableField() fun fetchData() { - fetching.value = true - vancedVersion.value = displayJsonString("vanced.json", "version", getApplication()) - microgVersion.value = displayJsonString("microg.json", "version", getApplication()) - microgInstalled.value = isPackageInstalled("com.mgoogle.android.gms", pm) - vancedInstalled.value = isPackageInstalled(vancedPkgName, pm) - vancedInstalledVersion.value = getPkgInfo(vancedInstalled.value!!, vancedPkgName, getApplication()) - microgInstalledVersion.value = getPkgInfo(microgInstalled.value!!, "com.mgoogle.android.gms", getApplication()) - vancedVersionCode.value = displayJsonInt("vanced.json", "versionCode", getApplication()) - microgVersionCode.value = displayJsonInt("microg.json", "versionCode", getApplication()) - vancedInstalledVersionCode.value = getPkgVerCode(vancedInstalled.value!!, vancedPkgName) - microgInstalledVersionCode.value = getPkgVerCode(microgInstalled.value!!, "com.mgoogle.android.gms") - microgInstallButtonTxt.value = compareInt(microgInstalledVersionCode.value!!, microgVersionCode.value!!, getApplication()) - microgInstallButtonIcon.value = compareIntDrawable(microgInstalledVersionCode.value!!, microgVersionCode.value!!, getApplication()) - vancedInstallButtonIcon.value = + fetching.set(true) + vancedVersion.set(displayJsonString("vanced.json", "version", getApplication())) + microgVersion.set(displayJsonString("microg.json", "version", getApplication())) + microgInstalled.set(isPackageInstalled("com.mgoogle.android.gms", pm)) + vancedInstalled.set(isPackageInstalled(vancedPkgName, pm)) + vancedInstalledVersion.set(getPkgInfo(vancedInstalled.get()!!, vancedPkgName, getApplication())) + microgInstalledVersion.set(getPkgInfo(microgInstalled.get()!!, "com.mgoogle.android.gms", getApplication())) + vancedVersionCode.set(displayJsonInt("vanced.json", "versionCode", getApplication())) + microgVersionCode.set(displayJsonInt("microg.json", "versionCode", getApplication())) + vancedInstalledVersionCode.set(getPkgVerCode(vancedInstalled.get()!!, vancedPkgName)) + microgInstalledVersionCode.set(getPkgVerCode(microgInstalled.get()!!, "com.mgoogle.android.gms")) + microgInstallButtonTxt.set(compareInt(microgInstalledVersionCode.get()!!, microgVersionCode.get()!!, getApplication())) + microgInstallButtonIcon.set(compareIntDrawable(microgInstalledVersionCode.get()!!, microgVersionCode.get()!!, getApplication())) + vancedInstallButtonIcon.set( if (variant == "nonroot") { - if (microgInstalled.value!!) - compareIntDrawable(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + if (microgInstalled.get()!!) + compareIntDrawable(vancedVersionCode.get()!!, vancedInstalledVersionCode.get()!!, getApplication()) else null } else - compareIntDrawable(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + compareIntDrawable(vancedVersionCode.get()!!, vancedInstalledVersionCode.get()!!, getApplication()) + ) - vancedInstallButtonTxt.value = + vancedInstallButtonTxt.set( if (variant == "nonroot") { - if (microgInstalled.value!!) { - compareInt(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) + if (microgInstalled.get()!!) { + compareInt(vancedVersionCode.get()!!, vancedInstalledVersionCode.get()!!, getApplication()) } else { getApplication().getString(R.string.no_microg) } } else - compareInt(vancedVersionCode.value!!, vancedInstalledVersionCode.value!!, getApplication()) - fetching.value = false + compareInt(vancedVersionCode.get()!!, vancedInstalledVersionCode.get()!!, getApplication()) + ) + fetching.set(false) } fun openMicrogSettings() { From dba06dd570cd905f3cf27f5b1bc7d1aaf6d027c0 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 19:06:23 +0400 Subject: [PATCH 021/310] fixed build --- .../main/java/com/vanced/manager/ui/fragments/HomeFragment.kt | 4 ++-- .../java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt index cddb42a9b4..b991fe3887 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt @@ -57,14 +57,14 @@ class HomeFragment : Home() { binding.includeVancedLayout.vancedCard.setOnLongClickListener { val clip = requireActivity().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - clip.setPrimaryClip(ClipData.newPlainText("vanced", this.viewModel.vancedInstalledVersion.value)) + clip.setPrimaryClip(ClipData.newPlainText("vanced", this.viewModel.vancedInstalledVersion.get())) versionToast("Vanced") true } binding.includeMicrogLayout.microgCard.setOnLongClickListener { val clip = requireActivity().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - clip.setPrimaryClip(ClipData.newPlainText("microg", viewModel.microgInstalledVersion.value)) + clip.setPrimaryClip(ClipData.newPlainText("microg", viewModel.microgInstalledVersion.get())) versionToast("MicroG") true } diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt index 80e91a67a7..111a24527e 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt @@ -33,6 +33,7 @@ class HomeViewModel(application: Application): AndroidViewModel(application) { private val pm = application.packageManager + //this is fucking retarded val vancedInstallButtonTxt = ObservableField() val vancedInstallButtonIcon = ObservableField() val microgInstalled = ObservableField() @@ -54,6 +55,7 @@ class HomeViewModel(application: Application): AndroidViewModel(application) { val fetching = ObservableField() + //this too fun fetchData() { fetching.set(true) vancedVersion.set(displayJsonString("vanced.json", "version", getApplication())) From f53f922299222870285deb5ff2ed7a1b11b12cb8 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 19:29:12 +0400 Subject: [PATCH 022/310] color test --- .../main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt | 1 - app/src/main/res/layout/fragment_home.xml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt index 111a24527e..aa1931dafa 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt @@ -13,7 +13,6 @@ import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat.startActivity import androidx.databinding.ObservableField import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.MutableLiveData import androidx.preference.PreferenceManager.getDefaultSharedPreferences import com.vanced.manager.R import com.vanced.manager.utils.InternetTools.displayJsonInt diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index fe6b6fcc67..cb77e95d63 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -15,6 +15,8 @@ From 9a48f6f79d3d5595edf53af37364fcbba050f69f Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 19:40:30 +0400 Subject: [PATCH 023/310] color test 2 --- app/src/main/res/layout/fragment_home.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index cb77e95d63..f908e99c9f 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -15,8 +15,7 @@ From b45550b9c4e431f1f01e1f84893da574d71e36bd Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 20:05:25 +0400 Subject: [PATCH 024/310] bumped up version --- app/build.gradle | 2 +- app/src/main/res/layout/fragment_home.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ccc3461f40..3915f84283 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 11 - versionName "1.1.0 (Big Sur)" + versionName "1.1.1 (Rotten Eggs)" vectorDrawables.useSupportLibrary = true } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f908e99c9f..fe6b6fcc67 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -15,7 +15,6 @@ From 75202544b6985531cded102e37b6e771e3e14981 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 20:06:46 +0400 Subject: [PATCH 025/310] bumped up version code --- app/build.gradle | 2 +- app/src/main/res/values-es-rES/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3915f84283..2db01bae70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "com.vanced.manager" minSdkVersion 21 targetSdkVersion 29 - versionCode 11 + versionCode 12 versionName "1.1.1 (Rotten Eggs)" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index f6ebcd3ec8..dd936b8100 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -18,7 +18,7 @@ La operación fallo porque el usuario abortó la instalación La operación fallo porque el usuario bloqueo la instalación La operación fallo porque la app entra en conflicto con una app ya instalada - La operacion fallo por una razon desconocida, porfavor únete a nuestro grupo de Telegram o Discord para brindar soporte. + La operación fallo por una razon desconocida, porfavor únete a nuestro grupo de Telegram o Discord para brindar soporte. La operación fallo porque la app es incompatible con tu dispositivo. La operación fallo debido a que los archivos apk son inválidos. Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado verificación de firmas?(signature verification) From 87964d1fd7a6f3b1d9dd471d1dc17d384c6c33a6 Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 20:15:00 +0400 Subject: [PATCH 026/310] fixed url opening in about menu --- .../manager/ui/viewmodels/AboutViewModel.kt | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/AboutViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/AboutViewModel.kt index 3804771dd7..4c5822978d 100644 --- a/app/src/main/java/com/vanced/manager/ui/viewmodels/AboutViewModel.kt +++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/AboutViewModel.kt @@ -6,16 +6,24 @@ import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent import androidx.core.content.ContextCompat import androidx.lifecycle.AndroidViewModel +import androidx.preference.PreferenceManager import com.vanced.manager.R -open class AboutViewModel(application: Application): AndroidViewModel(application) { +class AboutViewModel(application: Application): AndroidViewModel(application) { fun openUrl(Url: String) { - val builder = CustomTabsIntent.Builder() - builder.setToolbarColor(ContextCompat.getColor(getApplication(), R.color.GitHub)) - val customTabsIntent = builder.build() - customTabsIntent.intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK - customTabsIntent.launchUrl(getApplication(), Uri.parse(Url)) + val customTabPrefs = PreferenceManager.getDefaultSharedPreferences(getApplication()).getBoolean("use_customtabs", true) + if (customTabPrefs) { + val builder = CustomTabsIntent.Builder() + builder.setToolbarColor(ContextCompat.getColor(getApplication(), R.color.GitHub)) + val customTabsIntent = builder.build() + customTabsIntent.intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + customTabsIntent.launchUrl(getApplication(), Uri.parse(Url)) + } else { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(Url)) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + ContextCompat.startActivity(getApplication(), intent, null) + } } } \ No newline at end of file From 3ca82359644e46a51977e003c61767504d46aa4a Mon Sep 17 00:00:00 2001 From: X1nto Date: Sun, 5 Jul 2020 20:16:18 +0400 Subject: [PATCH 027/310] fixed button position in update center --- app/src/main/res/layout/fragment_update_check.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_update_check.xml b/app/src/main/res/layout/fragment_update_check.xml index 1f9d81d330..bac39deb8d 100644 --- a/app/src/main/res/layout/fragment_update_check.xml +++ b/app/src/main/res/layout/fragment_update_check.xml @@ -45,7 +45,8 @@ + android:layout_height="wrap_content" + android:layout_gravity="center"> + android:text="@string/update" /> Date: Sun, 5 Jul 2020 17:51:27 +0100 Subject: [PATCH 028/310] New translations strings.xml (Spanish) --- app/src/main/res/values-es-rES/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index b5fc943a8d..73e9150fc3 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -74,15 +74,15 @@ Hey! Parece que eres un usuario MIUI. Para poder usar esta aplicacion correctamente, necesitaras deshabilitar las optimizaciones MIUI en ajustes de desarrollador. (Puedes ignorar esta advertencia con seguridad si estas en un ROM 20.2.20 o posterior basado en xiaomi.eu) Error Porfavor asegurate de haver descargado la aplicacion mediante vanced.app, el server de Vanced en Discord, o Github - Éxito! - Vanced a sido instalado exitosamente, quieres lanzarlo ahora? + Éxito! + Vanced ha sido exitosamente instalado! Lanzar ahora? Lanzar Bienvenido Elije tu lenguaje preferido para Vanced - Nota: si instalas un idioma ademas de Ingles, Ingles va estar todavia instalado como un lenguaje adicional + Nota: Ingles va a estar instalado como un lenguaje adicional también. Elije tu tema preferido para Vanced - Modo root detectado! Pará que el Manager pueda instalar Vanced correctamente, por favor asegúrate de que hayas deshabilitado verificación de firmas(signature verification). + Modo root detectado! Para instalar Vanced, necesitaras deshabilitar verificación de firmas(disable signature verification). Finalizar Claro + Negro Claro + Oscuro From afb80c1bbffaa6b2eacee2f79b8e3bae3b105e7f Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 17:51:28 +0100 Subject: [PATCH 029/310] New translations strings.xml (Korean) --- app/src/main/res/values-ko-rKR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 31c91af594..a082ba38e7 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -37,7 +37,7 @@ 참고할 만한 링크 웹사이트 우리를 지원해주세요! - %1$s version was copied! + %1$s의 버전 정보가 복사되었습니다. 강조 색상 파란색 From 1112237999e49242a5f143238c51369444deabb1 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 17:51:29 +0100 Subject: [PATCH 030/310] New translations strings.xml (Chinese Simplified) --- app/src/main/res/values-zh-rCN/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d2503d820c..c90452135b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -46,13 +46,13 @@ 红色 黄色 检查更新 - 接口 - 管理员 + 介面 + Manager 已选择安装偏好 语言： %1$s 主题： %1$s - 使用 Chrome 自定义标签页 - 链接将会在 Chrome 自定义标签页中打开 + 使用 Chrome 自定义分页 + 链接将会在 Chrome 自定义分页中打开 链接将会在外部浏览器中打开 主题 跟随系统 From c26af3d9cf61b7ee9b3d6cb1236a37854f3156aa Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 5 Jul 2020 17:51:31 +0100 Subject: [PATCH 031/310] New translations strings.xml (Chinese Traditional) --- app/src/main/res/values-zh-rTW/strings.xml | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8f8e251a1c..739e682929 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -10,32 +10,32 @@ 設定 更新日誌 - %1$s 下載中 + 正在下載 %1$s %1$s 解除安裝失敗 %1$s 下載錯誤 安裝 - %1$s 安裝中 - 操作失敗因為用戶放棄了安裝。 - 操作失敗因為用戶封鎖了安裝。 + 正在安裝 %1$s + 操作失敗，使用者終止了安裝程序。 + 作業失敗，使用者封鎖了安裝程序。 操作失敗因為應用程式與已安裝的應用程式發生衝突。 因未知原因導致操作失敗，請加入我們的 Telegram 或 Discord 尋找支援。 - 操作失敗因為它與您的裝置不兼容。 - 操作失敗因為 APK 檔案無效。 + 作業失敗，應用程式與裝置不相容。 + 作業失敗，APK 檔案無效。 安裝 Vanced 時發生意外的錯誤。您有關閉 APK 簽名驗證嗎？ 安裝 Vanced 時發生意外的錯誤。您有禁用 MIUI 優化嗎？ - 操作失敗因為儲存錯誤。 - 請等候安裝完成 + 作業失敗，儲存空間發生錯誤。 + 請等待安裝程序完成。 重新安裝 已安裝： 最新： 成功安裝 %1$s 網際網絡無法存取 沒有 MicroG！ - 未有授權 Root 權限 + 未授予 Root 權限 不可用 更新 - 有用的網址 - 網頁 + 相關連結 + 網站 支持我們！ %1$s 版本已被複製！ @@ -47,15 +47,15 @@ 黃色 檢查更新 介面 - 管理員 + Manager 已選擇安裝偏好 語言： %1$s 主題： %1$s - 使用 Chrome 自訂標籤頁 - 網址將會在 Chrome 自訂標籤頁中開啟 - 網址將會在外部瀏覽器中開啟 + 使用 Chrome 自訂分頁 + 網址將會在 Chrome 自訂分頁中開啟 + 連結會使用外部瀏覽器開啟 主題 - 跟隨系統預設 + 跟隨系統 深色主題 淺色主題 更新路徑網址 @@ -67,26 +67,26 @@ 沒有新的更新 關閉 - 指南 + 說明 等一下！ 嘿！看來您正使用 Vanced 的 Magisk 版本，它已被中斷及使用時不能被更新。請先透過移除 Magisk 模組來移除它。 檢測到 MIUI ！ 嘿! 您似乎是 MIUI 用戶。 為了能夠正確地使用 Vanced Manager ，您將需要在開發人員設定中禁用 MiUI 優化。（如果您使用的是基於 xiaomi.eu 的20.2.20 ROM 或更新的版本，則可以放心地忽略此警告。） 錯誤 - 請確保您於 vanced.app 、 Vanced 的 Discord 伺服器或 GitHub 下載 Vanced + 請確保您是從 vanced.app、Vanced Discord 伺服器或 Vanced GitHub 下載本應用程式。 成功！ Vanced 已成功安裝，現在啟動嗎？ 啟動 歡迎 為 Vanced 選擇您偏好的語言 - 備註：英語仍然會被安裝作其他語言 + 備註：英文仍會當作附加語言安裝 為 Vanced 選擇您偏好的主題 檢測到 Root ！ 為了能夠安裝 Vanced ，您將需要禁用簽名驗證。 完成 淺色 + 黑色 淺色 + 深色 - 下一個 + 下一步 Manager 開發人員 程式碼 From dfcf6bccd8801bdea801d89ba137289e05885bf8 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Mon, 6 Jul 2020 05:47:38 +0100 Subject: [PATCH 032/310] New translations strings.xml (Hebrew) --- app/src/main/res/values-iw-rIL/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index b35be9e11a..9e6c61a591 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -15,10 +15,10 @@ בעיה בהורדה של %1$s התקנה מתקין את %1$s - Operation failed because the user aborted the installation. - Operation failed because the user blocked the installation. - Operation failed because the app conflicts with an already installed app. - Operation failed for an unknown reason, please join our Telegram or Discord for support. + הפעולה נכשלה מכיוון שהמשתמש ביטל את ההתקנה. + הפעולה נכשלה מכיוון שהמשתמש חסם את ההתקנה. + הפעולה נכשלה מכיוון שהאפליקציה סותרת עם אפליקציה שכבר מותקנת. + הפעולה נכשלה בגלל סיבה אינה ידועה, בבקשה הצטרפו לטלגרם או דיסקורד שלנו בשביל עזרה. Operation failed because the app is incompatible with your device. Operation failed because the apk files are invalid. An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? @@ -46,8 +46,8 @@ אדום צהוב בדוק אחר עדכונים - Interface - Manager + ממשק + מנהל Chosen installation preferences Language: %1$s Theme: %1$s @@ -74,9 +74,9 @@ Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) בעיה Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub - Success! + הצלחה! Vanced has successfully been installed! Launch now? - Launch + התחל ברוכים הבאים בחר את השפה המועדפת עליך לVanced From 6ad859259972c17b16c7d9f97f78126ffb93521f Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 6 Jul 2020 12:46:41 +0400 Subject: [PATCH 033/310] mobed dark theme to thems.xml --- .../manager/ui/dialogs/DialogContainer.kt | 2 + .../main/res/layout/fragment_update_check.xml | 2 +- app/src/main/res/values/themes-dark.xml | 69 ------------------- app/src/main/res/values/themes.xml | 69 +++++++++++++++++++ 4 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 app/src/main/res/values/themes-dark.xml diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt index c30b1f2095..4a237f14c6 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt @@ -42,6 +42,7 @@ object DialogContainer { .setNeutralButton(context.getString(R.string.guide)) { _, _ -> openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context) } + .setCancelable(false) .create() .show() } @@ -56,6 +57,7 @@ object DialogContainer { .setNeutralButton(activity.getString(R.string.guide)) { _, _ -> openUrl("https://lmgtfy.com/?q=andnixsh+apk+verification+disable", R.color.Twitter, activity) } + .setCancelable(false) .setOnDismissListener { PreferenceManager.getDefaultSharedPreferences(activity).edit().putBoolean("show_root_dialog", false).apply() } .create() .show() diff --git a/app/src/main/res/layout/fragment_update_check.xml b/app/src/main/res/layout/fragment_update_check.xml index bac39deb8d..9ceb694979 100644 --- a/app/src/main/res/layout/fragment_update_check.xml +++ b/app/src/main/res/layout/fragment_update_check.xml @@ -30,7 +30,7 @@ android:layout_marginTop="4dp" android:layout_marginStart="0dp" android:layout_gravity="center" - android:text="Checking For Updates..." + android:text="" android:textAlignment="center" android:textSize="16sp" /> diff --git a/app/src/main/res/values/themes-dark.xml b/app/src/main/res/values/themes-dark.xml deleted file mode 100644 index 84204cafbe..0000000000 --- a/app/src/main/res/values/themes-dark.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 813275a80e..320d70a57a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,8 @@ + + + + + + + + + + + + + + \ No newline at end of file From 5d8ce16a6bf17f0f8091a858956cdd8ec6242b6d Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 6 Jul 2020 15:38:00 +0400 Subject: [PATCH 034/310] added Crowdin integration --- .../main/java/com/vanced/manager/core/App.kt | 15 +++++++++++ .../com/vanced/manager/ui/MainActivity.kt | 26 ++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt index 11a5a88a51..51e821e425 100644 --- a/app/src/main/java/com/vanced/manager/core/App.kt +++ b/app/src/main/java/com/vanced/manager/core/App.kt @@ -1,6 +1,10 @@ package com.vanced.manager.core import android.app.Application +import android.content.res.Configuration +import com.crowdin.platform.Crowdin +import com.crowdin.platform.CrowdinConfig +import com.crowdin.platform.data.remote.NetworkType import com.downloader.PRDownloader import com.vanced.manager.utils.NotificationHelper.createNotifChannel @@ -10,6 +14,17 @@ class App: Application() { super.onCreate() PRDownloader.initialize(this) createNotifChannel(this) + + Crowdin.init(this, + CrowdinConfig.Builder() + .withDistributionHash("36c51aed3180a4f43073d28j4s6") + .withNetworkType(NetworkType.WIFI) + .build()) + } + + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + Crowdin.onConfigurationChanged() } } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt index 4ddf242325..be030341cf 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -13,6 +13,8 @@ import androidx.navigation.NavDestination import androidx.navigation.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.setupWithNavController +import com.crowdin.platform.Crowdin +import com.crowdin.platform.LoadingStateListener import com.vanced.manager.R import com.vanced.manager.core.Main import com.vanced.manager.databinding.ActivityMainBinding @@ -37,15 +39,24 @@ class MainActivity : Main() { regularPackageInstalled(getString(R.string.successfully_installed, "MicroG"), this@MainActivity) } INSTALL_FAILED -> installAlertBuilder(intent.getStringExtra("errorMsg") as String, this@MainActivity) - APP_UNINSTALLED -> { - restartActivity() - Log.d("VMpm", "test") - } + APP_UNINSTALLED -> restartActivity() APP_NOT_UNINSTALLED -> installAlertBuilder(getString(R.string.failed_uninstall, intent.getStringExtra("pkgName")), this@MainActivity) } } } + private val loadingObserver = object : LoadingStateListener { + val tag = "VMLocalisation" + override fun onDataChanged() { + Log.d(tag, "Loaded data") + } + + override fun onFailure(throwable: Throwable) { + Log.d(tag, "Failed to load data") + } + + } + override fun onCreate(savedInstanceState: Bundle?) { setFinalTheme(this) super.onCreate(savedInstanceState) @@ -61,11 +72,15 @@ class MainActivity : Main() { navHost.addOnDestinationChangedListener { _, currFrag: NavDestination, _ -> setDisplayHomeAsUpEnabled(currFrag.id != R.id.home_fragment) } + + Crowdin.registerDataLoadingObserver(loadingObserver) + } override fun onPause() { super.onPause() localBroadcastManager.unregisterReceiver(broadcastReceiver) + Crowdin.unregisterDataLoadingObserver(loadingObserver) } override fun onResume() { @@ -100,7 +115,10 @@ class MainActivity : Main() { private fun setDisplayHomeAsUpEnabled(isNeeded: Boolean) { binding.homeToolbar.navigationIcon = if (isNeeded) getDrawable(R.drawable.ic_keyboard_backspace_black_24dp) else null + } + override fun attachBaseContext(newBase: Context) { + super.attachBaseContext(Crowdin.wrapContext(newBase)) } private fun registerReceivers() { From f90101abb778fcf50617fcdacb64b6b78df21c14 Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 6 Jul 2020 15:58:02 +0400 Subject: [PATCH 035/310] fixed build --- app/src/main/java/com/vanced/manager/core/App.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt index 51e821e425..b102130880 100644 --- a/app/src/main/java/com/vanced/manager/core/App.kt +++ b/app/src/main/java/com/vanced/manager/core/App.kt @@ -1,7 +1,6 @@ package com.vanced.manager.core import android.app.Application -import android.content.res.Configuration import com.crowdin.platform.Crowdin import com.crowdin.platform.CrowdinConfig import com.crowdin.platform.data.remote.NetworkType @@ -22,9 +21,11 @@ class App: Application() { .build()) } + /* override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) Crowdin.onConfigurationChanged() } + */ } \ No newline at end of file From d3caeb755409fbff4f08fc9e4ccbbfd626af9958 Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 6 Jul 2020 18:29:27 +0400 Subject: [PATCH 036/310] all main activity code now belongs to MainActivity.kt --- .../main/java/com/vanced/manager/core/Main.kt | 61 ------------------- .../com/vanced/manager/ui/MainActivity.kt | 49 ++++++++++++++- 2 files changed, 47 insertions(+), 63 deletions(-) delete mode 100644 app/src/main/java/com/vanced/manager/core/Main.kt diff --git a/app/src/main/java/com/vanced/manager/core/Main.kt b/app/src/main/java/com/vanced/manager/core/Main.kt deleted file mode 100644 index ebb7a73116..0000000000 --- a/app/src/main/java/com/vanced/manager/core/Main.kt +++ /dev/null @@ -1,61 +0,0 @@ -package com.vanced.manager.core - -import android.annotation.SuppressLint -import android.content.Context -import android.os.Bundle -import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity -import androidx.preference.PreferenceManager -import com.dezlum.codelabs.getjson.GetJson -import com.vanced.manager.R -import com.vanced.manager.ui.dialogs.DialogContainer.basicDialog -import com.vanced.manager.ui.dialogs.DialogContainer.showRootDialog -import com.vanced.manager.ui.dialogs.DialogContainer.showSecurityDialog -import com.vanced.manager.ui.dialogs.DialogContainer.statementFalse -import com.vanced.manager.ui.fragments.UpdateCheckFragment -import com.vanced.manager.utils.InternetTools.isUpdateAvailable -import com.vanced.manager.utils.PackageHelper.getPackageVersionName - -// This activity will NOT be used in manifest -// since MainActivity will extend it -@SuppressLint("Registered") -open class Main: AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val prefs = PreferenceManager.getDefaultSharedPreferences(this) - val variant = prefs.getString("vanced_variant", "nonroot") - val showRootDialog = prefs.getBoolean("show_root_dialog", true) - - when { - prefs.getBoolean("firstStart", true) -> showSecurityDialog(this) - !prefs.getBoolean("statement", true) -> statementFalse(this) - variant == "root" -> { - if (showRootDialog) - showRootDialog(this) - - if (getPackageVersionName("com.google.android.youtube", packageManager) == "14.21.54") - basicDialog(getString(R.string.hold_on), getString(R.string.magisk_vanced), this) - } - } - - checkUpdates() - - } - - override fun onPause() { - getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply() - getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isVancedDownloading", false).apply() - getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isMicrogDownloading", false).apply() - super.onPause() - } - - private fun checkUpdates() { - if (GetJson().isConnected(this) && isUpdateAvailable()) { - val fm = supportFragmentManager - UpdateCheckFragment().show(fm, "UpdateCheck") - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt index be030341cf..897f4bfcbb 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -7,23 +7,29 @@ import android.content.IntentFilter import android.os.Bundle import android.util.Log import android.view.MenuItem +import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.navigation.NavDestination import androidx.navigation.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.setupWithNavController +import androidx.preference.PreferenceManager import com.crowdin.platform.Crowdin import com.crowdin.platform.LoadingStateListener +import com.dezlum.codelabs.getjson.GetJson import com.vanced.manager.R -import com.vanced.manager.core.Main import com.vanced.manager.databinding.ActivityMainBinding +import com.vanced.manager.ui.dialogs.DialogContainer import com.vanced.manager.ui.dialogs.DialogContainer.installAlertBuilder import com.vanced.manager.ui.dialogs.DialogContainer.launchVanced import com.vanced.manager.ui.dialogs.DialogContainer.regularPackageInstalled +import com.vanced.manager.ui.fragments.UpdateCheckFragment +import com.vanced.manager.utils.InternetTools +import com.vanced.manager.utils.PackageHelper import com.vanced.manager.utils.ThemeHelper.setFinalTheme -class MainActivity : Main() { +class MainActivity : AppCompatActivity() { private lateinit var binding: ActivityMainBinding private val navHost by lazy { findNavController(R.id.bottom_nav_host) } @@ -75,10 +81,15 @@ class MainActivity : Main() { Crowdin.registerDataLoadingObserver(loadingObserver) + initDialogs() + } override fun onPause() { super.onPause() + getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply() + getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isVancedDownloading", false).apply() + getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isMicrogDownloading", false).apply() localBroadcastManager.unregisterReceiver(broadcastReceiver) Crowdin.unregisterDataLoadingObserver(loadingObserver) } @@ -137,6 +148,40 @@ class MainActivity : Main() { finish() } + private fun initDialogs() { + val prefs = PreferenceManager.getDefaultSharedPreferences(this) + val variant = prefs.getString("vanced_variant", "nonroot") + val showRootDialog = prefs.getBoolean("show_root_dialog", true) + + when { + prefs.getBoolean("firstStart", true) -> DialogContainer.showSecurityDialog(this) + !prefs.getBoolean("statement", true) -> DialogContainer.statementFalse(this) + variant == "root" -> { + if (showRootDialog) + DialogContainer.showRootDialog(this) + + if (PackageHelper.getPackageVersionName( + "com.google.android.youtube", + packageManager + ) == "14.21.54") + DialogContainer.basicDialog( + getString(R.string.hold_on), + getString(R.string.magisk_vanced), + this + ) + } + } + + checkUpdates() + } + + private fun checkUpdates() { + if (GetJson().isConnected(this) && InternetTools.isUpdateAvailable()) { + val fm = supportFragmentManager + UpdateCheckFragment().show(fm, "UpdateCheck") + } + } + companion object { const val INSTALL_COMPLETED = "install_completed" const val INSTALL_FAILED = "install_failed" From 70affaefdad18706915c74403fec4073703d04f5 Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 6 Jul 2020 18:36:27 +0400 Subject: [PATCH 037/310] improved code --- app/src/main/java/com/vanced/manager/ui/MainActivity.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt index 897f4bfcbb..da535095c4 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -87,9 +87,11 @@ class MainActivity : AppCompatActivity() { override fun onPause() { super.onPause() - getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply() - getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isVancedDownloading", false).apply() - getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isMicrogDownloading", false).apply() + with(getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit()) { + putBoolean("isInstalling", false).apply() + putBoolean("isVancedDownloading", false).apply() + putBoolean("isMicrogDownloading", false).apply() + } localBroadcastManager.unregisterReceiver(broadcastReceiver) Crowdin.unregisterDataLoadingObserver(loadingObserver) } From b1e6b0d1b2deb1fb4d0cca5ea1ac42a404074022 Mon Sep 17 00:00:00 2001 From: X1nto Date: Mon, 6 Jul 2020 19:29:16 +0400 Subject: [PATCH 038/310] testing --- app/src/main/AndroidManifest.xml | 3 ++- .../main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 55350fe611..b664a6c25d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,7 +38,8 @@ + android:label="@string/app_name" + android:theme="@style/Theme.MaterialComponents"/> Date: Mon, 6 Jul 2020 19:44:10 +0400 Subject: [PATCH 039/310] testing 2 --- .../main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt | 2 +- app/src/main/res/values/themes.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt index 97490f22ea..4a237f14c6 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt @@ -15,7 +15,7 @@ import com.vanced.manager.utils.MiuiHelper object DialogContainer { fun showSecurityDialog(context: Context) { - AlertDialog.Builder(context, R.style.ThemeOverlay_AppCompat_Dialog_Alert) + AlertDialog.Builder(context) .setTitle(context.resources.getString(R.string.welcome)) .setMessage(context.resources.getString(R.string.security_context)) .setCancelable(false) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 320d70a57a..a48ae877c0 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -28,6 +28,7 @@ true ?colorSurface #787777 + @style/ThemeOverlay.MaterialComponents.Dialog.Alert @@ -95,6 +96,7 @@ ?colorSurface ?colorSurface #000000 + @style/ThemeOverlay.MaterialComponents.Dialog.Alert From 5b99024d956f731d1b9c26dd52286e172dd4e319 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Mon, 6 Jul 2020 17:49:27 +0100 Subject: [PATCH 040/310] New translations strings.xml (French) --- app/src/main/res/values-fr-rFR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index c9ec4125c2..9e1ba928ef 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -51,7 +51,7 @@ Préférences d\'installation sélectionnées Langue : %1$s Thème: %1$s - Utiliser les onglets personnalisés Chrome + Utiliser les onglets personnalisés de Chrome Les liens s\'ouvriront dans les onglets personnalisés de Chrome Les liens s\'ouvriront dans un navigateur externe Thème From dcdf0d8d2d739023b69120e831621edd8fa4cb0f Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Mon, 6 Jul 2020 17:49:29 +0100 Subject: [PATCH 041/310] New translations strings.xml (Korean) --- app/src/main/res/values-ko-rKR/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index a082ba38e7..16fa87c049 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -51,9 +51,9 @@ 선택된 설치값 언어: %1$s 테마: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Chrome 맞춤 탭 사용 + 링크가 Chrome 맞춤 탭으로 열립니다 + 링크가 외부 브라우저로 열립니다 테마 시스템 설정과 같이 다크 테마 From 5bc2421d8b0017bfb760c44662b53b5142b7ccf1 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Mon, 6 Jul 2020 17:49:31 +0100 Subject: [PATCH 042/310] New translations strings.xml (Norwegian) --- app/src/main/res/values-no-rNO/strings.xml | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 287fd90272..10039fd06b 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -1,20 +1,20 @@ - Close - Reset - Save + Lukk + Nullstill + Lagre - About - Home - Settings + Om + Hjem + Innstillinger Changelogs - Downloading %1$s + Laster ned %1$s Failed to uninstall package %1$s Error Downloading %1$s - Install - Installing %1$s + Installer + Installerer %1$s Operation failed because the user aborted the installation. Operation failed because the user blocked the installation. Operation failed because the app conflicts with an already installed app. @@ -24,32 +24,32 @@ An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? Operation failed due to a storage error. - Please wait until the installation finishes - Reinstall - Installed: - Latest: + Vennligst vent til installasjonen er ferdig + Reinstaller + Installert: + Siste: Successfully installed %1$s Network connection unavailable - No MicroG! + Ingen MicroG! Root access not granted - Unavailable - Update + Utilgjengelig + Oppdater Useful Links - Website - Support us! + Nettside + Støtt oss! %1$s version was copied! Accent Color - Blue - Green - Purple - Red - Yellow - Check for updates + Blå + Grønn + Lilla + Rød + Gul + Se etter oppdateringer Interface Manager Chosen installation preferences - Language: %1$s + Språk: %1$s Theme: %1$s Use Chrome Custom Tabs Links will open in Chrome Custom Tabs From 92038ee89ea03956a65bab6b44fecad38054d9dd Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Tue, 7 Jul 2020 05:48:01 +0100 Subject: [PATCH 043/310] New translations strings.xml (French) --- app/src/main/res/values-fr-rFR/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 9e1ba928ef..457d881585 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -51,8 +51,8 @@ Préférences d\'installation sélectionnées Langue : %1$s Thème: %1$s - Utiliser les onglets personnalisés de Chrome - Les liens s\'ouvriront dans les onglets personnalisés de Chrome + Utiliser les onglets personnalisés Chrome + Les liens s\'ouvriront dans les onglets personnalisés Chrome Les liens s\'ouvriront dans un navigateur externe Thème Suivre le paramètre système From 0b27c05c7dbacf81c41c7365ad3d5f07fa8b09b1 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Tue, 7 Jul 2020 05:48:03 +0100 Subject: [PATCH 044/310] New translations strings.xml (Spanish) --- app/src/main/res/values-es-rES/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 73e9150fc3..5e6dd91472 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -2,7 +2,7 @@ Cerrar - Resetear + Restablecer Guardar Información @@ -23,7 +23,7 @@ La operación fallo debido a que los archivos apk son inválidos. Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado verificación de firmas?(signature verification) Un error inesperado ocurrió durante la instalación de Vanced. Has deshabilitado las Optimizaciones de MIUI? - Operación fallo porque hubo un error con almacenamiento. + La operación falló debido a un error de almacenamiento. Porfavor espera hasta que la instalación termine. Reinstalar Instalado: @@ -48,7 +48,7 @@ Buscar actualizaciones Interfaz Manager - Valores de instalación escojidos + Preferencias de instalación elegidas Lenguaje: %1$s Tema: %1$s Usar Chrome Custom Tabs @@ -79,9 +79,9 @@ Lanzar Bienvenido - Elije tu lenguaje preferido para Vanced - Nota: Ingles va a estar instalado como un lenguaje adicional también. - Elije tu tema preferido para Vanced + Elige tu idioma preferido para Vanced + Nota: Ingles va a estar instalado como un idioma adicional. + Elige tu tema preferido para Vanced Modo root detectado! Para instalar Vanced, necesitaras deshabilitar verificación de firmas(disable signature verification). Finalizar Claro + Negro From 8b6ac83f2bbf2cdc7dfdd6a0551e0cb4cead0026 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Tue, 7 Jul 2020 05:48:04 +0100 Subject: [PATCH 045/310] New translations strings.xml (Chinese Traditional) --- app/src/main/res/values-zh-rTW/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 739e682929..ca86b48ed1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -32,14 +32,14 @@ 網際網絡無法存取 沒有 MicroG！ 未授予 Root 權限 - 不可用 + 無法使用 更新 相關連結 網站 支持我們！ - %1$s 版本已被複製！ + %1$s 版本已複製！ - 強調色 + 輔色 藍色 綠色 紫色 @@ -63,7 +63,7 @@ 當有更新發布時接收推送通知 重新檢查 Manager 更新中心 - 找到更新！ + 有可用的更新！ 沒有新的更新 關閉 @@ -89,6 +89,6 @@ 下一步 Manager 開發人員 - 程式碼 + 原始碼 Vanced 團隊 From 2c6ae99935f776050e4b58f71029757c65dc24d5 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Tue, 7 Jul 2020 17:48:54 +0100 Subject: [PATCH 046/310] New translations strings.xml (Hindi) --- app/src/main/res/values-hi-rIN/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index c4b66c6990..f15a71a88e 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -24,7 +24,7 @@ Vनाथ स्थापित करते समय अप्रत्याशित त्रुटि हुई। क्या आपने हस्ताक्षर सत्यापन अक्षम कर दिया है? Vनाथ स्थापित करते समय अप्रत्याशित त्रुटि हुई। क्या आपने MiUI ऑप्टिमाइज़ेशन को अक्षम कर दिया है? संग्रहण विफल होने के कारण ऑपरेशन विफल हो गया। पकड़ो कि यह कैसे संभव है? - Please wait until the installation finishes + कृपया स्थापना समाप्त होने तक प्रतीक्षा करें फिर से इंस्टॉल (इन्स्टॉल्ड लेट्इस्ट @@ -37,7 +37,7 @@ उपयोगी लिंक्स वेबसाइट हमें सपॉर्ट कीजिये! - %1$s version was copied! + %1$s संस्करण कॉपी किया गया था! एक्सेंट रंग नीला @@ -51,9 +51,9 @@ इंस्टालेशन चुनाव भाषा: %1$s थीम: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + क्रोम कस्टम टैब का उपयोग करें + क्रोम कस्टम टैब में लिंक खुलेंगे + लिंक एक बाहरी ब्राउज़र में खुलेंगे थीम सिस्टम का पालन करें डार्क थीम @@ -69,7 +69,7 @@ डिस्मिस गाइड रुको! - Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. + ऐसा लगता है कि आप Vanced के Magisk संस्करण का उपयोग कर रहे हैं, जिसे बंद कर दिया गया है और इस ऐप का उपयोग करके अपडेट नहीं किया जा सकता है। कृपया इसे पहले मैजिक मॉड्यूल हटाकर हटा दें। पता लगाया MiUI उपयोगकर्ता! अरे! लगता है कि आप MiUI उपयोगकर्ता हैं। Vanced Manager को ठीक से उपयोग करने के लिए, आपको डेवलपर सेटिंग में MiUI ऑप्टिमाइज़ेशन को अक्षम करना होगा हालाँकि, यदि आप 20.2.20 ROM पर हैं जो xiaomi.eu पर आधारित है, तो आप इस चेतावनी को सुरक्षित रूप से अनदेखा कर सकते हैं। From e1c7287f92ffef8fbb88e81e4bb972d0bc7e443e Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Tue, 7 Jul 2020 17:48:56 +0100 Subject: [PATCH 047/310] New translations strings.xml (Czech) --- app/src/main/res/values-cs-rCZ/strings.xml | 166 ++++++++++----------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 287fd90272..fe06f462e4 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -1,94 +1,94 @@ - Close - Reset - Save + Zavřít + Resetovat + Uložit - About - Home - Settings + O aplikaci + Domů + Nastavení - Changelogs - Downloading %1$s - Failed to uninstall package %1$s - Error Downloading %1$s - Install - Installing %1$s - Operation failed because the user aborted the installation. - Operation failed because the user blocked the installation. - Operation failed because the app conflicts with an already installed app. - Operation failed for an unknown reason, please join our Telegram or Discord for support. - Operation failed because the app is incompatible with your device. - Operation failed because the apk files are invalid. - An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? - An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? - Operation failed due to a storage error. - Please wait until the installation finishes - Reinstall - Installed: - Latest: - Successfully installed %1$s - Network connection unavailable - No MicroG! - Root access not granted - Unavailable - Update - Useful Links - Website - Support us! - %1$s version was copied! + Seznamy změn + Stahování %1$s + Nepodařilo se odinstalovat balíček %1$s + Chyba při stahování %1$s + Nainstalovat + Probíhá instalace %1$s + Operace se nezdařila, protože uživatel zrušil instalaci. + Operace se nezdařila, protože uživatel zablokoval instalaci. + Operace se nezdařila, protože aplikace je v konfliktu s již nainstalovanou aplikací. + Operace se nezdařila z neznámého důvodu, prosím, připojte se k našemu Telegramu nebo Discordu pro podporu. + Operace se nezdařila, protože aplikace není kompatibilní s vaším zařízením. + Operace se nezdařila, protože apk soubory jsou neplatné. + Při instalaci aplikace Vanced došlo k neočekávané chybě. Máte vypnuto ověření podpisu APK? + Při instalaci aplikace Vanced došlo k neočekávané chybě. Máte vypnuty optimalizace MIUI? + Operace se nezdařila z důvodu chyby v úložišti. + Počkejte prosím na dokončení instalace + Přeinstalovat + Nainstalováno: + Nejnovější: + Úspěšně nainstalováno %1$s + Nelze se připojit k Internetu + Chybí MicroG! + Root přístup nebyl udělen + Není k dispozici + Aktualizovat + Užitečné odkazy + Webová stránka + Podpořte nás! + Verze %1$s byla zkopírována! - Accent Color - Blue - Green - Purple - Red - Yellow - Check for updates - Interface + Doplňková barva + Modrá + Zelená + Fialová + Červená + Žlutá + Zkontrolovat aktualizace + Vzhled Manager - Chosen installation preferences - Language: %1$s - Theme: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser - Theme - Follow System - Dark Theme - Light Theme - Update Channel URL - Push Notifications - Receive push notifications when an update is released - Re-check - Manager Update Center - Update found! - No new updates + Zvolené parametry instalace + Jazyk: %1$s + Vzhled: %1$s + Používat Vlastní karty Chrome + Odkazy se otevřou na vlastních kartách Chrome + Odkazy se otevřou v externím prohlížeči + Vzhled + Podle systému + Tmavý motiv + Světlý motiv + URL aktualizačního kanálu + Vyskakovací oznámení + Po vydání aktualizace obdržíte vyskakovací oznámení + Zkontrolovat znovu + Centrum aktualizací + Nalezena aktualizace! + Žádné nové aktualizace - Dismiss - Guide - Hold on! - Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. - MIUI detected! - Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) - Error - Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub - Success! - Vanced has successfully been installed! Launch now? - Launch - Welcome + Zavřít + Návod + Počkejte! + Vypadá to, že používáte verzi Vanced pro Magisk, která je ukončena a pomocí této aplikace ji nelze aktualizovat. Nejprve ji odstraňte odinstalací modulu Magisk. + Zjištěno MIUI! + Ahoj! Vypadá to, že používáte MIUI. Abyste mohli správně používat tuto aplikaci, budete muset vypnout optimalizaci MIUI v nastavení pro vývojáře. (Toto varování můžete bezpečně ignorovat, pokud máte ROM z 20.2.20 nebo pozdější založenou na xiaomi.eu) + Chyba + Prosím ujistěte se, že jste si aplikaci stáhli z našeho webu vanced.app, z našeho Discord serveru nebo našeho GitHubu. + Hotovo! + Aplikace Vanced byla úspěšně nainstalována! Chcete ji spustit? + Spustit + Vítejte - Choose your preferred language for Vanced - Note: English will always be installed as an additional language as well. - Choose your preferred theme for Vanced - Root mode detected! To install Vanced, you will need to disable the apk signature verification. - Finish - Light + Black - Light + Dark - Next + Zvolte preferovaný jazyk pro Vanced + Poznámka: Angličtina bude nainstalována jako dodatečný jazyk. + Zvolte preferovaný motiv pro Vanced + Byl zjištěn režim root! Chcete-li nainstalovat Vanced, budete muset vypnout ověření podpisu APK. + Dokončit + Světlý + Černý + Světlý + Tmavý + Další - Manager Dev - Sources - Vanced Team + Vývojář aplikace + Zdrojový kód + Tým Vanced From 9d8e37f5823fc8c46f5a0830c91ff3483d38af3f Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Tue, 7 Jul 2020 17:48:57 +0100 Subject: [PATCH 048/310] New translations strings.xml (Bengali, India) --- app/src/main/res/values-bn-rIN/strings.xml | 130 ++++++++++----------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 00e9e7e47a..dd9e8a9489 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -21,74 +21,74 @@ অপারেশন ব্যর্থ হয়েছে অজানা কারণে, দয়া করে আমাদের Telegram বা Discord এ সংযু্ক্ত হ‌ন সাহায্যের জন্য। অপারেশন ব্যর্থ হয়েছে কারণ অ্যাপটি আপনার ডিভাইস এর সঙ্গে ব্যবহারযোগ্য নয়। অপারেশন ব্যর্থ হয়েছে কারণ apk ফাইলগুলো অকার্যকর। - An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? - An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? - Operation failed due to a storage error. - Please wait until the installation finishes - Reinstall - Installed: - Latest: - Successfully installed %1$s - Network connection unavailable - No MicroG! - Root access not granted + ভ্যানসড ইনস্টল করার সময় একটি অপ্রত্যাশিত ত্রুটি ঘটেছে। আপনি এপিকে স্বাক্ষর যাচাইকরণ অক্ষম করেছেন? + ভ্যানসড ইনস্টল করার সময় একটি অপ্রত্যাশিত ত্রুটি ঘটেছে। আপনি কি এমআইইউআই অপটিমাইজেশন অক্ষম করেছেন? + সঞ্চয়ের ত্রুটির কারণে অপারেশন ব্যর্থ হয়েছিল।. + ইনস্টলেশন শেষ হওয়া পর্যন্ত অপেক্ষা করুন + পুনরায় ইনস্টল করুন + ইনস্টল হয়েছে: + সর্বশেষ: + সাফল্যের সাথে ইনস্টল %1$s + নেটওয়ার্ক সংযোগ অনুপলব্ধ + মাইক্রো নেই! + রুট অ্যাক্সেস দেওয়া হয়নি অলভ্য - Update - Useful Links - Website - Support us! - %1$s version was copied! + হালনাগাদ + উপকারী সংজুক + ওয়েবসাইট + আমাদের সমর্থন! + %1$s সংস্করণটি অনুলিপি করা হয়েছিল! - Accent Color - Blue - Green - Purple - Red - Yellow - Check for updates - Interface - Manager - Chosen installation preferences - Language: %1$s - Theme: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser - Theme - Follow System - Dark Theme - Light Theme - Update Channel URL - Push Notifications - Receive push notifications when an update is released - Re-check - Manager Update Center - Update found! - No new updates + সুরের ধাপের রঙ + নীল + সবুজ + রক্তবর্ণ + লাল + হলুদ + হালনাগাদ এর জন্য অনুসন্ধান করুন + ইন্টারফেস + ম্যানেজার + নির্বাচিত ইনস্টলেশন পছন্দগুলি + ভাষা: %1$s + থিম: %1$s + Chrome কাস্টম ট্যাব ব্যবহার করুন + লিঙ্কগুলি Chrome কাস্টম ট্যাবগুলিতে খোলা হবে + লিঙ্কগুলি একটি বাহ্যিক ব্রাউজারে খুলবে + বিষয় + সিস্টেম অনুসরণ করুন + গাark থিম + হালকা থিম + চ্যানেল ইউআরএল আপডেট করুন + বিজ্ঞপ্তি পুশ করুন + কোনও আপডেট প্রকাশিত হলে পুশ বিজ্ঞপ্তিগুলি পান + রি-চেক + পরিচালক আপডেট কেন্দ্র Center + আপডেট পাওয়া গেল! + কোনও নতুন আপডেট নেই - Dismiss - Guide - Hold on! - Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. - MIUI detected! - Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) - Error - Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub - Success! - Vanced has successfully been installed! Launch now? - Launch - Welcome + খারিজ করা + গাইড + অপেক্ষা কর! + দেখে মনে হচ্ছে আপনি ভ্যানসডের ম্যাজিক সংস্করণ ব্যবহার করছেন যা বন্ধ হয়ে গেছে এবং এই অ্যাপ্লিকেশনটি ব্যবহার করে আপডেট করা যাবে না। দয়া করে Magisk মডিউলটি সরিয়ে প্রথমে এটি সরান।. + MIUI সনাক্ত! + হে! দেখে মনে হচ্ছে তুমি আ MIUI ব্যবহারকারী। এই অ্যাপ্লিকেশনটি সঠিকভাবে ব্যবহার করতে আপনাকে নিষ্ক্রিয় করতে হবে MIUI বিকাশকারী সেটিংসে অপ্টিমেশন। (আপনি যদি থাকেন তবে আপনি নিরাপদে এই সতর্কতাটিকে উপেক্ষা করতে পারেন 20.2.20 অথবা পরে ROM ভিত্তিক xiaomi.eu) + ত্রুটি + দয়া করে নিশ্চিত হন, আপনি যে অ্যাপটি ডাউনলোড করেছেন তা থেকে vanced.app, Vanced Discord server অথবা Vanced GitHub + সফল! + Vanced সফলভাবে ইনস্টল করা হয়েছে! এখন আরম্ভ? + শুরু করা + স্বাগত - Choose your preferred language for Vanced - Note: English will always be installed as an additional language as well. - Choose your preferred theme for Vanced - Root mode detected! To install Vanced, you will need to disable the apk signature verification. - Finish - Light + Black - Light + Dark - Next + এর জন্য আপনার পছন্দসই ভাষা চয়ন করুন Vanced + দ্রষ্টব্য: ইংরেজি সর্বদা অতিরিক্ত ভাষা হিসাবে ইনস্টল করা হবে। + এর জন্য আপনার পছন্দসই থিমটি চয়ন করুন Vanced + রুট মোড সনাক্ত! স্থাপন করা Vanced, আপনি অক্ষম করতে হবে apk স্বাক্ষর যাচাইকরণ।. + শেষ + হালকা + কালো + হালকা + গাark + পরবর্তী - Manager Dev - Sources - Vanced Team + ম্যানেজার দেব + সোর্স + Vanced টীম From 98885cc96933713d1a8b39c257353703489abb4a Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Wed, 8 Jul 2020 05:47:46 +0100 Subject: [PATCH 049/310] New translations strings.xml (Czech) --- app/src/main/res/values-cs-rCZ/strings.xml | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index fe06f462e4..9078d78bef 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -6,21 +6,21 @@ Uložit O aplikaci - Domů + Přehled Nastavení Seznamy změn Stahování %1$s Nepodařilo se odinstalovat balíček %1$s Chyba při stahování %1$s - Nainstalovat + Instalace Probíhá instalace %1$s Operace se nezdařila, protože uživatel zrušil instalaci. Operace se nezdařila, protože uživatel zablokoval instalaci. Operace se nezdařila, protože aplikace je v konfliktu s již nainstalovanou aplikací. Operace se nezdařila z neznámého důvodu, prosím, připojte se k našemu Telegramu nebo Discordu pro podporu. Operace se nezdařila, protože aplikace není kompatibilní s vaším zařízením. - Operace se nezdařila, protože apk soubory jsou neplatné. + Operace se nezdařila, protože soubory APK jsou neplatné. Při instalaci aplikace Vanced došlo k neočekávané chybě. Máte vypnuto ověření podpisu APK? Při instalaci aplikace Vanced došlo k neočekávané chybě. Máte vypnuty optimalizace MIUI? Operace se nezdařila z důvodu chyby v úložišti. @@ -48,20 +48,20 @@ Zkontrolovat aktualizace Vzhled Manager - Zvolené parametry instalace + Vybrané předvolby instalace Jazyk: %1$s Vzhled: %1$s - Používat Vlastní karty Chrome - Odkazy se otevřou na vlastních kartách Chrome + Používat vlastní karty prohlížeče Chrome + Odkazy se otevřou na vlastních kartách prohlížeče Chrome Odkazy se otevřou v externím prohlížeči Vzhled Podle systému - Tmavý motiv - Světlý motiv + Tmavý vzhled + Světlý vzhled URL aktualizačního kanálu Vyskakovací oznámení Po vydání aktualizace obdržíte vyskakovací oznámení - Zkontrolovat znovu + Obnovit Centrum aktualizací Nalezena aktualizace! Žádné nové aktualizace @@ -79,16 +79,16 @@ Spustit Vítejte - Zvolte preferovaný jazyk pro Vanced - Poznámka: Angličtina bude nainstalována jako dodatečný jazyk. - Zvolte preferovaný motiv pro Vanced + Vyberte preferovaný jazyk pro Vanced + Poznámka: Angličtina bude vždy nainstalována jako dodatečný jazyk. + Vyberte preferovaný vzhled pro Vanced Byl zjištěn režim root! Chcete-li nainstalovat Vanced, budete muset vypnout ověření podpisu APK. Dokončit - Světlý + Černý - Světlý + Tmavý + Světlý + černý + Světlý + tmavý Další Vývojář aplikace - Zdrojový kód + Zdrojové kódy Tým Vanced From 79226795ddd182daff208ad4f149f6ddf54a7fa8 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Wed, 8 Jul 2020 05:47:48 +0100 Subject: [PATCH 050/310] New translations strings.xml (Vietnamese) --- app/src/main/res/values-vi-rVN/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index 3e999e5ffe..4a5cd336c7 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -5,7 +5,7 @@ Đặt lại Lưu - Thông tin + Giới thiệu Trang chủ Cài đặt From 71ea029ede4691c83185f0425100f9d15a0002c1 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Wed, 8 Jul 2020 17:48:51 +0100 Subject: [PATCH 051/310] New translations strings.xml (Finnish) --- app/src/main/res/values-fi-rFI/strings.xml | 164 ++++++++++----------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 14ebd86b43..0d215ee396 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -1,94 +1,94 @@ - Close - Reset - Save + Sulje + Palauta + Tallenna - About - Home - Settings + Tietoja + Koti + Asetukset - Changelogs - Downloading %1$s - Failed to uninstall package %1$s - Error Downloading %1$s - Install - Installing %1$s - Operation failed because the user aborted the installation. - Operation failed because the user blocked the installation. - Operation failed because the app conflicts with an already installed app. - Operation failed for an unknown reason, please join our Telegram or Discord for support. - Operation failed because the app is incompatible with your device. - Operation failed because the apk files are invalid. - An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? - An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? - Operation failed due to a storage error. - Please wait until the installation finishes - Reinstall - Installed: - Latest: - Successfully installed %1$s - Network connection unavailable - No MicroG! - Root access not granted + Muutoshistoria + Ladataan %1$s + Paketin %1$s asennus epäonnistui + %1$s lataus epäonnistui + Asenna + Asennetaan %1$s + Operaatio epäonnistui, koska käyttäjä keskeytti asennuksen. + Operaatio epäonnistui, koska käyttäjä esti asennuksen. + Operaatio epäonnistui, koska sovellus on ristiriidassa toisen sovelluksen kanssa. + Operaatio epäonnistui tuntemattomasta syystä, ole hyvä ja liity Telegram tai Discord kanaviimme halutessasi tukea. + Operaatio epäonnistui, koska sovellus ei ole yhteensopiva laitteesi kanssa. + Operaatio epäonnistui, koska APK tiedostot ovat viallisia. + Odottamaton virhe asentaessa Vanced-pakettia. Oletko varmasti ottanut APK-paketin allekirjoituksen tarkastuksen pois käytöstä? + Odottamaton virhe asentaessa Vanced-pakettia. Oletko varmasti ottanut MIUI optimisaatiot pois käytöstä? + Haku epäonnistui tallennustilan virheen vuoksi. + Ole hyvä ja odota, että asennus suoritetaan loppuun. + Uudelleenasenna + Asennettu: + Uusin: + %1$s asennus onnistui + Verkkoyhteys ei ole käytettävissä + Ei MicroG pakettia! + Pääkäyttäjän oikeuksia ei ole annettu Ei saatavilla - Update - Useful Links - Website - Support us! - %1$s version was copied! + Päivitä + Hyödyllisiä linkkejä + Verkkosivu + Tue meitä! + %1$s versio kopioitu! - Accent Color - Blue - Green - Purple - Red - Yellow - Check for updates - Interface + Aksenttiväri + Sininen + Vihreä + Violetti + Punainen + Keltainen + Tarkista päivitykset + Ulkoasu Manager - Chosen installation preferences - Language: %1$s - Theme: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser - Theme - Follow System - Dark Theme - Light Theme - Update Channel URL - Push Notifications - Receive push notifications when an update is released - Re-check - Manager Update Center - Update found! - No new updates + Valitut asennusasetukset + Kieli: %1$s + Teema: %1$s + Käytä Chromen mukautettuja välilehtiä + Linkit aukeavat Chromen mukautetuissa välilehdissä + Linkit aukeavat ulkoisessa selaimessa + Teema + Järjestelmän teema + Tumma teema + Vaalea teema + Päivityskanavan URL-osoite + Push-ilmoitukset + Vastaanota ilmoitus, kun päivitys on saatavilla + Tarkista uudelleen + Managerin päivityskeskus + Päivitys löytyi! + Ei uusia päivityksiä - Dismiss - Guide - Hold on! - Looks like you\'re using the Magisk version of Vanced, which is discontinued and can not be updated using this app. Please remove it first by removing the magisk module. - MIUI detected! - Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) - Error - Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub - Success! - Vanced has successfully been installed! Launch now? - Launch - Welcome + Ohita + Opas + Odotas vähän! + Näyttää siltä, että sinulla on käytössä Vanced Magisk versio, joka on lopetettu ja jota ei voida päivittää tällä sovelluksella. Ole hyvä ja poista kyseinen Magisk moduuli. + MIUI tunnistettu! + Hei! Näyttää siltä, että olet MIUI käyttäjä. Jotta sovellus toimisi oikein, sinun täytyy poistaa MIUI optimoinnit pois käytöstä sovelluskehittäjän asetuksista. (Voit huoletta ohittaa tämän varoituksen, jos käytät xiaomi.eu ROM versiota 20.2.20 tai uudempaa) + Virhe + Varmista, että latasit sovelluksen vanced.app nettisivulta, Vanced Discord serveriltä tai Vanced GitHub sivulta. + Onnistui! + Vanced asennettu onnistuneesti! Käynnistetäänkö nyt? + Avaa + Tervetuloa - Choose your preferred language for Vanced - Note: English will always be installed as an additional language as well. - Choose your preferred theme for Vanced - Root mode detected! To install Vanced, you will need to disable the apk signature verification. - Finish - Light + Black - Light + Dark - Next + Valitse haluamasi kieli + Huom: Englanti asennetaan rinnalle aina. + Valitse haluamasi teema + Pääkäyttäjän tila tunnistettu! Asentaaksei Vanced-sovelluksen, ole hyvä ja poista APK-paketin allekirjoituksen tarkistus pois käytöstä. + Valmis + Vaalea + Musta + Vaalea + Tumma + Seuraava - Manager Dev - Sources - Vanced Team + Managerin kehittäjä + Lähdekoodi + Vanced kehitystiimi From 8fa1844dd024b9df2daeb899a805cb4633e9755a Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Wed, 8 Jul 2020 17:48:52 +0100 Subject: [PATCH 052/310] New translations strings.xml (Hebrew) --- app/src/main/res/values-iw-rIL/strings.xml | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index 9e6c61a591..e98b7b9491 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -2,7 +2,7 @@ סגור - אפס + איפוס שמור אודות @@ -19,17 +19,17 @@ הפעולה נכשלה מכיוון שהמשתמש חסם את ההתקנה. הפעולה נכשלה מכיוון שהאפליקציה סותרת עם אפליקציה שכבר מותקנת. הפעולה נכשלה בגלל סיבה אינה ידועה, בבקשה הצטרפו לטלגרם או דיסקורד שלנו בשביל עזרה. - Operation failed because the app is incompatible with your device. - Operation failed because the apk files are invalid. - An unexpected error occurred while installing Vanced. Have you disabled apk signature verification? - An unexpected error occurred while installing Vanced. Have you disabled MIUI Optimisations? - Operation failed due to a storage error. - Please wait until the installation finishes + הפעולה נכשלה משום שהאפליקציה אינה תואמת למכשירך. + הפעולה נכשלה משום שהAPK אינו תקין. + שגיאה לא צפויה התרחשה בזמן ההתקנה. האם ביטלת את וידוא החתימה לAPK? + שגיאה לא צפויה התרחשה בזמן ההתקנה. האם ביטלת את MIUI Optimisations? + הפעולה נכשלה בגלל בעיה באחסון. + אנא המתינו לסיום ההתקנה התקן מחדש מותקן: החדש ביותר: - Successfully installed %1$s - Network connection unavailable + הותקן בהצלחה %1$s + חיבור לרשת אינו זמין MicroG אינו מותקן! הרשאות Root אינן הוענקו אינו זמין @@ -48,17 +48,17 @@ בדוק אחר עדכונים ממשק מנהל - Chosen installation preferences - Language: %1$s - Theme: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs + העדפות התקנה שנבחרו + שפה: %1$s + ערכת נושא: %1$s + השתמש בכרטיסייה מותאמת אישית של Chrome + קישורים יפתחו בכרטיסיות מותאמות אישית של Chrome קישורים יפתחו בדפדפן חיצוני ערכת נושא בהתאם למערכת ערכת נושא כהה ערכת נושא בהירה - Update Channel URL + קישור ערוץ עדכון התראות קבל הודעה ברגע שעדכון משתחרר בדיקה מחדש @@ -71,18 +71,18 @@ רק רגע! נדמה שאתה משתמש בגרסת הMagisk של Vanced, שתמיכה בה הופסקה והגרסה אינה יכולה להתעדכן בעזרת האפליקציה הזו. אנא מחק אותה קודם על ידי מחיקת מודול בMagisk. MIUI זוהה! - Hey! it looks like you\'re a MIUI user. in order to properly use this application, you will have to disable MIUI optimisations in the developer settings. (You can safely ignore this warning if you are on a 20.2.20 or later ROM based on xiaomi.eu) + היי! נראה שאתה משתמש MIUI. בכדי להתשמש באפליקציה זו בצורה מיטבית, תצטרך לבטל את MIUI optimisations באפשרויות מפתחים (ניתן להתעלם מאזהרה זו אם אתה מתשמש ברום מגרסה 20.2.20 ומעלה שמבוסס על xiaomi.eu.) בעיה - Please make sure, that you downloaded the app from vanced.app, the Vanced Discord server or the Vanced GitHub + אנא וודא שהורדת את האפליקציה מvanced.app, ערוץ הדיסקורד של Vanced או הגיטהאב. הצלחה! - Vanced has successfully been installed! Launch now? + Vanced הותקן בהצלחה! לפתוח עכשיו? התחל ברוכים הבאים בחר את השפה המועדפת עליך לVanced תזכורת: אנגלית תמיד תהיה מותקנת בתור שפה נוספת. בחר את המראה מועדף שלך בשביל Vanced - Root mode detected! To install Vanced, you will need to disable the apk signature verification. + זוהה מצב רוט! על מנת להתקין את Vanced, תצטרך לבטל את ווידוא החתימה לAPK. סיום בהיר + שחור בהיר + כהה From 883d3654a27b5ac9e9a2123b8da65dfc6bc744e8 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Fri, 10 Jul 2020 06:35:11 +0100 Subject: [PATCH 053/310] New translations strings.xml (Turkish) --- app/src/main/res/values-tr-rTR/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 900848a346..65ca5ac18f 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -37,7 +37,7 @@ Yararlı Bağlantılar Vanced\'in resmî web sitesi Brave İnternet tarayıcısını indirerek bizi destekleyebilirsiniz - %1$s version was copied! + %1$s sürümü kopyalandı! Tema Rengi Mavi @@ -51,9 +51,9 @@ Seçilen kurulum özellikleri Dil: %1$s Tema: %1$s - Use Chrome Custom Tabs - Links will open in Chrome Custom Tabs - Links will open in an External Browser + Chrome özel sekmesini kullan + Bağlantılar Chrome Özel Sekmelerinde açılacaktır + Bağlantılar harici tarayıcıda açılacaktır Tema Sistem karar versin Koyu Tema From ca987b14bac63b48ce2e42a1c9594ed7d2a4d97f Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Fri, 10 Jul 2020 18:36:25 +0100 Subject: [PATCH 054/310] New translations strings.xml (Turkish) --- app/src/main/res/values-tr-rTR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 65ca5ac18f..e31f113ad5 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -51,7 +51,7 @@ Seçilen kurulum özellikleri Dil: %1$s Tema: %1$s - Chrome özel sekmesini kullan + Chrome Özel Sekmesini Kullan Bağlantılar Chrome Özel Sekmelerinde açılacaktır Bağlantılar harici tarayıcıda açılacaktır Tema From 70cd3e0e582590890d117f6d5faf37f3b9f68f11 Mon Sep 17 00:00:00 2001 From: X1nto Date: Fri, 10 Jul 2020 23:09:51 +0400 Subject: [PATCH 055/310] update 1.2.0 test --- app/build.gradle | 3 +- .../core/downloader/MicrogDownloadService.kt | 39 +++++++++++- .../core/downloader/VancedDownloadService.kt | 50 ++++++++++++++- .../manager/ui/dialogs/DialogContainer.kt | 35 +++++------ .../ui/fragments/UpdateCheckFragment.kt | 50 ++++++++++++++- .../manager/ui/viewmodels/HomeViewModel.kt | 14 +++-- .../com/vanced/manager/utils/InternetTools.kt | 61 ++++++++++++++----- app/src/main/res/values/styles.xml | 18 ++++++ 8 files changed, 222 insertions(+), 48 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2db01bae70..3108aa4985 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 12 - versionName "1.1.1 (Rotten Eggs)" + versionName "1.2.0 (Weed)" vectorDrawables.useSupportLibrary = true } @@ -77,4 +77,5 @@ dependencies { implementation 'com.github.100rabhkr:GetJSON:1.0' implementation 'com.github.topjohnwu.libsu:core:2.5.1' implementation 'com.mindorks.android:prdownloader:0.6.0' + implementation 'com.squareup.okhttp3:okhttp:4.7.2' } diff --git a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt index a315e9bdac..6a831ca17a 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt @@ -1,10 +1,14 @@ package com.vanced.manager.core.downloader +import android.app.DownloadManager import android.app.Service +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.net.Uri import android.os.IBinder import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.preference.PreferenceManager import com.downloader.Error import com.downloader.OnDownloadListener import com.downloader.OnStartOrResumeListener @@ -12,6 +16,7 @@ import com.downloader.PRDownloader import com.vanced.manager.R import com.vanced.manager.core.installer.AppInstaller import com.vanced.manager.ui.fragments.HomeFragment +import com.vanced.manager.utils.InternetTools.baseUrl import com.vanced.manager.utils.InternetTools.getFileNameFromUrl import com.vanced.manager.utils.InternetTools.getObjectFromJson import com.vanced.manager.utils.NotificationHelper @@ -20,17 +25,29 @@ import com.vanced.manager.utils.NotificationHelper.createBasicNotif class MicrogDownloadService: Service() { + private var downloadId: Long = 0 + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + registerReceiver(receiver, null) downloadMicrog() stopSelf() return START_NOT_STICKY } private fun downloadMicrog() { - val prefs = getSharedPreferences("installPrefs", Context.MODE_PRIVATE) + //val prefs = getSharedPreferences("installPrefs", Context.MODE_PRIVATE) + val apkUrl = getObjectFromJson("${PreferenceManager.getDefaultSharedPreferences(this).getString("install_url", baseUrl)}/microg.json", "url", this) + + val request = DownloadManager.Request(Uri.parse(apkUrl)) + request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI) + request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE) + request.setTitle(getString(R.string.downloading_file, "MicroG")) + request.setDestinationUri(Uri.parse("${filesDir.path}/microg.apk")) - val apkUrl = getObjectFromJson("https://vanced.app/api/v1/microg.json", "url", this) + val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager + downloadId = downloadManager.enqueue(request) + /* val channel = 420 PRDownloader.download(apkUrl, filesDir.path, "microg.apk") .build() @@ -61,6 +78,24 @@ class MicrogDownloadService: Service() { createBasicNotif(getString(R.string.error_downloading, "Microg"), channel, this@MicrogDownloadService) } }) + + */ + } + + private val receiver = object : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) { + //prefs?.edit()?.putBoolean("isMicrogDownloading", false)?.apply() + //cancelNotif(channel, this@MicrogDownloadService) + val bIntent = Intent(this@MicrogDownloadService, AppInstaller::class.java) + bIntent.putExtra("path", "${filesDir.path}/microg.apk") + bIntent.putExtra("pkg", "com.mgoogle.android.gms") + val mIntent = Intent(HomeFragment.MICROG_DOWNLOADED) + mIntent.action = HomeFragment.MICROG_DOWNLOADED + LocalBroadcastManager.getInstance(this@MicrogDownloadService).sendBroadcast(mIntent) + startService(bIntent) + } + } } override fun onDestroy() { diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt index 34f6ae8769..00b15e62fc 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt @@ -1,8 +1,11 @@ package com.vanced.manager.core.downloader +import android.app.DownloadManager import android.app.Service +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.net.Uri import android.os.Build import android.os.IBinder import androidx.localbroadcastmanager.content.LocalBroadcastManager @@ -24,8 +27,10 @@ import com.vanced.manager.utils.NotificationHelper.displayDownloadNotif class VancedDownloadService: Service() { - override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + private var downloadId: Long = 0 + private var apkType: String = "arch" + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { downloadSplits() stopSelf() return START_NOT_STICKY @@ -34,8 +39,9 @@ class VancedDownloadService: Service() { private fun downloadSplits( type: String = "arch" ) { - val baseUrl = PreferenceManager.getDefaultSharedPreferences(this).getString("install_url", baseUrl) - val vancedVer = getObjectFromJson("https://vanced.app/api/v1/vanced.json", "version", this) + val defPrefs = PreferenceManager.getDefaultSharedPreferences(this) + val baseUrl = defPrefs.getString("install_url", baseUrl) + val vancedVer = getObjectFromJson("$baseUrl/vanced.json", "version", this) val prefs = getSharedPreferences("installPrefs", Context.MODE_PRIVATE) val variant = PreferenceManager.getDefaultSharedPreferences(this).getString("vanced_variant", "nonroot") @@ -56,6 +62,17 @@ class VancedDownloadService: Service() { else -> throw NotImplementedError("This type of APK is NOT valid. What the hell did you even do?") } + apkType = type + val request = DownloadManager.Request(Uri.parse(url)) + request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI) + request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE) + request.setTitle(getString(R.string.downloading_file, "MicroG")) + request.setDestinationUri(Uri.parse("${filesDir.path}/${getFileNameFromUrl(url)}")) + + val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager + downloadId = downloadManager.enqueue(request) + + /* val channel = 69 PRDownloader .download(url, cacheDir.path, getFileNameFromUrl(url)) @@ -89,6 +106,33 @@ class VancedDownloadService: Service() { createBasicNotif(getString(R.string.error_downloading, "Vanced"), channel, this@VancedDownloadService) } }) + */ + } + + private val receiver = object : BroadcastReceiver() { + val prefs = getSharedPreferences("installPrefs", Context.MODE_PRIVATE) + val variant = PreferenceManager.getDefaultSharedPreferences(this@VancedDownloadService).getString("vanced_variant", "nonroot") + val lang = prefs?.getString("lang", "en") + override fun onReceive(context: Context?, intent: Intent?) { + if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) { + when (apkType) { + "arch" -> downloadSplits("theme") + "theme" -> downloadSplits("lang") + "lang" -> { + if (lang == "en") { + prepareInstall(variant!!) + //cancelNotif(channel, this@VancedDownloadService) + } else { + downloadSplits("enlang") + } + } + "enlang" -> { + prepareInstall(variant!!) + //cancelNotif(channel, this@VancedDownloadService) + } + } + } + } } private fun prepareInstall(variant: String) { diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt index 4a237f14c6..b4d116baf3 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt @@ -4,9 +4,9 @@ import android.app.Activity import android.content.ComponentName import android.content.Context import android.content.Intent -import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat.startActivity import androidx.preference.PreferenceManager +import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.vanced.manager.R import com.vanced.manager.ui.MainActivity import com.vanced.manager.utils.InternetTools.openUrl @@ -15,7 +15,7 @@ import com.vanced.manager.utils.MiuiHelper object DialogContainer { fun showSecurityDialog(context: Context) { - AlertDialog.Builder(context) + MaterialAlertDialogBuilder(context) .setTitle(context.resources.getString(R.string.welcome)) .setMessage(context.resources.getString(R.string.security_context)) .setCancelable(false) @@ -35,11 +35,11 @@ object DialogContainer { } private fun showMiuiDialog(context: Context) { - AlertDialog.Builder(context) + MaterialAlertDialogBuilder(context) .setTitle(context.getString(R.string.miui_one_title)) .setMessage(context.getString(R.string.miui_one)) - .setPositiveButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } - .setNeutralButton(context.getString(R.string.guide)) { _, _ -> + .setNeutralButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } + .setPositiveButton(context.getString(R.string.guide)) { _, _ -> openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context) } .setCancelable(false) @@ -48,16 +48,15 @@ object DialogContainer { } fun showRootDialog(activity: Activity) { - AlertDialog.Builder(activity) + MaterialAlertDialogBuilder(activity) .setTitle(activity.getString(R.string.hold_on)) .setMessage(activity.getString(R.string.disable_signature)) - .setPositiveButton(activity.getString(R.string.button_dismiss)) { dialog, _ -> + .setNeutralButton(activity.getString(R.string.button_dismiss)) { dialog, _ -> dialog.dismiss() } - .setNeutralButton(activity.getString(R.string.guide)) { _, _ -> + .setPositiveButton(activity.getString(R.string.guide)) { _, _ -> openUrl("https://lmgtfy.com/?q=andnixsh+apk+verification+disable", R.color.Twitter, activity) } - .setCancelable(false) .setOnDismissListener { PreferenceManager.getDefaultSharedPreferences(activity).edit().putBoolean("show_root_dialog", false).apply() } .create() .show() @@ -65,7 +64,7 @@ object DialogContainer { //Easter Egg fun statementFalse(context: Context) { - AlertDialog.Builder(context) + MaterialAlertDialogBuilder(context) .setTitle("Wait what?") .setMessage("So this statement is false huh? I'll go with True!") .setPositiveButton("wut?") { dialog, _ -> dialog.dismiss() } @@ -77,7 +76,7 @@ object DialogContainer { } fun installAlertBuilder(msg: String, context: Context) { - AlertDialog.Builder(context).apply { + MaterialAlertDialogBuilder(context).apply { setTitle(context.getString(R.string.error)) setMessage(msg) setPositiveButton(context.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } @@ -99,7 +98,7 @@ object DialogContainer { } fun regularPackageInstalled(msg: String, activity: MainActivity) { - AlertDialog.Builder(activity) + MaterialAlertDialogBuilder(activity) .setTitle(activity.getString(R.string.success)) .setMessage(msg) .setPositiveButton(activity.getString(R.string.close)) { _, _ -> activity.restartActivity() } @@ -109,7 +108,7 @@ object DialogContainer { } fun basicDialog(title: String, msg: String, activity: Activity) { - AlertDialog.Builder(activity) + MaterialAlertDialogBuilder(activity) .setTitle(title) .setMessage(msg) .setPositiveButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } @@ -124,7 +123,7 @@ object DialogContainer { ComponentName("com.google.android.youtube", "com.google.android.youtube.HomeActivity") else ComponentName("com.vanced.android.youtube", "com.google.android.youtube.HomeActivity") - AlertDialog.Builder(activity) + MaterialAlertDialogBuilder(activity) .setTitle(activity.getString(R.string.success)) .setMessage(activity.getString(R.string.vanced_installed)) .setPositiveButton(activity.getString(R.string.launch)) { _, _ -> @@ -133,11 +132,9 @@ object DialogContainer { activity.finish() } } - .setNegativeButton(activity.getString(R.string.close)) { dialog, _ -> - run { - dialog.dismiss() - activity.restartActivity() - } + .setNegativeButton(activity.getString(R.string.close)) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + activity.restartActivity() } .setCancelable(false) .create() diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt index 49dbb89824..6cd31bfbab 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt @@ -1,5 +1,9 @@ package com.vanced.manager.ui.fragments +import android.app.DownloadManager +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Context.DOWNLOAD_SERVICE import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -27,6 +31,8 @@ import java.io.File class UpdateCheckFragment : DialogFragment() { + private var downloadId: Long = 0 + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -39,11 +45,17 @@ class UpdateCheckFragment : DialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + activity?.registerReceiver(receiver, null) checkUpdates() view.findViewById