重做连接标记选择布局

mobile/assets/changelog.html

@@ -17,23 +17,16 @@
     特别感谢： 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.3.3</li>
+    <li style="color:#ffff00">3.3.4</li>
 </ul>
 <pre>
     更新：
     1.更新ygo内核；
-    2.更新LP显示；
-    3.自定义头像；
-    4.新卡1006+VJ+VF；
-    修复：
-    1.若干已知卡图错误；
-    2.本地脚本问题；
-    3.更换自动更新源；
+    4.新卡T1005；
     优化：
-    1.把过去的更新日志删了加快初启动速度；
-    2.可以自行设置头像；
-    3.可以定义对方卡背；
-    4.可以定义卡组，菜单的背景；
+    1.卡密搜索可以搜到它规则上的同名卡和异画卡；
+    2.筛选效果怪兽分类不显示其他种类；
+    3.调整部分UI适应新机型屏幕；
 </pre>
 </body>
 </html>
\ No newline at end of file

mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java

@@ -158,7 +158,7 @@ class CardSearchInfo {
                     }
                     //如果是效果怪兽
                     if((card.Type & CardType.Effect.value()) == CardType.Effect.value()){
-                        //如果是融合/同调/超量/连接
+                        //如果是融合/仪式/同调/超量/连接
                         if((card.Type & CardType.Fusion.value())== CardType.Fusion.value()
                                 ||(card.Type & CardType.Ritual.value()) == CardType.Ritual.value()
                                 ||(card.Type & CardType.Synchro.value()) == CardType.Synchro.value()

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

 package cn.garymb.ygomobile.ui.cards;
 
 
-import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.KeyEvent;
@@ -27,6 +25,7 @@ import cn.garymb.ygomobile.loader.ICardLoader;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerAdapter;
 import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerItem;
+import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import ocgcore.data.CardSet;
 import ocgcore.data.LimitList;
 import ocgcore.LimitManager;
@@ -126,10 +125,10 @@ public class CardSearcher implements View.OnClickListener {
                 for (int i = 0; i < BtnVals.length; i++) {
                     BtnVals[i] = "0";
                 }
-                Dialog builder = new Dialog(v.getContext());
-                builder.show();
-                LayoutInflater inflater = LayoutInflater.from(v.getContext());
-                View viewDialog = inflater.inflate(R.layout.item_linkmarker, null);
+                DialogPlus viewDialog = new DialogPlus(mContext);
+                viewDialog.setContentView(R.layout.item_linkmarker);
+                viewDialog.setTitle(R.string.ClickLinkArrows);
+                viewDialog.show();
                 int[] ids = new int[]{
                         R.id.button_1,
                         R.id.button_2,
@@ -141,7 +140,7 @@ public class CardSearcher implements View.OnClickListener {
                         R.id.button_8,
                         R.id.button_9,
                 };
-                int[] enImgs=new int[]{
+                int[] enImgs = new int[]{
                         R.drawable.left_bottom_1,
                         R.drawable.bottom_1,
                         R.drawable.right_bottom_1,
@@ -152,7 +151,7 @@ public class CardSearcher implements View.OnClickListener {
                         R.drawable.top_1,
                         R.drawable.right_top_1,
                 };
-                int[] disImgs=new int[]{
+                int[] disImgs = new int[]{
                         R.drawable.left_bottom_0,
                         R.drawable.bottom_0,
                         R.drawable.right_bottom_0,
@@ -170,8 +169,8 @@ public class CardSearcher implements View.OnClickListener {
                             String mLinkStr = BtnVals[8] + BtnVals[7] + BtnVals[6] + BtnVals[5] + "0"
                                     + BtnVals[3] + BtnVals[2] + BtnVals[1] + BtnVals[0];
                             lineKey = Integer.parseInt(mLinkStr, 2);
-                            if(builder.isShowing()) {
-                                builder.dismiss();
+                            if(viewDialog.isShowing()) {
+                                viewDialog.dismiss();
                             }
                         }else {
                             if ("0".equals(BtnVals[index])) {
@@ -184,8 +183,6 @@ public class CardSearcher implements View.OnClickListener {
                         }
                     });
                 }
-                LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(600, 600);
-                builder.setContentView(viewDialog, layoutParams);
             }
 
         });

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

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/window">
+    android:gravity="center_vertical"
+    android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="180dp"
-        android:layout_height="180dp"
-        android:layout_centerVertical="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/button_7"
-            android:layout_width="41dp"
-            android:layout_height="41dp"
-            android:layout_alignParentLeft="false"
-            android:layout_alignParentStart="false"
-            android:layout_alignParentTop="false"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:background="@drawable/left_top_0"
             android:visibility="visible" />
 
         <Button
             android:id="@+id/button_8"
-            android:layout_width="76dp"
-            android:layout_height="28dp"
-            android:layout_alignLeft="@+id/button_2"
-            android:layout_alignParentTop="false"
-            android:layout_alignStart="@+id/button_2"
+            android:layout_width="80dp"
+            android:layout_height="30dp"
             android:background="@drawable/top_0"
+            android:paddingTop="15dp"
             android:visibility="visible" />
 
         <Button
             android:id="@+id/button_9"
-            android:layout_width="41dp"
-            android:layout_height="41dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:background="@drawable/right_top_0"
             android:visibility="visible" />
+    </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/button_4"
-            android:layout_width="28dp"
-            android:layout_height="76dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
+            android:layout_width="30dp"
+            android:layout_height="80dp"
+            android:layout_marginRight="20dp"
             android:background="@drawable/left_0"
             android:visibility="visible" />
 
         <Button
             android:id="@+id/button_5"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
             android:background="@drawable/button_bg"
             android:text="OK"
-            android:visibility="visible"
-            android:layout_alignTop="@+id/button_4"
-            android:layout_alignBottom="@+id/button_4"
-            android:layout_alignLeft="@+id/button_8"
-            android:layout_alignStart="@+id/button_8"
-            android:layout_alignRight="@+id/button_8"
-            android:layout_alignEnd="@+id/button_8" />
+            android:visibility="visible" />
 
         <Button
             android:id="@+id/button_6"
-            android:layout_width="28dp"
-            android:layout_height="76dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
+            android:layout_width="30dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="20dp"
             android:background="@drawable/right_0"
             android:visibility="visible" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/button_1"
-            android:layout_width="41dp"
-            android:layout_height="41dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:background="@drawable/left_bottom_0"
             android:visibility="visible" />
 
         <Button
             android:id="@+id/button_2"
-            android:layout_width="76dp"
-            android:layout_height="28dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
+            android:layout_width="80dp"
+            android:layout_height="30dp"
+            android:layout_marginTop="10dp"
             android:background="@drawable/bottom_0"
             android:visibility="visible" />
 
         <Button
             android:id="@+id/button_3"
-            android:layout_width="41dp"
-            android:layout_height="41dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:background="@drawable/right_bottom_0" />
-    </RelativeLayout>
-</RelativeLayout>
+    </LinearLayout>
+
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file

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

@@ -218,4 +218,5 @@
     <string name="coverSelect">카드 커버로 사용할 이미지를 선택하세요.</string>
     <string name="bgSelect">배경으로 사용할 이미지를 선택하세요.</string>
     <string name="avatarSelect">아바타로 사용할 이미지를 선택하세요.</string>
+    <string name="ClickLinkArrows">활성화된 링크마커</string>
 </resources>

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

@@ -218,4 +218,5 @@
     <string name="coverSelect">点击相应卡背选择文件</string>
     <string name="bgSelect">点击相应背景选择文件</string>
     <string name="avatarSelect">点击相应头像选择文件</string>
+    <string name="ClickLinkArrows">点亮箭头</string>
 </resources>

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

@@ -221,4 +221,5 @@
     <string name="coverSelect">click covers and select files</string>
     <string name="bgSelect">click background and select files</string>
     <string name="avatarSelect">click avatar and select files</string>
-</resources>
+    <string name="ClickLinkArrows">click link arrows</string>
+    </resources>