[Modify]多语言调整

2023-06-07 10:15:44 +08:00
parent dc1436008e
commit 0dfe37c18c
12 changed files with 29 additions and 11 deletions
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java
@@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.gift.dialog;
 import android.content.Context;
 import android.graphics.drawable.Drawable;

+import androidx.core.content.ContextCompat;
 import androidx.databinding.ObservableBoolean;
 import androidx.databinding.ObservableField;

@@ -34,6 +35,8 @@ public class GiftInfoVm extends BaseItem<GiftInfo> {

    public Drawable radishDrawableSelected = null;

+    public Drawable diamondDrawable = null;
+
    /**
     * 是否显示新
     */
@@ -69,14 +72,17 @@ public class GiftInfoVm extends BaseItem<GiftInfo> {
        if (data.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD) {
            radishDrawable = null;
            radishDrawableSelected = null;
+            diamondDrawable = ContextCompat.getDrawable(context, R.drawable.icon_diamonds);
            goldText.set(context.getResources().getString(R.string.how_much_gold, data.getGoldPrice()));
        } else if (data.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT) {
            radishDrawable = null;
            radishDrawableSelected = null;
+            diamondDrawable = null;
            goldText.set(context.getResources().getString(R.string.free_gift));
        } else {
            radishDrawable = context.getResources().getDrawable(R.drawable.icon_radish_transparent);
            radishDrawableSelected = context.getResources().getDrawable(R.drawable.icon_radish_transparent_selected);
+            diamondDrawable = null;
            goldText.set(String.valueOf(data.getGoldPrice()));
        }
        this.isKnap.set(isKnap);
--- a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt
@@ -11,6 +11,8 @@ import com.yizhuan.erban.databinding.ActivityAreaSelectBinding
 import com.yizhuan.erban.event.AreaChangeEvent
 import com.yizhuan.erban.ui.setting.adapter.PartitionAdapter
 import com.yizhuan.erban.ui.setting.viewmodel.SetViewModel
+import com.yizhuan.xchat_android_library.common.SpConstants
+import com.yizhuan.xchat_android_library.common.util.SPUtils
 import org.greenrobot.eventbus.EventBus

 /**
@@ -21,6 +23,7 @@ class AreaSelectActivity : BaseViewBindingActivity<ActivityAreaSelectBinding>()

    private val setViewModel: SetViewModel by viewModels()
    private val mPartitionAdapter by lazy { PartitionAdapter() }
+    private var mPosition = 0

    companion object {
        @JvmStatic
@@ -47,9 +50,15 @@ class AreaSelectActivity : BaseViewBindingActivity<ActivityAreaSelectBinding>()

        setViewModel.changePartitionLiveData.observe(this) {
            EventBus.getDefault().post(AreaChangeEvent())
+            if(mPartitionAdapter.getItem(mPosition)?.desc == "华语区"){
+                SPUtils.putString(SpConstants.AREA_SELECT, "华语区")
+            }else {
+                SPUtils.putString(SpConstants.AREA_SELECT, "其它地区")
+            }
        }

        mPartitionAdapter.setOnItemClickListener { _, _, position ->
+            mPosition = position
            mPartitionAdapter.getItem(position)?.id?.let { setViewModel.changePartition(it) }
            mPartitionAdapter.setSelectPosition(position)
            mPartitionAdapter.notifyDataSetChanged()
--- a/app/src/main/res/drawable-xhdpi/icon_diamonds.png
+++ b/app/src/main/res/drawable-xhdpi/icon_diamonds.png
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -15,7 +15,7 @@
        <FrameLayout
            android:id="@+id/fl_init_flutter"
            android:layout_width="1px"
-            android:layout_height="1px"/>
+            android:layout_height="1px" />

        <ImageView
            android:id="@+id/iv_activity"
@@ -26,7 +26,7 @@

        <TextView
            android:id="@+id/tv_skip"
-            android:layout_width="50dp"
+            android:layout_width="wrap_content"
            android:layout_height="24dp"
            android:layout_gravity="end"
            android:layout_marginTop="50dp"
@@ -34,9 +34,11 @@
            android:background="@drawable/selector_bg_splash_skip"
            android:gravity="center"
            android:onClick="@{click}"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_10"
            android:text="@string/text_skip"
            android:textColor="@color/white"
-            android:textSize="13dp"
+            android:textSize="@dimen/sp_13"
            android:visibility="gone" />

        <TextView
@@ -50,7 +52,7 @@
            android:onClick="@{click}"
            android:text="@string/layout_activity_splash_01"
            android:textColor="@color/white"
-            android:textSize="18dp"
+            android:textSize="@dimen/sp_18"
            android:visibility="gone" />
    </FrameLayout>
 </layout>
--- a/app/src/main/res/layout/list_item_dialog_gift.xml
+++ b/app/src/main/res/layout/list_item_dialog_gift.xml
@@ -56,6 +56,7 @@
            android:layout_below="@id/gift_name"
            android:layout_centerHorizontal="true"
            android:drawableStart="@{item.isSelect?item.radishDrawableSelected:item.radishDrawable}"
+            android:drawableEnd="@{item.diamondDrawable}"
            android:drawablePadding="2dp"
            android:text="@{item.goldText}"
            android:textColor="@{item.isSelect ? @color/color_ffb606_transparent_65 : @color/white_transparent_50}"
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -716,7 +716,7 @@
    <string name="buy_decoration_info_text">أنت على وشك شراء "%1$s (%2$s يوم)"</string>
    <string name="renew_decoration_info_text">أنت على وشك تجديد "%1$s (%2$s يوم)"</string>
    <string name="donate_decoration_info_text">هدية &amp; # 160 ؛ &amp; # 160 ؛%1$s &amp; # 160 ؛ &amp; # 160 ؛ "%$s (%3$s يوم)"</string>
-    <string name="how_much_gold">%d ماسات</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d جزر</string>
    <string name="task_center">مركز المهام</string>
    <string name="task_go_to_finish">لانهاء</string>
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -706,7 +706,7 @@
    <string name="buy_decoration_info_text">You are about to purchase "%1$s(%2$s days)"</string>
    <string name="renew_decoration_info_text">You are about to renew "%1$s(%2$s days)"</string>
    <string name="donate_decoration_info_text">Gift &#160;&#160;%1$s&#160;&#160; "%2$s (%3$s days)"</string>
-    <string name="how_much_gold">%d diamonds</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d carrots</string>
    <string name="task_center">Task center</string>
    <string name="task_go_to_finish">To complete</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -725,7 +725,7 @@
    <string name="buy_decoration_info_text">Anda akan membeli "%1$s(%2$s hari)"</string>
    <string name="renew_decoration_info_text">Anda akan memperpanjang "%1$s(%2$s hari)"</string>
    <string name="donate_decoration_info_text">Hadiah &#160;&#160;%1$s&#160;&#160; "%2$s (%3$s hari)"</string>
-    <string name="how_much_gold">%d berlian</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d wortel</string>
    <string name="task_center">Pusat tugas</string>
    <string name="task_go_to_finish">Menyelesaikan</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -726,7 +726,7 @@
    <string name="buy_decoration_info_text">"%1$s(%2$s gün)" satın almak üzeresiniz</string>
    <string name="renew_decoration_info_text">"%1$s(%2$s gün)" süresini yenilemek üzeresiniz</string>
    <string name="donate_decoration_info_text">Hediye &#160;&#160;%1$s&#160;&#160; "%2$s (%3$s gün)"</string>
-    <string name="how_much_gold">%d elmas</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d havuç</string>
    <string name="task_center">görev merkezi</string>
    <string name="task_go_to_finish">bitirmek için</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -724,7 +724,7 @@
    <string name="buy_decoration_info_text">您將要購買「%1$s(%2$s天)」</string>
    <string name="renew_decoration_info_text">您將要續費「%1$s(%2$s天)」</string>
    <string name="donate_decoration_info_text">贈送&#160;&#160;%1$s&#160;&#160;「%2$s(%3$s天)」</string>
-    <string name="how_much_gold">%d鉆石</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d蘿蔔</string>
    <string name="task_center">任務中心</string>
    <string name="task_go_to_finish">去完成</string>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -724,7 +724,7 @@
    <string name="buy_decoration_info_text">您將要購買「%1$s(%2$s天)」</string>
    <string name="renew_decoration_info_text">您將要續費「%1$s(%2$s天)」</string>
    <string name="donate_decoration_info_text">贈送&#160;&#160;%1$s&#160;&#160;「%2$s(%3$s天)」</string>
-    <string name="how_much_gold">%d鉆石</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d蘿蔔</string>
    <string name="task_center">任務中心</string>
    <string name="task_go_to_finish">去完成</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -706,7 +706,7 @@
    <string name="buy_decoration_info_text">You are about to purchase "%1$s(%2$s days)"</string>
    <string name="renew_decoration_info_text">You are about to renew "%1$s(%2$s days)"</string>
    <string name="donate_decoration_info_text">Gift &#160;&#160;%1$s&#160;&#160; "%2$s (%3$s days)"</string>
-    <string name="how_much_gold">%d diamonds</string>
+    <string name="how_much_gold">%d</string>
    <string name="how_much_radish">%d carrots</string>
    <string name="task_center">Task center</string>
    <string name="task_go_to_finish">To complete</string>