[mobile] correct text

pull/123/head
FongMi 3 years ago
parent 62bace5ceb
commit dd36b97e29
  1. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java
  3. 8
      app/src/mobile/res/layout/activity_detail.xml
  4. 11
      app/src/mobile/res/values-zh-rCN/strings.xml
  5. 11
      app/src/mobile/res/values-zh-rTW/strings.xml
  6. 11
      app/src/mobile/res/values/strings.xml

@ -394,8 +394,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
private void onMore() {
boolean more = getString(R.string.vod_content_expand).equals(mBinding.more.getText().toString());
mBinding.more.setText(more ? R.string.vod_content_collapse : R.string.vod_content_expand);
boolean more = getString(R.string.detail_content_expand).equals(mBinding.more.getText().toString());
mBinding.more.setText(more ? R.string.detail_content_collapse : R.string.detail_content_expand);
mBinding.content.setMaxLines(more ? Integer.MAX_VALUE : 4);
}

@ -6,8 +6,10 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.bean.Class;
import com.fongmi.android.tv.databinding.AdapterTypeBinding;
import com.fongmi.android.tv.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@ -39,7 +41,7 @@ public class TypeAdapter extends RecyclerView.Adapter<TypeAdapter.ViewHolder> {
private Class home() {
Class type = new Class();
type.setTypeName("首頁");
type.setTypeName(ResUtil.getString(R.string.home));
type.setTypeId("home");
type.setActivated(true);
return type;

@ -183,7 +183,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="線路"
android:text="@string/detail_flag"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
@ -204,7 +204,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="選集"
android:text="@string/detail_episode"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
@ -225,7 +225,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="簡介"
android:text="@string/detail_content"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
@ -251,7 +251,7 @@
android:layout_gravity="end"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/vod_content_expand"
android:text="@string/detail_content_expand"
android:textColor="@color/white"
android:textSize="12sp"
android:textStyle="bold"

@ -1,16 +1,19 @@
<resources>
<!-- Nav -->
<string name="nav_home">首页</string>
<string name="nav_vod">点播</string>
<string name="nav_setting">设定</string>
<!-- Home -->
<string name="home">首页</string>
<string name="home_history">最近观看</string>
<string name="home_recommend">更新推荐</string>
<!-- VOD -->
<string name="vod_content_expand">展开</string>
<string name="vod_content_collapse">收起</string>
<!-- Detail -->
<string name="detail_flag">线路</string>
<string name="detail_episode">选集</string>
<string name="detail_content">简介</string>
<string name="detail_content_expand">展开</string>
<string name="detail_content_collapse">收起</string>
</resources>

@ -1,16 +1,19 @@
<resources>
<!-- Nav -->
<string name="nav_home">首頁</string>
<string name="nav_vod">點播</string>
<string name="nav_setting">設定</string>
<!-- Home -->
<string name="home">首頁</string>
<string name="home_history">最近觀看</string>
<string name="home_recommend">更新推薦</string>
<!-- VOD -->
<string name="vod_content_expand">展開</string>
<string name="vod_content_collapse">收起</string>
<!-- Detail -->
<string name="detail_flag">線路</string>
<string name="detail_episode">選集</string>
<string name="detail_content">簡介</string>
<string name="detail_content_expand">展開</string>
<string name="detail_content_collapse">收起</string>
</resources>

@ -1,16 +1,19 @@
<resources>
<!-- Nav -->
<string name="nav_home">Home</string>
<string name="nav_vod">Vod</string>
<string name="nav_setting">Setting</string>
<!-- Home -->
<string name="home">Home</string>
<string name="home_history">History</string>
<string name="home_recommend">Recommend</string>
<!-- VOD -->
<string name="vod_content_expand">Expand</string>
<string name="vod_content_collapse">Collapse</string>
<!-- Detail -->
<string name="detail_flag">Flag</string>
<string name="detail_episode">Episode</string>
<string name="detail_content">Summary</string>
<string name="detail_content_expand">Expand</string>
<string name="detail_content_collapse">Collapse</string>
</resources>
Loading…
Cancel
Save