调整首页布局

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

@@ -8,7 +8,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_gravity="center"
-        android:background="@drawable/window">
+        android:background="@drawable/window2s">
 
         <TextView
             android:id="@+id/tv_title"

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

@@ -8,7 +8,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/window"
+        android:background="@drawable/window2s"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 

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

@@ -6,16 +6,31 @@
     android:id="@+id/fragment_home"
     android:orientation="vertical">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_margin="5dp"
+        android:background="@drawable/dialogshort">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/McNews"
+            android:background="@drawable/veil2"
+            android:textSize="10sp"/>
+
         <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/cv_banner"
-        android:layout_margin="10dp"
             android:layout_width="match_parent"
             android:layout_height="120dp"
+            android:layout_margin="5dp"
             android:clickable="true"
             android:foreground="?android:attr/selectableItemBackground"
             android:orientation="vertical"
             app:cardBackgroundColor="@color/transparent"
-        app:cardCornerRadius="10dp"
+            app:cardCornerRadius="5dp"
         app:elevation="0dp"
         app:cardElevation="0dp"
         app:cardUseCompatPadding="false">
@@ -46,24 +61,38 @@
         </RelativeLayout>
 
         </androidx.cardview.widget.CardView>
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_margin="5dp"
+        android:orientation="horizontal"
+        android:weightSum="1">
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
             android:layout_marginRight="5dp"
-            android:weightSum="1"
+            android:layout_marginBottom="60dp"
+            android:layout_weight="0.5"
+            android:background="@drawable/dialogshort"
             android:orientation="vertical">
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/server_list"
+                android:background="@drawable/veil2"
+                android:textSize="10sp">
+
+            </androidx.appcompat.widget.AppCompatTextView>
+
             <FrameLayout
                 android:id="@+id/serverlist"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="60dp">
+                android:layout_height="wrap_content">
 
                 <com.tubb.smrv.SwipeMenuRecyclerView
                     android:id="@+id/list_server"
@@ -75,6 +104,7 @@
                     android:id="@+id/shimmer_tv"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_margin="10dp"
                     android:layout_alignParentLeft="true"
                     android:background="@drawable/window2s"
                     android:gravity="center"
@@ -86,10 +116,11 @@
 
         <LinearLayout
             android:id="@+id/rightbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:layout_gravity="right"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="15dp"
+            android:layout_marginBottom="60dp"
+            android:layout_weight="1"
             android:orientation="horizontal">
 
             <LinearLayout
@@ -99,8 +130,8 @@
 
                 <androidx.cardview.widget.CardView
                     android:id="@+id/action_game"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
                     android:layout_marginRight="10dp"
                     android:layout_marginBottom="10dp"
                     android:clickable="true"
@@ -142,7 +173,7 @@
 
                 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                     android:id="@+id/action_reset_game_res"
-                    android:layout_width="100dp"
+                    android:layout_width="80dp"
                     android:layout_height="50dp"
                     android:layout_marginBottom="10dp"
                     android:clickable="true"
@@ -184,8 +215,8 @@
 
                 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                     android:id="@+id/action_replay"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
                     android:layout_marginBottom="10dp"
                     android:clickable="true"
                     android:foreground="?android:attr/selectableItemBackground"
@@ -226,8 +257,8 @@
 
                 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                     android:id="@+id/action_download_ex"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="80dp"
+                    android:layout_height="50dp"
                     android:layout_marginBottom="10dp"
                     android:clickable="true"
                     android:foreground="?android:attr/selectableItemBackground"
@@ -274,9 +305,9 @@
 
                 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                     android:id="@+id/action_join_qq_group"
-                    android:layout_width="100dp"
+                    android:layout_width="80dp"
                     android:layout_height="50dp"
-                    android:layout_marginBottom="10dp"
+                    android:layout_marginBottom="5dp"
                     android:clickable="true"
                     android:foreground="?android:attr/selectableItemBackground"
                     android:orientation="vertical"
@@ -316,10 +347,10 @@
 
                 <androidx.cardview.widget.CardView
                     android:id="@+id/action_help"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginBottom="5dp"
                     android:clickable="true"
                     android:foreground="?android:attr/selectableItemBackground"
                     android:orientation="vertical"

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/red"
+            android:background="@drawable/radius"
             android:gravity="center"
             android:text="@string/delete"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
@@ -39,8 +39,8 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/window2s"
+            android:layout_height="match_parent"
+            android:background="@drawable/button_bg"
             android:orientation="vertical"
             android:padding="@dimen/padding2">
 
@@ -66,6 +66,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
+
                     <TextView
                         android:id="@+id/text_ip"
                         android:layout_width="wrap_content"
@@ -81,9 +82,9 @@
                         android:layout_height="match_parent"
                         android:gravity="center_vertical"
                         android:text=":"
-                        android:textSize="10sp"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                        android:textColor="@color/gray" />
+                        android:textColor="@color/gray"
+                        android:textSize="10sp" />
 
                     <TextView
                         android:id="@+id/text_port"
@@ -120,6 +121,7 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
+
                     <ImageView
                         android:id="@+id/btn_edit_delete"
                         android:layout_width="20dp"
@@ -128,6 +130,7 @@
                         android:layout_marginRight="10dp"
                         android:background="@drawable/rename"
                         android:gravity="right" />
+
                     <ImageView
                         android:id="@+id/iv_fond"
                         android:layout_width="20dp"

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

@@ -74,6 +74,7 @@
         <item>높음</item>
     </string-array>
     <!-- settings -->
+    <string name="server_list">在线游戏</string>
     <string name="server_name">이름:</string>
     <string name="server_ip">호스트 정보:</string>
     <string name="server_user">별명:</string>
@@ -199,6 +200,7 @@
     <string name="send">보내기</string>
     <string name="mc_home">홈</string>
     <string name="bbs">커뮤니티</string>
+    <string name="McNews">공고</string>
     <string name="settings_pref_settings_only_game">게임 직접 시작</string>
     <string name="only_game_tip">설정에서 앱을 초기화 하셔야 해제가 가능합니다</string>
     <string name="title_use_ex">확장 카드 팩 활성화</string>

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

@@ -75,6 +75,7 @@
         <item>高</item>
     </string-array>
     <!-- settings -->
+    <string name="server_list">直连决斗</string>
     <string name="server_name">名称:</string>
     <string name="server_ip">主机信息:</string>
     <string name="server_user">昵称:</string>
@@ -206,6 +207,7 @@
     <string name="send">发送</string>
     <string name="mc_home">大厅</string>
     <string name="bbs">社区</string>
+    <string name="McNews">公告</string>
     <string name="settings_pref_settings_only_game">直接启动游戏</string>
     <string name="only_game_tip">慎重勾选，清除应用数据或者重装才能恢复</string>
     <string name="title_use_ex">启用扩展卡包</string>

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

@@ -92,6 +92,7 @@
     </string-array>
     <!-- settings -->
 
+    <string name="server_list">Duel Servers</string>
     <string name="server_name">Name:</string>
     <string name="server_ip">Host:</string>
     <string name="server_user">User:</string>
@@ -205,6 +206,7 @@
     <string name="failed_reason">Logining failed because of</string>
     <string name="send">Send</string>
     <string name="bbs">Community</string>
+    <string name="McNews">News</string>
     <string name="settings_pref_settings_only_game">Only start game</string>
     <string name="only_game_tip">reset this setting, need clean data of app</string>
     <string name="title_use_ex">Use Expansions</string>