Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修改微软登录页面 #3192

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

修改微软登录页面 #3192

wants to merge 18 commits into from

Conversation

zkitefly
Copy link
Member

@zkitefly zkitefly commented Jul 21, 2024 •
edited
Loading

_._20241004002540.mp4

@burningtnt burningtnt mentioned this pull request Jul 21, 2024
Open
@zkitefly zkitefly changed the title Login 修改微软登录页面 Jul 22, 2024
3gf8jv4dv
3gf8jv4dv suggested changes Jul 23, 2024
View reviewed changes
Copy link
Contributor

@3gf8jv4dv 3gf8jv4dv left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend using Login with password instead of Use password login. Strings in the code also suggest to revise. The Chinese part does not need to be changed.

@zkitefly zkitefly requested a review from 3gf8jv4dv July 23, 2024 18:04
@zkitefly zkitefly requested review from Glavo and burningtnt July 28, 2024 07:01
@zkitefly zkitefly mentioned this pull request Sep 28, 2024
Open
@zkitefly

This comment was marked as outdated.

Sign in to view
@zkitefly zkitefly requested a review from 3gf8jv4dv September 30, 2024 17:41
3gf8jv4dv
3gf8jv4dv suggested changes Oct 1, 2024
View reviewed changes
Copy link
Contributor

@3gf8jv4dv 3gf8jv4dv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use a local image instead of a third-party online service? Prism Launcher uses an SVG image.

HMCL/src/main/resources/assets/lang/I18N.properties Outdated Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved
HMCL/src/main/resources/assets/lang/I18N_zh.properties Outdated Show resolved Hide resolved
@burningtnt
Copy link
Member

为什么这里需要创建一个二维码？你是想让用户使用手机扫码吗？我保持保留原先自动打开浏览器的操作，但提供额外的二维码。此外，生成二维码的算法可以靠 WritableImage 来完成，请不要使用第三方服务

@zkitefly
Copy link
Member Author

zkitefly commented Oct 2, 2024 •
edited
Loading

为什么这里需要创建一个二维码？你是想让用户使用手机扫码吗？我保持保留原先自动打开浏览器的操作，但提供额外的二维码。此外，生成二维码的算法可以靠 WritableImage 来完成，请不要使用第三方服务

已恢复原来的自动复制代码和打开网页，其中自动打开网页会先等待 1 秒再执行

二维码图片已内置，如果 verificationUri 不是 https://www.microsoft.com/link 时不展示

图片来自 https://github.com/PrismLauncher/PrismLauncher/pull/2504/files#diff-f7b6c6d05fdb40a935ed93de70c279a47ddd5119029795c66f77f3438912a8f6 的 PNG 转换版

@zkitefly
Copy link
Member Author

zkitefly commented Oct 2, 2024

当 !IntegrityChecker.isOfficial() 时会将 deauthorizeLink 移除

3gf8jv4dv
3gf8jv4dv reviewed Oct 4, 2024
View reviewed changes
Copy link
Contributor

@3gf8jv4dv 3gf8jv4dv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to use this solution, it is recommended to prepare the i18n of the website.

Elsewhere... LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3gf8jv4dv 3gf8jv4dv 3gf8jv4dv requested changes

@Glavo Glavo Awaiting requested review from Glavo

@burningtnt burningtnt Awaiting requested review from burningtnt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zkitefly @burningtnt @3gf8jv4dv