update Strings

mobile/assets_ko/data/conf/strings.conf

@@ -53,6 +53,8 @@
 !system 98 다른 몬스터를 불러오길 원합니까?
 !system 100 선공
 !system 101 후공
+!system 102 자신
+!system 103 상대방
 !system 200 [%ls] [%ls]의 효과를 사용하겠습니까?
 !system 201 이 타이밍에 발동할 효과가 없습니다
 !system 202 필드를 확인하겠습니까?
@@ -204,6 +206,7 @@
 !system 1075 특수 소환
 !system 1076 링크
 !system 1080 (N/A)
+!system 1081 엑스트라 몬스터 존
 #GUI
 !system 1100 마법 / 함정 파괴
 !system 1101 몬스터 파괴
@@ -521,7 +524,8 @@
 !victory 0x1d [F.A. 위너즈]의 효과에 의해 승리하였습니다
 !victory 0x1e [비행 코끼리]의 효과에 의해 승리하였습니다
 !victory 0x1f [수호신 엑조디아]의 효과에 의해 승리하였습니다
-!victory 0x20 [%ls]의 효과에 의해 매치에서 승리하였습니다
+!victory 0x20 「진엑조디아」의 효과로 승리
+!victory 0xffff 「%ls」의 효과로 승리
 #counters
 !counter 0x1 마력 카운터
 !counter 0x1002 쐐기 카운터
@@ -1005,3 +1009,6 @@
 !setname 0x139 오노마토
 !setname 0x13a 수호신관
 !setname 0x13b 리벨리온
+!setname 0x13c 코드 브레이커
+!setname 0x13d 네메시스
+!setname 0x13e 바르바로스
\ No newline at end of file

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 360200119
+        versionCode 360200122
         versionName "3.6.2"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java

@@ -5,6 +5,7 @@ import android.content.DialogInterface;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -78,7 +79,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
     private LinearLayout ll_bar;
     private ProgressBar pb_loading;
     private TextView tv_loading;
