Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

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

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

@@ -94,14 +94,14 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
                     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;
                     ll_bar.startAnimation(AnimationUtils.loadAnimation(context, R.anim.out_from_bottom));
                     ll_bar.setVisibility(View.GONE);
-                    YGOUtil.show("下载失败，原因为" + msg.obj);
+                    YGOUtil.show("error"+msg.obj);
                     break;
 
             }

mobile/src/main/res/layout/dialog_photo.xml

@@ -14,19 +14,19 @@
     <LinearLayout
         android:visibility="gone"
         android:id="@+id/ll_bar"
-        android:background="@color/gray"
+        android:background="@drawable/radius"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_name"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="5dp"
             android:gravity="center"
             android:textStyle="bold"
-            android:text="下载高清卡图中"
+            android:text="@string/Download"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />