添加服务器作为serverlist的footerview

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/WebActivity.java

 package cn.garymb.ygomobile.ui.activities;
 
+import static android.view.View.VISIBLE;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -127,7 +129,7 @@ public class WebActivity extends BaseActivity {
     public static void open(Context context, String title, String url, boolean showButton) {
         open(context, title, url);
         if (showButton){
-            btn_download.setVisibility(View.VISIBLE);
+            btn_download.setVisibility(VISIBLE);
         }
 
     }

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -501,7 +502,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
         addMenuButton(mMenuIds, menu, R.id.action_game, R.string.action_game, R.drawable.start);
         addMenuButton(mMenuIds, menu, R.id.action_help, R.string.help, R.drawable.help);
 
-        addMenuButton(mMenuIds, menu, R.id.action_reset_game_res, R.string.reset_game_res, R.drawable.downloadimages);
+        addMenuButton(mMenuIds, menu, R.id.action_reset_game_res, R.string.reset_game_res, R.drawable.reset);
         addMenuButton(mMenuIds, menu, R.id.action_settings, R.string.settings, R.drawable.setting);
         addMenuButton(mMenuIds, menu, R.id.nav_webpage, R.string.donation, R.drawable.about);
 
@@ -696,6 +697,16 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     public void initServerlist() {
         mServerList = $(R.id.list_server);
         mServerListAdapter = new ServerListAdapter(this);
+        LayoutInflater infla = LayoutInflater.from(this);
+        View footView = infla.inflate(R.layout.item_ic_add, null);
+        TextView add_server = footView.findViewById(R.id.add_server);
+        add_server.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mServerListManager.addServer();
+            }
+        });
+        mServerListAdapter.addFooterView(footView);
         //server list
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
         mServerList.setLayoutManager(linearLayoutManager);

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

@@ -4,7 +4,11 @@ import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -284,17 +288,13 @@ public class SettingFragment extends PreferenceFragmentPlus {
             avatar1.setOnClickListener((v) -> {
                 //打开系统文件相册
                 String outFile = new File(mSettings.getCoreSkinPath(), Constants.CORE_SKIN_AVATAR_ME).getAbsolutePath();
-                showImageDialog(preference, getString(R.string.settings_game_avatar),
-                        outFile,
-                        true, CORE_SKIN_AVATAR_SIZE[0], CORE_SKIN_AVATAR_SIZE[1]);
+                showImageDialog(preference, getString(R.string.settings_game_avatar), outFile, true, CORE_SKIN_AVATAR_SIZE[0], CORE_SKIN_AVATAR_SIZE[1]);
                 dialog.dismiss();
             });
             avatar2.setOnClickListener((v) -> {
                 //打开系统文件相册
                 String outFile = new File(mSettings.getCoreSkinPath(), Constants.CORE_SKIN_AVATAR_OPPONENT).getAbsolutePath();
-                showImageDialog(preference, getString(R.string.settings_game_avatar),
-                        outFile,
-                        true, CORE_SKIN_AVATAR_SIZE[0], CORE_SKIN_AVATAR_SIZE[1]);
+                showImageDialog(preference, getString(R.string.settings_game_avatar), outFile, true, CORE_SKIN_AVATAR_SIZE[0], CORE_SKIN_AVATAR_SIZE[1]);
                 dialog.dismiss();
             });
         } else if (SETTINGS_COVER.equals(key)) {
@@ -467,26 +467,14 @@ public class SettingFragment extends PreferenceFragmentPlus {
 
     private void showImageDialog(Preference preference, String title, String outFile, boolean isJpeg, int outWidth, int outHeight) {
         int width = getResources().getDisplayMetrics().widthPixels;
-        //DialogPlus builder = new DialogPlus(getActivity());
         final ImageView imageView = new ImageView(getActivity());
         FrameLayout frameLayout = new FrameLayout(getActivity());
         imageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        //builder.setTitle(title);
         FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
         layoutParams.gravity = Gravity.CENTER_HORIZONTAL;
         frameLayout.addView(imageView, layoutParams);
-        // builder.setContentView(frameLayout);
-        //builder.setLeftButtonText(R.string.settings);
-        //builder.setLeftButtonListener((dlg, s) -> {
-        showImageCropChooser(preference, getString(R.string.dialog_select_image), outFile,
-                isJpeg, outWidth, outHeight);
-        //dlg.dismiss();
-        // });
-//        builder.setOnCancelListener((dlg) -> {
-//            BitmapUtil.destroy(imageView.getDrawable());
-//        });
-        //builder.show();
+        showImageCropChooser(preference, getString(R.string.dialog_select_image), outFile, isJpeg, outWidth, outHeight);
         File img = new File(outFile);
         if (img.exists()) {
             GlideCompat.with(this).load(img).signature(new MediaStoreSignature("image/*", img.lastModified(), 0))
@@ -495,7 +483,6 @@ public class SettingFragment extends PreferenceFragmentPlus {
                     .into(imageView);
         }
     }
-
     public void setImage(String outFile, int outWidth, int outHeight, ImageView imageView) {
         File img = new File(outFile);
         if (img.exists()) {

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center|top">
+
+    <TextView
+        android:id="@+id/add_server"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/addserver"
+        android:gravity="center"
+        android:text="@string/action_add_server"
+        android:textColor="@color/selector_text_color_white_gold"></TextView>
+</LinearLayout>
\ No newline at end of file