Skip to content

Upstream Sync - 需手动解决冲突#8

Merged
Oosl merged 9 commits into
mainfrom
upstream-sync/conflicts
May 12, 2026
Merged

Upstream Sync - 需手动解决冲突#8
Oosl merged 9 commits into
mainfrom
upstream-sync/conflicts

Conversation

@github-actions

Copy link
Copy Markdown

上游同步

自动合并上游 wxxsfxyzm/InstallerX-Revivedmain 到本仓库 main 时出现冲突,已打开本 PR 供手动合并。

操作方式:

  1. 在本地 checkout 本 PR 分支,或直接在 GitHub 上解决冲突
  2. 解决冲突后合并本 PR 到 main

create-pull-request 创建/更新;同一分支名会复用同一条 PR。

wxxsfxyzm and others added 9 commits May 9, 2026 15:27
- Introduced `RadioButtonWidget` to standardize radio items across settings and bumped `versionCode` to 51.
- Simplified `SwitchWidget` logic by moving icon tinting to `SwitchDefaults.colors`.
…es (wxxsfxyzm#636)

refactor: standardize window insets and padding handling in settings

- Replaced manual safe drawing inset calculations with scaffold `innerPadding` across Miuix and Material3 settings pages.
- Introduced a `windowInsetsSides` parameter to settings pages to allow fine-grained control over layout insets, specifically for rail navigation.
- Refined `LargeFlexibleTopAppBar` title alignment and content padding logic to correctly combine scaffold and outer paddings for consistent layouts.
Translated using Weblate (Russian)

Currently translated at 99.7% (830 of 832 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (832 of 832 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (832 of 832 strings)




Translate-URL: https://hosted.weblate.org/projects/installerx-revived/strings/es/
Translate-URL: https://hosted.weblate.org/projects/installerx-revived/strings/ru/
Translation: InstallerX Revived/strings

Co-authored-by: Alexander (brigudav) <brigudav@gmail.com>
Co-authored-by: Guzleon <guzleon@yahoo.es>
Co-authored-by: Leonardo González <lleo.g.juviel@gmail.com>
- Consolidated custom exceptions into enum-based types and added diagnostics for package visibility restrictions.
- Optimized session icon transfer via Ashmem and renamed settings `visible` parameters to `animatedVisibility`.
Translated using Weblate (Spanish)

Currently translated at 100.0% (832 of 832 strings)


Translate-URL: https://hosted.weblate.org/projects/installerx-revived/strings/es/
Translation: InstallerX Revived/strings

Co-authored-by: Guzleon <guzleon@yahoo.es>
@Oosl Oosl merged commit ea6feca into main May 12, 2026
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants