Skip to content

Fixed Shortcut icon, corrected translation. #766

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

Merged
wwqgtxx merged 7 commits into from
Jun 4, 2026
Merged

Fixed Shortcut icon, corrected translation. #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a3dff98
feat(profile): support age secret keys
NevadaCities Jun 4, 2026
0b9dbc6
Merge branch 'MetaCubeX:main' into main
NevadaCities Jun 4, 2026
1644be4
Update golang binding
wwqgtxx Jun 4, 2026
cb4060e
Merge branch 'MetaCubeX:main' into main
NevadaCities Jun 4, 2026
087d6ad
Update ic_baseline_key.xml
NevadaCities Jun 4, 2026
0dc616c
fix(app): reduce shortcut icon scale
NevadaCities Jun 4, 2026
74bf1b8
Refine age secret key translations
NevadaCities Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 37 additions & 5 deletions app/src/main/res/drawable/ic_toggle_all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#000000"
android:pathData="M277.3,554.7h469.3a192,192 0,1 1,0 384h-469.3a192,192 0,1 1,0 -384zM746.7,85.3a192,192 0,1 1,0 384h-469.3a192,192 0,0 1,0 -384h469.3zM746.7,810.7a64,64 0,1 1,0 -128,64 64,0 0,1 0,128zM277.3,640a106.7,106.7 0,1 0,0 213.3h469.3a106.7,106.7 0,1 0,0 -213.3h-469.3zM746.7,170.7h-469.3a106.7,106.7 0,0 0,0 213.3h469.3a106.7,106.7 0,1 0,0 -213.3zM277.3,341.3a64,64 0,1 1,0 -128,64 64,0 0,1 0,128z" />
android:viewportWidth="24"
android:viewportHeight="24">

<group
android:pivotX="12"
android:pivotY="12"
android:scaleX="0.92"
android:scaleY="0.92">
<path
android:fillColor="#00000000"
android:pathData="M8,3 L4,7l4,4"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="M4,7h16"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="m16,21 l4,-4 -4,-4"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="M20,17H4"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
</group>
</vector>
44 changes: 37 additions & 7 deletions app/src/main/res/drawable/ic_toggle_off.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,41 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="21.021898dp"
android:viewportWidth="1170"
android:viewportHeight="1024">

<path
android:fillColor="#000000"
android:pathData="M658.3,512q0,-59.4 -23.1,-113.4T572.6,305.1 479.1,242.6 365.7,219.4t-113.4,23.1T158.9,305.1 96.3,398.6 73.1,512t23.1,113.4T158.9,718.9t93.4,62.6T365.7,804.6t113.4,-23.1T572.6,718.9t62.6,-93.4T658.3,512zM1097.1,512q0,-59.4 -23.1,-113.4T1011.4,305.1t-93.4,-62.6T804.6,219.4h-220.6q68,51.4 107.7,128t39.7,164.6 -39.7,164.6 -107.7,128h220.6q59.4,0 113.4,-23.1T1011.4,718.9t62.6,-93.4T1097.1,512zM1170.3,512q0,74.3 -29.1,142t-78,116.6 -116.6,78 -142,29.1L365.7,877.7q-74.3,0 -142,-29.1t-116.6,-78 -78,-116.6T0,512t29.1,-142 78,-116.6 116.6,-78T365.7,146.3h438.9q74.3,0 142,29.1t116.6,78 78,116.6 29.1,142z" />
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<group
android:pivotX="12"
android:pivotY="12"
android:scaleX="0.92"
android:scaleY="0.92">
<path
android:fillColor="#00000000"
android:pathData="M18.36,6.64A9,9 0,0 1,20.77 15"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="M6.16,6.16a9,9 0,1 0,12.68 12.68"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="M12,2v4"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="m2,2 l20,20"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
</group>
</vector>
30 changes: 23 additions & 7 deletions app/src/main/res/drawable/ic_toggle_on.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="21.021898dp"
android:viewportWidth="1170"
android:viewportHeight="1024">

<path
android:fillColor="#000000"
android:pathData="M0,512q0,-74.3 29.1,-142t78,-116.6 116.6,-78T365.7,146.3h438.9q74.3,0 142,29.1t116.6,78 78,116.6 29.1,142 -29.1,142 -78,116.6 -116.6,78 -142,29.1L365.7,877.7q-74.3,0 -142,-29.1t-116.6,-78 -78,-116.6T0,512zM804.6,804.6q59.4,0 113.4,-23.1T1011.4,718.9t62.6,-93.4T1097.1,512t-23.1,-113.4T1011.4,305.1t-93.4,-62.6T804.6,219.4t-113.4,23.1T597.7,305.1 535.1,398.6 512,512t23.1,113.4T597.7,718.9t93.4,62.6T804.6,804.6z" />
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">

