From b51644048d80256219a2142f5c610c7f365a7b08 Mon Sep 17 00:00:00 2001
From: WaterRain <109326062+CATMIAOZHI@users.noreply.github.com>
Date: Sat, 1 Aug 2026 13:43:05 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20widget=20=E7=94=A8=E9=87=8F=E6=9D=A1?=
 =?UTF-8?q?=E5=B7=A6=E5=AF=B9=E9=BD=90=EF=BC=88label=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=2044dp=EF=BC=89+=20=E7=BD=B2=E5=90=8D=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8C=96=E8=B7=9F=E9=9A=8F=E5=BA=94=E7=94=A8=E5=86=85=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 三套布局三行 label 统一 44dp：此前 row2/3 为 60dp、row1 44dp，
  进度条起点差 16dp 导致不对齐；英文标签简化为 Week/Month 后 44dp 足够
- 署名 TextView 补 @+id/widget_brand，Provider 动态 setTextViewText：
  与行标签同源（跟随应用内语言），避免宿主进程按系统语言渲染混搭
---
 .../com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt    | 4 ++++
 app/src/main/res/layout-night/widget_opencode_go.xml         | 5 +++--
 app/src/main/res/layout/widget_opencode_go.xml               | 5 +++--
 app/src/main/res/layout/widget_opencode_go_preview.xml       | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt b/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt
index 4de4a05..f9f3dfb 100644
--- a/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt
+++ b/app/src/main/java/com/rainy/token/ui/widget/OpenCodeGoWidgetProvider.kt
@@ -60,6 +60,10 @@ class OpenCodeGoWidgetProvider : AppWidgetProvider() {
         for (widgetId in appWidgetIds) {
             val views = RemoteViews(context.packageName, R.layout.widget_opencode_go)
 
+            // 署名动态设置：与行标签同源（跟随应用内语言），
+            // 避免 XML 静态文本由宿主进程按系统语言渲染造成中英混搭
+            views.setTextViewText(R.id.widget_brand, context.getString(R.string.widget_brand))
+
             // 点击左上角品牌 → 打开 APP；点击其它内容区域 → 切换服务；刷新按钮单独刷新。
             val openAppIntent = Intent(context, MainActivity::class.java).apply {
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
diff --git a/app/src/main/res/layout-night/widget_opencode_go.xml b/app/src/main/res/layout-night/widget_opencode_go.xml
index 43df9ea..01e6fa9 100644
--- a/app/src/main/res/layout-night/widget_opencode_go.xml
+++ b/app/src/main/res/layout-night/widget_opencode_go.xml
@@ -137,7 +137,7 @@
         android:gravity="center_vertical"
         android:layout_marginBottom="3dp">
         <TextView android:id="@+id/row2_label"
-            android:layout_width="60dp" android:layout_height="wrap_content"
+            android:layout_width="44dp" android:layout_height="wrap_content"
             android:maxLines="1" android:ellipsize="end"
             android:text="@string/window_weekly" android:textColor="#C4A0AB" android:textSize="11sp" />
         <TextView android:id="@+id/row2_pct"
@@ -163,7 +163,7 @@
         android:gravity="center_vertical"
         android:layout_marginBottom="3dp">
         <TextView android:id="@+id/row3_label"
-            android:layout_width="60dp" android:layout_height="wrap_content"
+            android:layout_width="44dp" android:layout_height="wrap_content"
             android:maxLines="1" android:ellipsize="end"
             android:text="@string/window_monthly" android:textColor="#C4A0AB" android:textSize="11sp" />
         <TextView android:id="@+id/row3_pct"
@@ -227,6 +227,7 @@
             android:progressBackgroundTint="#00000000"
             android:indeterminate="false" />
         <TextView
+            android:id="@+id/widget_brand"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/widget_brand"
diff --git a/app/src/main/res/layout/widget_opencode_go.xml b/app/src/main/res/layout/widget_opencode_go.xml
index 40f68f3..79ccade 100644
--- a/app/src/main/res/layout/widget_opencode_go.xml
+++ b/app/src/main/res/layout/widget_opencode_go.xml
@@ -148,7 +148,7 @@
         android:layout_marginBottom="3dp">
 
         <TextView android:id="@+id/row2_label"
-            android:layout_width="60dp" android:layout_height="wrap_content"
+            android:layout_width="44dp" android:layout_height="wrap_content"
             android:maxLines="1" android:ellipsize="end"
             android:text="@string/window_weekly" android:textColor="#8A7A82" android:textSize="11sp" />
 
@@ -178,7 +178,7 @@
         android:layout_marginBottom="3dp">
 
         <TextView android:id="@+id/row3_label"
-            android:layout_width="60dp" android:layout_height="wrap_content"
+            android:layout_width="44dp" android:layout_height="wrap_content"
             android:maxLines="1" android:ellipsize="end"
             android:text="@string/window_monthly" android:textColor="#8A7A82" android:textSize="11sp" />
 
@@ -252,6 +252,7 @@
             android:indeterminate="false" />
 
         <TextView
+            android:id="@+id/widget_brand"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/widget_brand"
diff --git a/app/src/main/res/layout/widget_opencode_go_preview.xml b/app/src/main/res/layout/widget_opencode_go_preview.xml
index 6e02d4a..a33984a 100644
--- a/app/src/main/res/layout/widget_opencode_go_preview.xml
+++ b/app/src/main/res/layout/widget_opencode_go_preview.xml
@@ -103,7 +103,7 @@
         android:layout_marginBottom="6dp">
 
         <TextView
-            android:layout_width="60dp" android:layout_height="wrap_content"
+            android:layout_width="44dp" android:layout_height="wrap_content"
             android:maxLines="1" android:ellipsize="end"
             android:text="@string/window_weekly" android:textColor="#8A7A82" android:textSize="11sp" />
 
@@ -129,7 +129,7 @@
         android:layout_marginBottom="8dp">
 
         <TextView
-            android:layout_width="60dp" android:layout_height="wrap_content"
+            android:layout_width="44dp" android:layout_height="wrap_content"
             android:maxLines="1" android:ellipsize="end"
             android:text="@string/window_monthly" android:textColor="#8A7A82" android:textSize="11sp" />