编辑服务器挪到右上角

mobile/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 331200118
-        versionName "3.3.12"
+        versionCode 331300219
+        versionName "3.3.13"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true
         ndk {

mobile/src/main/res/drawable/ic_edit_color.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/colorPrimaryDark"
+        android:fillColor="@color/gold"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

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

 <?xml version="1.0" encoding="utf-8"?>
-<com.tubb.smrv.SwipeHorizontalMenuLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<com.tubb.smrv.SwipeHorizontalMenuLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sml="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipe_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    sml:sml_scroller_interpolator="@android:anim/bounce_interpolator"
-    sml:sml_auto_open_percent="0.2"
-    sml:sml_scroller_duration="250"
     android:paddingLeft="@dimen/padding"
+    android:paddingTop="@dimen/padding"
     android:paddingRight="@dimen/padding"
-    android:paddingTop="@dimen/padding">
+    sml:sml_auto_open_percent="0.2"
+    sml:sml_scroller_duration="250"
+    sml:sml_scroller_interpolator="@android:anim/bounce_interpolator">
 
     <LinearLayout
         android:id="@id/smMenuViewRight"
@@ -19,17 +18,6 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/btn_edit_delete"
-            android:layout_width="@dimen/item_menu_width"
-            android:layout_height="@dimen/item_menu_height"
-            android:layout_gravity="left|center_vertical"
-            android:background="@drawable/blue"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:gravity="center"
-            android:text="@string/edit"
-            android:textColor="@color/white"/>
-
         <TextView
             android:id="@+id/btn_delete"
             android:layout_width="@dimen/item_menu_width"
@@ -37,11 +25,12 @@
             android:layout_gravity="right|center_vertical"
             android:background="@drawable/red"
             android:gravity="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:text="@string/delete"
-            android:textColor="@color/white"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textColor="@color/white" />
 
     </LinearLayout>
+
     <LinearLayout
         android:id="@id/smContentView"
         android:layout_width="match_parent"
@@ -70,7 +59,15 @@
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
                     android:textColor="@color/brightgreen"
-                    tools:text="233正式服务器"/>
+                    tools:text="233正式服务器" />
+
+                <ImageView
+                    android:id="@+id/btn_edit_delete"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginRight="20dp"
+                    android:background="@drawable/ic_edit_color"
+                    android:gravity="right" />
 
             </LinearLayout>
 
@@ -93,7 +90,7 @@
                         android:gravity="center_vertical"
                         android:text="@string/server_ip"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                        android:textColor="@color/item_title"/>
+                        android:textColor="@color/item_title" />
 
                     <TextView
                         android:id="@+id/text_ip"
@@ -103,7 +100,7 @@
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         android:textColor="@color/holo_blue_bright"
-                        tools:text="127.0.0.1"/>
+                        tools:text="127.0.0.1" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -116,7 +113,7 @@
                         android:gravity="center_vertical"
                         android:text="@string/server_port"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                        android:textColor="@color/item_title"/>
+                        android:textColor="@color/item_title" />
 
                     <TextView
                         android:id="@+id/text_port"
@@ -127,7 +124,7 @@
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         android:textColor="@color/holo_blue_bright"
-                        tools:text="233"/>
+                        tools:text="233" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -144,7 +141,7 @@
                     android:gravity="center_vertical"
                     android:text="@string/server_user"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                    android:textColor="@color/item_title"/>
+                    android:textColor="@color/item_title" />
 
                 <TextView
                     android:id="@+id/text_player"
@@ -155,14 +152,14 @@
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     android:textColor="@color/holo_blue_bright"
-                    tools:text="player"/>
+                    tools:text="player" />
 
                 <ImageView
                     android:id="@+id/iv_fond"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginRight="20dp"
-                    android:gravity="center"/>
+                    android:gravity="center" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>