Skip to content

Commit

Permalink
Merge branch 'main' into feat/improve-install-screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@rushiiMachine
rushiiMachine committed Apr 9, 2024
2 parents 3a5104c + 8898856 commit 6f1dcfb
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 70 deletions.
4 changes: 1 addition & 3 deletions app/src/main/kotlin/com/aliucord/manager/installer/steps/patch/ReplaceIconStep.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ class ReplaceIconStep(private val options: InstallOptions) : Step(), KoinCompone
)
}

val newArscBytes = arsc.toByteArray(/* shrink = */ true)

ZipWriter(apk, /* append = */ true).use {
if (options.monochromeIcon) {
it.writeEntry("res/ic_aliucord_monochrome.xml", context.getResBytes(R.drawable.ic_discord_monochrome))
Expand All @@ -110,7 +108,7 @@ class ReplaceIconStep(private val options: InstallOptions) : Step(), KoinCompone
}

it.deleteEntry("resources.arsc")
it.writeEntry("resources.arsc", newArscBytes)
it.writeEntry("resources.arsc", arsc.toByteArray())
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/aliucord/manager/installer/util/AxmlUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ object AxmlUtil {

ZipWriter(apk, /* append = */ true).use { zip ->
zip.deleteEntry(resourcePath)
zip.writeEntry(resourcePath, xml.toByteArray(/* shrink = */ true))
zip.writeEntry(resourcePath, xml.toByteArray())
}
}

Expand Down
76 changes: 38 additions & 38 deletions app/src/main/res/values-da-rDK/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,51 @@
<string name="github">GitHub</string>
<string name="support_server">Support Server</string>
<string name="installer">Installer</string>
<string name="action_cancel">Cancel</string>
<string name="action_retry">Retry</string>
<string name="action_apply">Apply</string>
<string name="action_confirm">Confirm</string>
<string name="action_dismiss">Dismiss</string>
<string name="action_install">Install</string>
<string name="action_uninstall">Uninstall</string>
<string name="action_add_install">Add Installation</string>
<string name="action_update">Update</string>
<string name="action_clear">Clear</string>
<string name="action_launch">Launch</string>
<string name="action_close">Close</string>
<string name="action_open_settings">Open settings</string>
<string name="action_search">Search</string>
<string name="action_copy">Copy</string>
<string name="action_cancel">Annullér</string>
<string name="action_retry">Prøv igen</string>
<string name="action_apply">Anvend</string>
<string name="action_confirm">Bekræft</string>
<string name="action_dismiss">Afvis</string>
<string name="action_install">Installér</string>
<string name="action_uninstall">Afinstallér</string>
<string name="action_add_install">Tilføj Installation</string>
<string name="action_update">Opdatér</string>
<string name="action_clear">Ryd</string>
<string name="action_launch">Start</string>
<string name="action_close">Luk</string>
<string name="action_open_settings">Åbn indstillinger</string>
<string name="action_search">Søg</string>
<string name="action_copy">Kopiér</string>
<string name="action_collapse">Collapse</string>
<string name="action_expand">Expand</string>
<string name="action_copied">Copied!</string>
<string name="action_cleared_cache">Cleared cache!</string>
<string name="action_exit_anyways">Exit anyways</string>
<string name="action_open_info">Open info</string>
<string name="action_reset_default">Reset to default</string>
<string name="permissions_grant_title">Grant Permissions</string>
<string name="action_copied">Kopieret!</string>
<string name="action_cleared_cache">Cache ryddet!</string>
<string name="action_exit_anyways">Afslut alligevel</string>
<string name="action_open_info">Åbn info</string>
<string name="action_reset_default">Nulstil til standard</string>
<string name="permissions_grant_title">Giv Tilladelser</string>
<string name="permissions_grant_body">In order for Aliucord Manager to work properly, you need to grant file permissions. Since shared data in stored in ~/Aliucord, permissions are required in order for manager to function.</string>
<string name="installs_no_installs">No installations founds!</string>
<string name="launch_aliucord_fail">Failed to launch Aliucord</string>
<string name="settings_theme">Theme</string>
<string name="settings_advanced">Advanced</string>
<string name="settings_appearance">Appearance</string>
<string name="settings_developer_options">Developer options</string>
<string name="setting_clear_cache">Clear cache</string>
<string name="setting_dynamic_color">Dynamic color</string>
<string name="setting_keep_patched_apks">Keep patched APKs</string>
<string name="setting_keep_patched_apks_desc">Don\'t delete patched APKs after installing (for installing manually)</string>
<string name="launch_aliucord_fail">Aliucord kunne ikke startes</string>
<string name="settings_theme">Tema</string>
<string name="settings_advanced">Avanceret</string>
<string name="settings_appearance">Udseende</string>
<string name="settings_developer_options">Udviklerindstillinger</string>
<string name="setting_clear_cache">Ryd cache</string>
<string name="setting_dynamic_color">Dynamisk farve</string>
<string name="setting_keep_patched_apks">Behold patchede APK\'er</string>
<string name="setting_keep_patched_apks_desc">Slet ikke patchede APK\'er efter installation (til manuel installation)</string>
<string name="theme_system">System</string>
<string name="theme_dark">Dark</string>
<string name="theme_light">Light</string>
<string name="plugins_title">Plugins</string>
<string name="plugins_view_changelog">View changelog for %1$s</string>
<string name="plugins_delete_plugin_body">Are you sure you want to uninstall this plugin?</string>
<string name="plugins_search">Search Plugins</string>
<string name="plugins_none_installed">No plugins installed!</string>
<string name="theme_dark">Mørk</string>
<string name="theme_light">Lys</string>
<string name="plugins_title">Udvidelser</string>
<string name="plugins_view_changelog">Se ændringslog for %1$s</string>
<string name="plugins_delete_plugin_body">Er du sikker på, at du vil afinstallere denne udvidelse?</string>
<string name="plugins_search">Søg i udvidelser</string>
<string name="plugins_none_installed">Ingen udvidelser installeret!</string>
<string name="plugins_changelog_media">Changelog Media</string>
<string name="plugins_plugin_title">§plugin§%1$s§ v%2$s</string>
<string name="plugins_error">An error occurred while processing plugins!</string>
<string name="plugins_error">En fejl opstod under behandlingen af udvidelser!</string>
<string name="navigation_back">Back</string>
<string name="navigation_about">About</string>
<string name="navigation_settings">Settings</string>
Expand Down
54 changes: 27 additions & 27 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<string name="github">GitHub</string>
<string name="support_server">支持伺服器</string>
<string name="installer">安裝程式</string>
<string name="action_cancel">Cancel</string>
<string name="action_cancel">取消</string>
<string name="action_retry">重試</string>
<string name="action_apply">套用</string>
<string name="action_confirm">確認</string>
<string name="action_dismiss">中斷</string>
<string name="action_install">Install</string>
<string name="action_install">安裝</string>
<string name="action_uninstall">解除安裝</string>
<string name="action_add_install">Add Installation</string>
<string name="action_add_install">新增安裝</string>
<string name="action_update">更新</string>
<string name="action_clear">清除</string>
<string name="action_launch">啟動</string>
Expand All @@ -26,9 +26,9 @@
<string name="action_expand">擴充</string>
<string name="action_copied">已複製！</string>
<string name="action_cleared_cache">已清除快取！</string>
<string name="action_exit_anyways">Exit anyways</string>
<string name="action_open_info">Open info</string>
<string name="action_reset_default">Reset to default</string>
<string name="action_exit_anyways">無論如何都要退出</string>
<string name="action_open_info">開啟資訊</string>
<string name="action_reset_default">重設為預設植</string>
<string name="permissions_grant_title">授予權限</string>
<string name="permissions_grant_body">為了讓 Aliucord Manager 正常運作，您需要授予「檔案和媒體」權限。 由於共享資料儲存在 ~/Aliucord 中，因此需要權限才能使 Manager 發揮作用。</string>
<string name="installs_no_installs">No installations founds!</string>
Expand Down Expand Up @@ -58,7 +58,7 @@
<string name="contributors">貢獻者</string>
<string name="contributors_contributions">%o 貢獻者</string>
<string name="network_load_fail">載入失敗</string>
<string name="network_warning_title">Metered network</string>
<string name="network_warning_title">計量付費網路</string>
<string name="network_warning_body">It appears you are connected to mobile data or a potentially metered network. In order to continue with the installation, several hundred megabytes could be downloaded. Are you sure you want to continue?</string>
<string name="version_supported">已支援版本：</string>
<string name="version_none">無</string>
Expand All @@ -82,7 +82,7 @@
<string name="install_error_storage">您沒有足夠的儲存空間來安裝</string>
<string name="install_error_incompatible">此應用程式與您的裝置不相容</string>
<string name="install_error_timeout">安裝超時</string>
<string name="install_group_prepare">Prepare</string>
<string name="install_group_prepare">準備</string>
<string name="install_group_download">Download dependencies</string>
<string name="install_group_patch">補丁 APKs</string>
<string name="install_group_install">安裝</string>
Expand All @@ -103,35 +103,35 @@
<string name="install_step_cleanup">Cleaning up</string>
<string name="status_queued">排程中</string>
<string name="status_ongoing">進行中</string>
<string name="status_skipped">Skipped</string>
<string name="status_skipped">已略過</string>
<string name="status_success">成功</string>
<string name="status_failed">失敗</string>
<string name="installer_abort_title">Really exit?</string>
<string name="installer_abort_title">確定離開？</string>
<string name="installer_abort_body">Are you sure you really want to abort an in-progress installation? Cached files will be cleared to avoid corruption.</string>
<string name="updater_body">Aliucord Manager 已發布新更新！Aliucord Manager 可能需要它才能正常運行。您想更新嗎？</string>
<string name="updater_title">更新到 %1$s</string>
<string name="downloader_err_unknown">Download failed (Unknown)</string>
<string name="downloader_err_response">Download failed (Invalid response)</string>
<string name="downloader_err_file_exists">Download failed (File exists)</string>
<string name="downloader_err_storage_space">Download failed (Insufficient space)</string>
<string name="downloader_err_unknown">無法下載（未知）</string>
<string name="downloader_err_response">無法下載（無效的回應）</string>
<string name="downloader_err_file_exists">無法下載（已存在檔案）</string>
<string name="downloader_err_storage_space">無法下載（儲存空間不足）</string>
<string name="installopts_title">Aliucord provides several customizations at installation time that are not able to be changed once installed.</string>
<string name="installopts_pkgname_title">Package Name</string>
<string name="installopts_pkgname_title">套件名稱</string>
<string name="installopts_pkgname_desc">The package name is a unique identifier for all apps. Using different ones can allow for multiple installations of Aliucord.</string>
<string name="installopts_pkgname_invalid">Invalid package name!</string>
<string name="installopts_pkgname_taken">Target app will be overwritten!</string>
<string name="installopts_pkgname_ok">Valid package name!</string>
<string name="installopts_appname_title">App Name</string>
<string name="installopts_pkgname_invalid">無效的套件名稱！</string>
<string name="installopts_pkgname_taken">目標應用程式將被覆寫！</string>
<string name="installopts_pkgname_ok">有效的封包名稱！</string>
<string name="installopts_appname_title">應用程式名稱</string>
<string name="installopts_appname_desc">The app name is what\'s displayed in your home launcher. This should be changed on secondary installations for ease of use.</string>
<string name="installopts_debuggable_title">Debuggable</string>
<string name="installopts_debuggable_desc">Enable the debuggable manifest flag. Only use this if you know what you are doing!</string>
<string name="installopts_icon_title">Replace app icon</string>
<string name="installopts_icon_title">更換應用程示圖示</string>
<string name="installopts_icon_desc">Changes the app\'s icon to use Aliucord branding instead of Discord\'s own.</string>
<string name="installopts_divider_basic">Basic</string>
<string name="installopts_divider_advanced">Advanced</string>
<string name="notif_group_install_title">Active installation</string>
<string name="installopts_divider_basic">基本</string>
<string name="installopts_divider_advanced">進階</string>
<string name="notif_group_install_title">主動安裝</string>
<string name="notif_group_install_desc">Progress notifications sent during a minimized installation</string>
<string name="notif_install_ready_title">Aliucord installation ready!</string>
<string name="notif_install_ready_desc">Click to install…</string>
<string name="notif_install_fail_title">Aliucord failed to install</string>
<string name="notif_install_fail_desc">Click to view more info…</string>
<string name="notif_install_ready_title">已安裝 Aliucord！</string>
<string name="notif_install_ready_desc">點擊安裝……</string>
<string name="notif_install_fail_title">無法安裝 Aliucord</string>
<string name="notif_install_fail_desc">點擊檢視更多資訊……</string>
</resources>
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ androidx-splashscreen = "1.0.1"
androidx-lifecycle = "2.7.0"
apksig = "7.4.2"
axml = "1.0.1"
binary-resources = "1.0.0"
binary-resources = "2.0.0"
bouncycastle = "1.70"
coil = "2.5.0"
compose = "1.5.4"
Expand Down

0 comments on commit 6f1dcfb

Please sign in to comment.