Merge branch 'master' of https://gitee.com/bdnh_admin/YGOMobile-cn-ko-en

mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/ServerListAdapter.java

@@ -5,8 +5,10 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.transition.Visibility;
 
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.tubb.smrv.SwipeHorizontalMenuLayout;
@@ -86,7 +88,7 @@ public class ServerListAdapter extends BaseRecyclerAdapterPlus<ServerInfo, BaseV
                     if (menuLayout2.isMenuOpen()) {
                         menuLayout2.smoothCloseMenu();
                     }
-                    break;
+                    break;/*
                 case R.id.iv_fond:
                     DialogPlus builder = new DialogPlus(getContext());
                     builder.setTitle(R.string.OpenTIP);
@@ -101,7 +103,7 @@ public class ServerListAdapter extends BaseRecyclerAdapterPlus<ServerInfo, BaseV
                         builder.setMessage(R.string.join_helper_tip1);
                     }
                     builder.show();
-                    break;
+                    break;*/
             }
         });
     }
@@ -116,9 +118,9 @@ public class ServerListAdapter extends BaseRecyclerAdapterPlus<ServerInfo, BaseV
         baseViewHolder.setText(R.id.text_port, String.valueOf(serverInfo.getPort()));
 
         if (position == 0) {
-            baseViewHolder.setBackgroundResource(R.id.iv_fond, R.drawable.cube);
+            baseViewHolder.findView(R.id.iv_fond).setVisibility(View.VISIBLE);
         } else {
-            baseViewHolder.setBackgroundResource(R.id.iv_fond, R.drawable.cube2);
+            baseViewHolder.findView(R.id.iv_fond).setVisibility(View.GONE);
         }
     }
 }

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

@@ -56,7 +56,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center"
-                    android:text="@string/logining_failed"
+                    android:text="@string/loading_failed"
                     android:textSize="15sp" />
             </RelativeLayout>
 

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

@@ -23,7 +23,7 @@
             android:layout_width="@dimen/item_menu_width"
             android:layout_height="@dimen/item_menu_height"
             android:layout_gravity="right|center_vertical"
-            android:background="@drawable/radius"
+            android:background="@drawable/button_bg"
             android:gravity="center"
             android:text="@string/delete"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
@@ -31,22 +31,36 @@
 
     </LinearLayout>
 
-    <LinearLayout
+    <FrameLayout
         android:id="@id/smContentView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <ImageView
+            android:id="@+id/iv_fond"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="left"
+            android:layout_marginTop="-5dp"
+            android:layout_marginEnd="-10dp"
+            android:layout_marginLeft="-30dp"
+            android:layout_marginBottom="-10dp"
+            android:alpha="0.5"
+            android:src="@drawable/cube2"
+            android:rotation="-90"
+            android:gravity="center" />
+
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:background="@drawable/list_item_bg"
             android:orientation="vertical"
             android:padding="@dimen/padding2">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_margin="4dp"
                 android:orientation="vertical">
 
@@ -130,15 +144,9 @@
                         android:layout_marginRight="10dp"
                         android:background="@drawable/rename"
                         android:gravity="right" />
-
-                    <ImageView
-                        android:id="@+id/iv_fond"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:gravity="center" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
+    </FrameLayout>
 
 </com.tubb.smrv.SwipeHorizontalMenuLayout>
\ No newline at end of file