<group
android:pivotX="12"
android:pivotY="12"
android:scaleX="0.92"
android:scaleY="0.92">
<path
android:fillColor="#00000000"
android:pathData="M12,2v10"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
<path
android:fillColor="#00000000"
android:pathData="M18.4,6.6a9,9 0,1 1,-12.77 0.04"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round"
android:strokeWidth="2" />
</group>
</vector>
11 changes: 9 additions & 2 deletions design/src/main/res/drawable/ic_baseline_key.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M21,10h-8.35C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H13l2,2l2,-2l2,2l4,-4.04L21,10zM7,15c-1.65,0 -3,-1.35 -3,-3c0,-1.65 1.35,-3 3,-3s3,1.35 3,3C10,13.65 8.65,15 7,15z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M21,10h-8.35C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H13l2,2l2,-2l2,2l4,-4.04L21,10zM7,15c-1.65,0 -3,-1.35 -3,-3c0,-1.65 1.35,-3 3,-3s3,1.35 3,3C10,13.65 8.65,15 7,15z" />
</vector>
8 changes: 4 additions & 4 deletions design/src/main/res/values-ja-rJP/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<string name="accept_http_content">http(s) のみを許可</string>
<string name="at_least_15_minutes">15分以上か空白にしてください</string>
<string name="should_not_be_blank">空白にはできません</string>
<string name="age_secret_key">Age秘密鍵</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-…（任意）</string>
<string name="age_secret_key_error">フォーマットが無効です。鍵は AGE-SECRET-KEY- で始まる必要があります</string>
<string name="age_secret_key">Age 秘密鍵</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-… (任意)</string>
<string name="age_secret_key_error">形式が無効です。キーは AGE-SECRET-KEY- で始まる必要があります</string>
<string name="detail">詳細</string>
<string name="update">更新</string>
<string name="edit">編集</string>
Expand Down Expand Up @@ -256,4 +256,4 @@
<string name="override_destination">Override Destination</string>
<string name="import_from_qr_no_permission">カメラのアクセスが制限されています。設定から有効にしてください。</string>
<string name="import_from_qr_exception">システムで予期しない例外が発生しました。</string>
</resources>
</resources>
6 changes: 3 additions & 3 deletions design/src/main/res/values-ko-rKR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<string name="at_least_15_minutes">최소 15분 이상 또는 공백</string>
<string name="should_not_be_blank">이 필드는 공백이 허용되지 않습니다.</string>
<string name="age_secret_key">Age 비밀 키</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-…（선택사항）</string>
<string name="age_secret_key_error">잘못된 형식입니다. 키는 AGE-SECRET-KEY- 로 시작해야 합니다</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-… (선택 사항)</string>
<string name="age_secret_key_error">형식이 올바르지 않습니다. 키는 AGE-SECRET-KEY-로 시작해야 합니다</string>
<string name="detail">자세히</string>
<string name="update">업데이트</string>
<string name="edit">편집</string>
Expand Down Expand Up @@ -256,4 +256,4 @@
<string name="override_destination">Override Destination</string>
<string name="import_from_qr_no_permission">카메라 접근이 제한되었습니다. 설정에서 허용해 주세요.</string>
<string name="import_from_qr_exception">처리되지 않은 시스템 예외가 발생했습니다.</string>
</resources>
</resources>
2 changes: 1 addition & 1 deletion design/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<string name="should_not_be_blank">Не должно быть пустым</string>
<string name="age_secret_key">Секретный ключ Age</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-… (необязательно)</string>
<string name="age_secret_key_error">Неверный формат. Ключ должен начинаться с AGE-SECRET-KEY-</string>
<string name="age_secret_key_error">Недопустимый формат. Ключ должен начинаться с AGE-SECRET-KEY-</string>
<string name="detail">Детали</string>
<string name="update">Обновить</string>
<string name="edit">Изменить</string>
Expand Down
4 changes: 2 additions & 2 deletions design/src/main/res/values-zh-rHK/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<string name="install_time">安裝時間</string>
<string name="age_secret_key">Age 私鑰</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-…（可選）</string>
<string name="age_secret_key_error">格式無效。密鑰應以 AGE-SECRET-KEY- 開頭</string>
<string name="age_secret_key_error">無效格式。密鑰應以 AGE-SECRET-KEY- 開頭</string>
<string name="feedback">反饋</string>
<string name="github_issues">Github Issues</string>
<string name="tips_properties"><![CDATA[僅接受 <strong>Clash 配置文件</strong>(包含<strong>代理</strong>/<strong>規則</strong>)]]></string>
Expand Down Expand Up @@ -253,4 +253,4 @@
<string name="override_destination">Override Destination</string>
<string name="import_from_qr_no_permission">相機權限受限，請前往設定開啟。</string>
<string name="import_from_qr_exception">發生系統未知異常，操作失敗。</string>
</resources>
</resources>
2 changes: 1 addition & 1 deletion design/src/main/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<string name="install_time">安裝時間</string>
<string name="age_secret_key">Age 私鑰</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-…（選填）</string>
<string name="age_secret_key_error">格式無效。金鑰應以 AGE-SECRET-KEY- 開頭</string>
<string name="age_secret_key_error">無效格式。金鑰應以 AGE-SECRET-KEY- 開頭</string>
<string name="feedback">回饋</string>
<string name="github_issues">Github Issues</string>
<string name="tips_properties"><![CDATA[僅接受 <strong>Clash 設定檔</strong> (包含<strong>Proxy</strong> /<strong>規則</strong>)]]></string>
Expand Down
2 changes: 1 addition & 1 deletion design/src/main/res/values-zh/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<string name="search">查找</string>
<string name="age_secret_key">Age 私钥</string>
<string name="age_secret_key_hint">AGE-SECRET-KEY-…（可选）</string>
<string name="age_secret_key_error">格式无效。密钥应以 AGE-SECRET-KEY- 开头</string>
<string name="age_secret_key_error">无效格式。密钥应以 AGE-SECRET-KEY- 开头</string>
<string name="system_apps">系统应用</string>
<string name="update_time">更新时间</string>
<string name="package_name">应用包名称</string>
Expand Down
Loading