-    private boolean isDownloadCardImage=true;
+    private boolean isDownloadCardImage = true;
 
     @SuppressLint("HandlerLeak")
     Handler handler = new Handler() {
@@ -88,21 +89,21 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
             super.handleMessage(msg);
             switch (msg.what) {
                 case TYPE_DOWNLOAD_CARD_IMAGE_OK:
-                    isDownloadCardImage=true;
+                    isDownloadCardImage = true;
                     ll_bar.startAnimation(AnimationUtils.loadAnimation(context, R.anim.out_from_bottom));
                     ll_bar.setVisibility(View.GONE);
                     imageLoader.bindImage(photoView, msg.arg1, null, true);
                     imageLoader.bindImage(cardImage, msg.arg1, null, true);
                     break;
                 case TYPE_DOWNLOAD_CARD_IMAGE_ING:
-                    tv_loading.setText(msg.arg1+"%");
+                    tv_loading.setText(msg.arg1 + "%");
                     pb_loading.setProgress(msg.arg1);
                     break;
                 case TYPE_DOWNLOAD_CARD_IMAGE_EXCEPTION:
-                    isDownloadCardImage=true;
+                    isDownloadCardImage = true;
                     ll_bar.startAnimation(AnimationUtils.loadAnimation(context, R.anim.out_from_bottom));
                     ll_bar.setVisibility(View.GONE);
-                    YGOUtil.show("error"+msg.obj);
+                    YGOUtil.show("error" + msg.obj);
                     break;
 
             }
@@ -316,9 +317,10 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
                 if (!isDownloadCardImage)
                     return false;
                 DialogPlus dialogPlus = new DialogPlus(context);
-                dialogPlus.setMessage("是否重新下载高清卡图？");
-                dialogPlus.setLeftButtonText("重新下载");
-                dialogPlus.setRightButtonText("取消");
+                dialogPlus.setMessage(R.string.tip_redownload);
+                dialogPlus.setMessageGravity(Gravity.CENTER_HORIZONTAL);
+                dialogPlus.setLeftButtonText(R.string.Download);
+                dialogPlus.setRightButtonText(R.string.Cancel);
                 dialogPlus.setRightButtonListener(new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -353,17 +355,17 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
     }
 
     private void downloadCardImage(int code, File file) {
-        isDownloadCardImage=false;
+        isDownloadCardImage = false;
         DownloadUtil.get().download(YGOUtil.getCardImageDetailUrl(code), file.getParent(), file.getName(), new DownloadUtil.OnDownloadListener() {
             @Override
             public void onDownloadSuccess(File file) {
-                if (file.length()<100*1024){
+                if (file.length() < 50 * 1024) {
                     FileUtils.deleteFile(file);
                     Message message = new Message();
                     message.what = TYPE_DOWNLOAD_CARD_IMAGE_EXCEPTION;
-                    message.obj = "未找到高清图或下载不完整，请长按重新下载";
+                    message.obj = context.getString(R.string.download_image_error);
                     handler.sendMessage(message);
-                }else {
+                } else {
                     Message message = new Message();
                     message.what = TYPE_DOWNLOAD_CARD_IMAGE_OK;
                     message.arg1 = code;
@@ -383,7 +385,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
             public void onDownloadFailed(Exception e) {
                 //下载失败后删除下载的文件
                 FileUtils.deleteFile(file);
-                downloadCardImage(code,file);
+                downloadCardImage(code, file);
 
                 Message message = new Message();
                 message.what = TYPE_DOWNLOAD_CARD_IMAGE_EXCEPTION;
@@ -397,12 +399,12 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         int position = getCurPosition();
         CardListProvider provider = getProvider();
         if (position == 0) {
-            getContext().showToast("已经是第一张啦", Toast.LENGTH_SHORT);
+            getContext().showToast(R.string.already_top, Toast.LENGTH_SHORT);
         } else {
             int index = position;
             do {
                 if (index == 0) {
-                    getContext().showToast("已经是第一张啦", Toast.LENGTH_SHORT);
+                    getContext().showToast(R.string.already_top, Toast.LENGTH_SHORT);
                     return;
                 } else {
                     index--;
@@ -411,7 +413,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
 
             bind(provider.getCard(index), index, provider);
             if (position == 1) {
-                getContext().showToast("已经是第一张啦", Toast.LENGTH_SHORT);
+                getContext().showToast(R.string.already_top, Toast.LENGTH_SHORT);
             }
         }
     }
@@ -423,7 +425,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
             int index = position;
             do {
                 if (index == provider.getCardsCount() - 1) {
-                    getContext().showToast("已经是最后一张啦", Toast.LENGTH_SHORT);
+                    getContext().showToast(R.string.already_end, Toast.LENGTH_SHORT);
                     return;
                 } else {
                     index++;
@@ -432,10 +434,10 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
 
             bind(provider.getCard(index), index, provider);
             if (position == provider.getCardsCount() - 1) {
-                getContext().showToast("已经是最后一张啦", Toast.LENGTH_SHORT);
+                getContext().showToast(R.string.already_end, Toast.LENGTH_SHORT);
             }
         } else {
-            getContext().showToast("已经是最后一张啦", Toast.LENGTH_SHORT);
+            getContext().showToast(R.string.already_end, Toast.LENGTH_SHORT);
         }
     }
 

mobile/src/main/res/values-ko/strings.xml

@@ -181,7 +181,7 @@
     <string name="reset_game_res">리소스 리셋</string>
     <string name="downloading_images">Downloading images</string>
     <string name="download_image_progress" formatted="false">Downloading card image %d/%d</string>
-    <string name="download_image_error" formatted="false">Download fail %d</string>
+    <string name="download_image_error" formatted="false">다운로드 실패\,다시 시도하려면 길게 눌러주십시오.</string>
     <string name="downloading_images_ok">Download images ok</string>
     <string name="tip_istunning">ygopro실행중...</string>
     <string name="edit">수정</string>
@@ -272,4 +272,7 @@
     <string name="unable_to_edit_empty_deck">사용할 수 없는 빈 구역</string>
     <string name="create_new_failed">생성실패</string>
     <string name="about_pref_settings_keep_scale">원래 해상도 스케일 디스플레이</string>
+    <string name="tip_redownload">카드를 다시 다운로드하겠습니까?</string>
+    <string name="already_top">첫번째</string>
+    <string name="already_end">마지막</string>
 </resources>

mobile/src/main/res/values-zh/strings.xml

@@ -183,7 +183,7 @@
     <string name="reset_game_res">重置资源</string>
     <string name="downloading_images">上次任务正在停止，请稍后再试</string>
     <string name="download_image_progress" formatted="false">正在下载卡图 %d/%d</string>
-    <string name="download_image_error" formatted="false">共 %d 张图片下载失败</string>
+    <string name="download_image_error" formatted="false">图片下载失败长按重试</string>
     <string name="downloading_images_ok">图片下载完成</string>
     <string name="tip_istunning">游戏已运行</string>
     <string name="edit">编辑</string>
@@ -271,4 +271,7 @@
     <string name="unable_to_edit_empty_deck">不可操作空卡组</string>
     <string name="create_new_failed">创建失败</string>
     <string name="about_pref_settings_keep_scale">开启原始比例的游戏画面</string>
+    <string name="already_top">已经是第一张啦</string>
+    <string name="already_end">已经是最后一张啦</string>
+    <string name="tip_redownload">重新下载？</string>
 </resources>

mobile/src/main/res/values/strings.xml

@@ -183,7 +183,7 @@
     <string name="reset_game_res">Reset Resources</string>
     <string name="downloading_images">Downloading images</string>
     <string name="download_image_progress" formatted="false">Downloading card image %d/%d</string>
-    <string name="download_image_error" formatted="false">Download fail %d</string>
+    <string name="download_image_error" formatted="false">Download fail, Long press to retry</string>
     <string name="downloading_images_ok">Download images ok</string>
     <string name="tip_istunning">YGOPro is Running</string>
     <string name="edit">Edit</string>
@@ -267,11 +267,14 @@
     <string name="please_select_target_category">please select target category</string>
     <string name="delete_confirm">will delete all deck of this Category</string>
     <string name="no_deck_is_selected">no_deck_is_selected</string>
-    <string name="done">done！</string>
+    <string name="done">done\！</string>
     <string name="donot_editor_bot_Deck">Pls Donot edit/remove AI Deck, if you do\nAI mode wont work properly</string>
     <string name="code_share">Code Share</string>
     <string name="screenshoot">Screenshoot</string>
     <string name="unable_to_edit_empty_deck">unable to edit empty deck</string>
     <string name="create_new_failed">Create Failed</string>
     <string name="about_pref_settings_keep_scale">Original Resolution Scale Display</string>
+    <string name="already_top">Already the first card</string>
+    <string name="already_end">Already the last card</string>
+    <string name="tip_redownload">Redownload\?</string>
 </resources>