Skip to content

Commit

Permalink
Merge branch 'master' into git-branch-開発-areteruhiro
Browse files Browse the repository at this point in the history
  • Loading branch information
@s1204IT
s1204IT authored Nov 15, 2024
2 parents f980539 + 723ead2 commit b014cc5
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 175 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
Expand Down
15 changes: 10 additions & 5 deletions app/src/main/java/io/github/chipppppppppp/lime/hooks/RedirectWebView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,16 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
if (webView != null) {
String currentUrl = webView.getUrl();

if (currentUrl != null &&
(currentUrl.startsWith("https://account-center.lylink.yahoo.co.jp") ||
currentUrl.startsWith("https://access.line.me") ||
currentUrl.startsWith("https://id.lylink.yahoo.co.jp/federation/ly/normal/callback/first"))) {

if (currentUrl != null && (
currentUrl.startsWith("https://account-center.lylink.yahoo.co.jp") ||
currentUrl.startsWith("https://access.line.me") ||
currentUrl.startsWith("https://id.lylink.yahoo.co.jp/federation/ly/normal/callback/first") ||
currentUrl.startsWith("https://liff.line.me") ||
currentUrl.startsWith("https://lin.ee") ||
currentUrl.startsWith("https://line.me/R/") ||
currentUrl.startsWith("line://")
)
) {
return;
}

Expand Down
36 changes: 9 additions & 27 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="108dp"
android:height="108dp"
android:viewportWidth="348"
android:viewportHeight="166.64062"
tools:ignore="VectorPath">
<group
android:scaleX="0.46"
android:scaleY="0.22027208"
android:translateX="93.96"
android:translateY="64.96717">
<group android:translateY="136.26562">
<path
android:pathData="M31.71875,-92.1875L31.71875,-17.15625L74.046875,-17.15625Q79.109375,-17.15625,81.8125,-14.6875Q84.515625,-12.234375,84.515625,-8.515625Q84.515625,-4.71875,81.84375,-2.359375Q79.171875,-0,74.046875,-0L23.625,-0Q16.8125,-0,13.8125,-3.015625Q10.828125,-6.046875,10.828125,-12.796875L10.828125,-92.1875Q10.828125,-98.515625,13.671875,-101.671875Q16.53125,-104.84375,21.171875,-104.84375Q25.875,-104.84375,28.796875,-101.703125Q31.71875,-98.578125,31.71875,-92.1875Z"
android:fillColor="#06C755" />
<path
android:pathData="M99.09375,-10.96875L99.09375,-92.1875Q99.09375,-98.515625,101.96875,-101.671875Q104.859375,-104.84375,109.4375,-104.84375Q114.140625,-104.84375,117.0625,-101.703125Q119.984375,-98.578125,119.984375,-92.1875L119.984375,-10.96875Q119.984375,-4.578125,117.0625,-1.40625Q114.140625,1.765625,109.4375,1.765625Q104.9375,1.765625,102.015625,-1.4375Q99.09375,-4.640625,99.09375,-10.96875Z"
android:fillColor="#06C755" />
<path
android:pathData="M178.0625,-15.546875L161.53125,-81.21875L161.53125,-10.0625Q161.53125,-4.15625,158.89062,-1.1875Q156.26562,1.765625,151.90625,1.765625Q147.6875,1.765625,145.01562,-1.15625Q142.34375,-4.078125,142.34375,-10.0625L142.34375,-91.625Q142.34375,-98.375,145.85938,-100.71875Q149.375,-103.078125,155.34375,-103.078125L161.8125,-103.078125Q167.65625,-103.078125,170.28125,-102.015625Q172.92188,-100.96875,174.1875,-98.21875Q175.45312,-95.484375,177.07812,-89.296875L192.04688,-32.84375L207.03125,-89.296875Q208.64062,-95.484375,209.90625,-98.21875Q211.17188,-100.96875,213.8125,-102.015625Q216.45312,-103.078125,222.28125,-103.078125L228.75,-103.078125Q234.73438,-103.078125,238.25,-100.71875Q241.76562,-98.375,241.76562,-91.625L241.76562,-10.0625Q241.76562,-4.15625,239.125,-1.1875Q236.48438,1.765625,232.0625,1.765625Q227.90625,1.765625,225.23438,-1.1875Q222.5625,-4.15625,222.5625,-10.0625L222.5625,-81.21875L206.04688,-15.546875Q204.42188,-9.140625,203.40625,-6.15625Q202.39062,-3.171875,199.64062,-0.703125Q196.90625,1.765625,192.04688,1.765625Q188.39062,1.765625,185.85938,0.171875Q183.32812,-1.40625,181.92188,-3.859375Q180.51562,-6.328125,179.70312,-9.3125Q178.90625,-12.3125,178.0625,-15.546875Z"
android:fillColor="#06C755" />
<path
android:pathData="M331.17188,-86.984375L284.14062,-86.984375L284.14062,-61.671875L327.45312,-61.671875Q332.23438,-61.671875,334.57812,-59.515625Q336.9375,-57.375,336.9375,-53.859375Q336.9375,-50.34375,334.60938,-48.125Q332.29688,-45.921875,327.45312,-45.921875L284.14062,-45.921875L284.14062,-16.59375L332.79688,-16.59375Q337.71875,-16.59375,340.20312,-14.3125Q342.70312,-12.03125,342.70312,-8.234375Q342.70312,-4.578125,340.20312,-2.28125Q337.71875,0,332.79688,0L276.04688,0Q269.23438,0,266.23438,-3.015625Q263.25,-6.046875,263.25,-12.796875L263.25,-90.28125Q263.25,-94.78125,264.57812,-97.625Q265.92188,-100.484375,268.76562,-101.78125Q271.625,-103.078125,276.04688,-103.078125L331.17188,-103.078125Q336.17188,-103.078125,338.59375,-100.859375Q341.01562,-98.65625,341.01562,-95.0625Q341.01562,-91.40625,338.59375,-89.1875Q336.17188,-86.984375,331.17188,-86.984375Z"
android:fillColor="#06C755" />
</group>
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:width="108dp" android:height="108dp" android:viewportWidth="348" android:viewportHeight="166.64062" tools:ignore="VectorPath">
<group android:scaleX="0.46" android:scaleY="0.22027208" android:translateX="93.96" android:translateY="64.96717">
<group android:translateY="136.26562">
<path android:pathData="M31.71875,-92.1875L31.71875,-17.15625L74.046875,-17.15625Q79.109375,-17.15625,81.8125,-14.6875Q84.515625,-12.234375,84.515625,-8.515625Q84.515625,-4.71875,81.84375,-2.359375Q79.171875,-0,74.046875,-0L23.625,-0Q16.8125,-0,13.8125,-3.015625Q10.828125,-6.046875,10.828125,-12.796875L10.828125,-92.1875Q10.828125,-98.515625,13.671875,-101.671875Q16.53125,-104.84375,21.171875,-104.84375Q25.875,-104.84375,28.796875,-101.703125Q31.71875,-98.578125,31.71875,-92.1875Z" android:fillColor="#06C755" />
<path android:pathData="M99.09375,-10.96875L99.09375,-92.1875Q99.09375,-98.515625,101.96875,-101.671875Q104.859375,-104.84375,109.4375,-104.84375Q114.140625,-104.84375,117.0625,-101.703125Q119.984375,-98.578125,119.984375,-92.1875L119.984375,-10.96875Q119.984375,-4.578125,117.0625,-1.40625Q114.140625,1.765625,109.4375,1.765625Q104.9375,1.765625,102.015625,-1.4375Q99.09375,-4.640625,99.09375,-10.96875Z" android:fillColor="#06C755" />
<path android:pathData="M178.0625,-15.546875L161.53125,-81.21875L161.53125,-10.0625Q161.53125,-4.15625,158.89062,-1.1875Q156.26562,1.765625,151.90625,1.765625Q147.6875,1.765625,145.01562,-1.15625Q142.34375,-4.078125,142.34375,-10.0625L142.34375,-91.625Q142.34375,-98.375,145.85938,-100.71875Q149.375,-103.078125,155.34375,-103.078125L161.8125,-103.078125Q167.65625,-103.078125,170.28125,-102.015625Q172.92188,-100.96875,174.1875,-98.21875Q175.45312,-95.484375,177.07812,-89.296875L192.04688,-32.84375L207.03125,-89.296875Q208.64062,-95.484375,209.90625,-98.21875Q211.17188,-100.96875,213.8125,-102.015625Q216.45312,-103.078125,222.28125,-103.078125L228.75,-103.078125Q234.73438,-103.078125,238.25,-100.71875Q241.76562,-98.375,241.76562,-91.625L241.76562,-10.0625Q241.76562,-4.15625,239.125,-1.1875Q236.48438,1.765625,232.0625,1.765625Q227.90625,1.765625,225.23438,-1.1875Q222.5625,-4.15625,222.5625,-10.0625L222.5625,-81.21875L206.04688,-15.546875Q204.42188,-9.140625,203.40625,-6.15625Q202.39062,-3.171875,199.64062,-0.703125Q196.90625,1.765625,192.04688,1.765625Q188.39062,1.765625,185.85938,0.171875Q183.32812,-1.40625,181.92188,-3.859375Q180.51562,-6.328125,179.70312,-9.3125Q178.90625,-12.3125,178.0625,-15.546875Z" android:fillColor="#06C755" />
<path android:pathData="M331.17188,-86.984375L284.14062,-86.984375L284.14062,-61.671875L327.45312,-61.671875Q332.23438,-61.671875,334.57812,-59.515625Q336.9375,-57.375,336.9375,-53.859375Q336.9375,-50.34375,334.60938,-48.125Q332.29688,-45.921875,327.45312,-45.921875L284.14062,-45.921875L284.14062,-16.59375L332.79688,-16.59375Q337.71875,-16.59375,340.20312,-14.3125Q342.70312,-12.03125,342.70312,-8.234375Q342.70312,-4.578125,340.20312,-2.28125Q337.71875,0,332.79688,0L276.04688,0Q269.23438,0,266.23438,-3.015625Q263.25,-6.046875,263.25,-12.796875L263.25,-90.28125Q263.25,-94.78125,264.57812,-97.625Q265.92188,-100.484375,268.76562,-101.78125Q271.625,-103.078125,276.04688,-103.078125L331.17188,-103.078125Q336.17188,-103.078125,338.59375,-100.859375Q341.01562,-98.65625,341.01562,-95.0625Q341.01562,-91.40625,338.59375,-89.1875Q336.17188,-86.984375,331.17188,-86.984375Z" android:fillColor="#06C755" />
</group>
</group>
</vector>
6 changes: 3 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
93 changes: 44 additions & 49 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- General -->
<string name="positive_button">確定</string>
<string name="negative_button">取消</string>

<!-- Xposed API -->
<string name="xposed_desc">整潔的 LINE</string>

<!-- Options -->
<string name="module_not_enabled_title">錯誤</string>
<string name="module_not_enabled_text">模組未啟用！</string>
<string name="options_title">選項</string>
<string name="restarting">正在重新啟動 Line...</string>
<string name="need_refresh">需要強制停止和清除快取</string>
<string name="switch_spoof_android_id">欺騙 Android ID</string>
<string name="spoof_android_id_risk">請自行承擔欺騙 Android ID 的風險</string>
<string name="incompatible_version">由于版本不兼容，某些功能不可用。</string>
<string name="switch_android_secondary">偽裝成最高版本</string>
<string name="switch_unembed_options">不要將選項崁入 LINE（選項將不會同步）</string>
<string name="switch_remove_voom">刪除 VOOM 圖示</string>
<string name="switch_remove_wallet">刪除錢包圖示</string>
<string name="switch_remove_news_or_call">刪除新聞或通話圖示</string>
<string name="switch_distribute_evenly">均勻排列底欄的圖示</string>
<string name="switch_extend_clickable_area">擴大底欄圖示的可點擊區域</string>
<string name="switch_remove_icon_labels">刪除底欄的圖示標籤</string>
<string name="switch_remove_ads">刪除廣告</string>
<string name="switch_remove_recommendation">刪除推薦</string>
<string name="switch_remove_premium_recommendation">刪除 LYP Premium 推薦</string>
<string name="switch_remove_service_labels">移除服務標籤</string>
<string name="switch_remove_reply_mute">刪除通知的「靜音聊天」操作</string>
<string name="switch_redirect_webview">將 WebView 重新導向到預設瀏覽器</string>
<string name="switch_open_in_browser">在瀏覽器應用程式開啟</string>
<string name="switch_prevent_mark_as_read">總是防止標記為已讀</string>
<string name="switch_send_mute_message">總是傳送靜音訊息</string>
<string name="switch_prevent_unsend_message">防止訊息撤回</string>
<string name="switch_remove_keep_unread">刪除聊天分頁右上角選單的「保持未讀」開關</string>
<string name="switch_block_tracking">防止跟蹤通訊</string>
<string name="switch_stop_version_check">停止检查 LINE 版本</string>
<string name="switch_output_communication">將通訊內容輸出到日誌內（供開發人員使用）</string>
<string name="modify_request">修改請求</string>
<string name="modify_response">修改回應</string>
<string name="button_copy">複製</string>
<string name="button_paste">貼上</string>

<!-- Menu -->
<string name="switch_keep_unread">保持未讀</string>

<string name="ReadChecker">送信したメッセージの既読者の確認</string>

</resources>
<!-- General -->
<string name="positive_button">確定</string>
<string name="negative_button">取消</string>
<!-- Xposed API -->
<string name="xposed_desc">整潔的 LINE</string>
<!-- Options -->
<string name="module_not_enabled_title">錯誤</string>
<string name="module_not_enabled_text">模組未啟用！</string>
<string name="options_title">選項</string>
<string name="restarting">正在重新啟動 Line...</string>
<string name="need_refresh">需要強制停止和清除快取</string>
<string name="switch_spoof_android_id">欺騙 Android ID</string>
<string name="spoof_android_id_risk">請自行承擔欺騙 Android ID 的風險</string>
<string name="incompatible_version">由于版本不兼容，某些功能不可用。</string>
<string name="switch_android_secondary">偽裝成最高版本</string>
<string name="switch_unembed_options">不要將選項崁入 LINE（選項將不會同步）</string>
<string name="switch_remove_voom">刪除 VOOM 圖示</string>
<string name="switch_remove_wallet">刪除錢包圖示</string>
<string name="switch_remove_news_or_call">刪除新聞或通話圖示</string>
<string name="switch_distribute_evenly">均勻排列底欄的圖示</string>
<string name="switch_extend_clickable_area">擴大底欄圖示的可點擊區域</string>
<string name="switch_remove_icon_labels">刪除底欄的圖示標籤</string>
<string name="switch_remove_ads">刪除廣告</string>
<string name="switch_remove_recommendation">刪除推薦</string>
<string name="switch_remove_premium_recommendation">刪除 LYP Premium 推薦</string>
<string name="switch_remove_service_labels">移除服務標籤</string>
<string name="switch_remove_reply_mute">刪除通知的「靜音聊天」操作</string>
<string name="switch_redirect_webview">將 WebView 重新導向到預設瀏覽器</string>
<string name="switch_open_in_browser">在瀏覽器應用程式開啟</string>
<string name="switch_prevent_mark_as_read">總是防止標記為已讀</string>
<string name="switch_send_mute_message">總是傳送靜音訊息</string>
<string name="switch_prevent_unsend_message">防止訊息撤回</string>
<string name="switch_remove_keep_unread">刪除聊天分頁右上角選單的「保持未讀」開關</string>
<string name="switch_block_tracking">防止跟蹤通訊</string>
<string name="switch_stop_version_check">停止检查 LINE 版本</string>
<string name="switch_output_communication">將通訊內容輸出到日誌內（供開發人員使用）</string>
<string name="modify_request">修改請求</string>
<string name="modify_response">修改回應</string>
<string name="button_copy">複製</string>
<string name="button_paste">貼上</string>
<!-- Menu -->
<string name="switch_keep_unread">保持未讀</string>
</resources>
10 changes: 5 additions & 5 deletions app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="main_bnb_button_height">106dp</dimen>
<dimen name="main_bnb_button_width">80dp</dimen>
<dimen name="gnav_icon_offset">21dp</dimen>
<dimen name="home_tab_v3_service_icon_size">45dp</dimen>
<dimen name="main_bnb_button_height">106dp</dimen>
<dimen name="main_bnb_button_width">80dp</dimen>
<dimen name="gnav_icon_offset">21dp</dimen>
<dimen name="home_tab_v3_service_icon_size">45dp</dimen>
</resources>
4 changes: 2 additions & 2 deletions app/src/main/res/values/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#06C755</color>
<color name="ic_launcher_background">#06C755</color>
</resources>
Loading

0 comments on commit b014cc5

Please sign in to comment.