diff --git a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt index c1a2ff1..21d3bb2 100644 --- a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt @@ -33,6 +33,7 @@ import com.hjq.permissions.OnPermissionCallback import com.hjq.permissions.Permission import com.hjq.permissions.XXPermissions import com.tencent.mmkv.MMKV +import com.yingmao.clash.BuildConfig import com.yingmao.clash.R import com.yingmao.clash.act.NewMainActivity.Companion.isSubed import com.yingmao.clash.act.NewMainActivity.Companion.newUuid @@ -240,6 +241,8 @@ class SettingActivity : BaseActivity() { } showBottomDialog(languageInfoList) } + + findViewById(R.id.tvVersion).text=resources.getString(R.string.edition) + "${BuildConfig.VERSION_NAME}." + BuildConfig.productId } diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 9dc5588..05c46ff 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -352,6 +352,45 @@ android:layout_marginLeft="@dimen/dp_10" android:src="@drawable/ic_s_arrow_right" /> + + + + + + + + diff --git a/app/src/main/res/layout/dialog_band_choose.xml b/app/src/main/res/layout/dialog_band_choose.xml index ad6a986..8d34c1b 100644 --- a/app/src/main/res/layout/dialog_band_choose.xml +++ b/app/src/main/res/layout/dialog_band_choose.xml @@ -47,6 +47,7 @@ android:layout_height="wrap_content" android:text="@string/mobilePhone" android:textSize="12sp" + android:layout_gravity="center" android:textColor="#4F4F4F" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 1152760..3a91306 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -59,7 +59,7 @@ common problem Change Password Bind phone number - Recharge Record + Record purchase history My point card @@ -267,7 +267,7 @@ Bind account Please choose the binding method - mobile phone + phone Please contact Telegram Group or customer service for any issues such as unpaid recharge, and we will definitely solve them! Abnormal acquisition of order information @@ -359,4 +359,16 @@ Service Description\n 《ServiceTerms》 《PrivacyPolicy》 In order to implement and strengthen awareness of personal information security protection, please read the relevant agreements listed below carefully. + + Renewal + Membership has expired + Open connection + Temporary account + Message center + Renew membership + Disconnect + Please select VIP membership package + Change country/region + Safety mode + Speed mode \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1024975..e8e643b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -350,4 +350,16 @@ 《服務條款》 《隱私政策》 為貫徹與加強個人信息安全防護意識,請仔細閱讀以下列出的相關協議 + 續費 + 會員已到期 + 開啟連接 + 臨時賬號 + 消息中心 + 續費會員 + 斷開連接 + 請選擇VIP會員套餐 + 變更國家/地區 + 安全模式 + 極速模式 + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6268941..927b452 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -348,4 +348,15 @@ 《服務條款》 《隱私政策》 為貫徹與加強個人信息安全防護意識,請仔細閱讀以下列出的相關協議 + 續費 + 會員已到期 + 開啟連接 + 臨時賬號 + 消息中心 + 續費會員 + 斷開連接 + 請選擇VIP會員套餐 + 變更國家/地區 + 安全模式 + 極速模式 \ No newline at end of file