"contributor"

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareApiUtil.java

 package cn.garymb.ygomobile.deck_square;
 
+import android.util.Log;
 import android.widget.Toast;
 
 import com.google.gson.Gson;
@@ -78,7 +79,7 @@ public class DeckSquareApiUtil {
         paramMap.put("keyWord", condition.getKeyWord());
         paramMap.put("sortLike", condition.getSortLike());
         paramMap.put("sortRank", condition.getSortRank());
-        paramMap.put("contributer", condition.getContributer());
+        paramMap.put("contributor", condition.getContributor());
         Response response = OkhttpUtil.synchronousGet(url, paramMap, headers);
         String responseBodyString = response.body().string();
 

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareFragment.java

@@ -3,6 +3,7 @@ package cn.garymb.ygomobile.deck_square;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,7 +29,7 @@ public class DeckSquareFragment extends Fragment {
     private String keyWord;
     private Boolean sortLike;
     private Boolean sortRank;
-    private String contributer;
+    private String contributor;
 
     public DeckSquareFragment(YGODeckDialogUtil.OnDeckMenuListener onDeckMenuListener, YGODeckDialogUtil.OnDeckDialogListener mDialogListener) {
         this.onDeckMenuListener = onDeckMenuListener;
@@ -48,7 +49,7 @@ public class DeckSquareFragment extends Fragment {
         //查询卡组名称
         binding.etDeckSquareInputDeckName.setOnEditorActionListener((v, actionId, event) -> {
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-                Editable contributerName = binding.etInputContributerName.getText();
+                Editable contributerName = binding.etInputContributorName.getText();
                 if (contributerName != null) contributerName.clear();
                 keyWord = v.getText().toString();
                 binding.etGoToPage.setText("1");
@@ -98,30 +99,30 @@ public class DeckSquareFragment extends Fragment {
             }
         });
         //添加贡献者查询
-        binding.etInputContributerName.setOnEditorActionListener((v, actionId, event) -> {
+        binding.etInputContributorName.setOnEditorActionListener((v, actionId, event) -> {
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                 //清除卡组名称输入的内容
                 Editable deckName = binding.etDeckSquareInputDeckName.getText();
                 if (deckName != null) deckName.clear();
                 //获取输入内容
-                contributer = v.getText().toString();
+                contributor = v.getText().toString();
                 binding.etGoToPage.setText("1");
                 binding.etGoToPage.setEnabled(false);
 
-                deckSquareListAdapter.loadData(1, 1000, null, true, false, contributer);
+                deckSquareListAdapter.loadData(1, 1000, "", true, false, contributor);
                 binding.listDeckInfo.scrollToPosition(0);
                 return true;
             }
             return false;
         });
         // 添加文本变化监听器
-        binding.etInputContributerName.addTextChangedListener(new TextWatcher() {
+        binding.etInputContributorName.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                binding.btnClearContributerName.setVisibility(View.VISIBLE);
+                binding.btnClearContributorName.setVisibility(View.VISIBLE);
             }
 
             @Override
@@ -155,7 +156,7 @@ public class DeckSquareFragment extends Fragment {
         });
         //设置清空按钮点击清除输入内容
         binding.btnClearDeckName.setOnClickListener(view -> binding.etDeckSquareInputDeckName.getText().clear());
-        binding.btnClearContributerName.setOnClickListener(view -> binding.etInputContributerName.getText().clear());
+        binding.btnClearContributorName.setOnClickListener(view -> binding.etInputContributorName.getText().clear());
         // 设置页码跳转监听
         binding.etGoToPage.setOnEditorActionListener((v, actionId, event) -> {
             if (actionId == EditorInfo.IME_ACTION_DONE) {

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareListAdapter.java

@@ -33,10 +33,10 @@ public class DeckSquareListAdapter extends BaseQuickAdapter<OnlineDeckDetail, Ba
         loadData(1, 30, "", false, false, "");
     }
 
-    public void loadData(Integer page, Integer size, String keyWord, Boolean sortLike, Boolean sortRank, String contributer) {
+    public void loadData(Integer page, Integer size, String keyWord, Boolean sortLike, Boolean sortRank, String contributor) {
         final DialogPlus dialog_read_ex = DialogPlus.show(getContext(), null, getContext().getString(R.string.fetch_online_deck));
         VUiKit.defer().when(() -> {
-            SquareDeckResponse result = DeckSquareApiUtil.getSquareDecks(new GetSquareDeckCondition(page, size, keyWord, sortLike, sortRank, contributer));
+            SquareDeckResponse result = DeckSquareApiUtil.getSquareDecks(new GetSquareDeckCondition(page, size, keyWord, sortLike, sortRank, contributor));
             if (result == null) {
                 return null;
             } else {
@@ -54,11 +54,11 @@ public class DeckSquareListAdapter extends BaseQuickAdapter<OnlineDeckDetail, Ba
             }
             LogUtil.i(TAG, "Get square deck fail");
 
-        }).done((exCardDataList) -> {
-            if (exCardDataList != null) {
+        }).done((result) -> {
+            if (result != null) {
                 LogUtil.i(TAG, "Get square deck success");
                 getData().clear();
-                addData(exCardDataList);
+                addData(result);
                 notifyDataSetChanged();
             }
             if (dialog_read_ex.isShowing()) {

mobile/src/main/java/cn/garymb/ygomobile/deck_square/api_response/GetSquareDeckCondition.java

@@ -6,18 +6,18 @@ public class GetSquareDeckCondition {
     String keyWord;
     Boolean sortLike;
     Boolean sortRank;
-    String contributer;
+    String contributor;
 
     public GetSquareDeckCondition() {
     }
 
-    public GetSquareDeckCondition(Integer page, Integer size, String keyWord, Boolean sortLike, Boolean sortRank, String contributer) {
+    public GetSquareDeckCondition(Integer page, Integer size, String keyWord, Boolean sortLike, Boolean sortRank, String contributor) {
         this.page = page;
         this.size = size;
         this.keyWord = keyWord;
         this.sortLike = sortLike;
         this.sortRank = sortRank;
-        this.contributer = contributer;
+        this.contributor = contributor;
     }
 
     public Integer getPage() {
@@ -60,11 +60,11 @@ public class GetSquareDeckCondition {
         this.sortRank = sortRank;
     }
 
-    public String getContributer() {
-        return contributer;
+    public String getContributor() {
+        return contributor;
     }
 
-    public void setContributer(String contributer) {
-        this.contributer = contributer;
+    public void setContributor(String contributor) {
+        this.contributor = contributor;
     }
 }

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

@@ -63,7 +63,7 @@
             android:layout_weight="1">
 
             <EditText
-                android:id="@+id/et_input_contributer_name"
+                android:id="@+id/et_input_contributor_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -74,12 +74,12 @@
                 android:textColor="@color/holo_blue_bright"
                 android:textColorHint="@color/gray"
                 android:textSize="15sp"
-                app:layout_constraintEnd_toStartOf="@id/btn_clear_contributer_name"
+                app:layout_constraintEnd_toStartOf="@id/btn_clear_contributor_name"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <ImageButton
-                android:id="@+id/btn_clear_contributer_name"
+                android:id="@+id/btn_clear_contributor_name"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="5dp"