优化在线备份的分类显示和查看

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/DeckSquareMyDeckFragment.java

@@ -8,7 +8,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -205,7 +204,9 @@ public class DeckSquareMyDeckFragment extends Fragment {
             }
             return 0;
         }).fail((e) -> {
-            YGOUtil.showTextToast("Sync decks failed: " + e);
-        }).done((result) -> {});
+            LogUtil.e(TAG, "Sync decks failed: " + e);
+        }).done((result) -> {
+            YGOUtil.showTextToast(R.string.done);
+        });
     }
 }

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck_square/MyDeckListAdapter.java

@@ -157,7 +157,8 @@ public class MyDeckListAdapter extends BaseQuickAdapter<MyOnlineDeckDetail, Base
 
     @Override
     protected void convert(BaseViewHolder helper, MyOnlineDeckDetail item) {
-        helper.setText(R.id.my_deck_name, item.getDeckType().equals("") ? item.getDeckName() : "-"+item.getDeckType()+ "-\n" + item.getDeckName());
+        helper.setText(R.id.my_online_deck_type,item.getDeckType().equals("") ? "" : "-"+item.getDeckType()+"-");
+        helper.setText(R.id.my_deck_name, item.getDeckName());
         helper.setText(R.id.deck_update_date, convertToGMTDate(item.getDeckUpdateDate()));
         ImageView cardImage = helper.getView(R.id.deck_info_image);
         long code = item.getDeckCoverCard1();
@@ -193,12 +194,13 @@ public class MyDeckListAdapter extends BaseQuickAdapter<MyOnlineDeckDetail, Base
             LogUtil.i(TAG, "current " + item.toString());
             changeDeckPublicState(item);
         });
-        helper.getView(R.id.ll_download).setOnClickListener(view -> {
+        helper.getView(R.id.ll_download).setOnLongClickListener(view -> {
             //TODO
             //点击“我的卡组”中的某个卡组后，弹出dialog，dialog根据卡组的同步情况自动显示对应的下载/上传按钮
             DeckFile deckFile = new DeckFile(item.getDeckId(), DeckType.ServerType.MY_SQUARE);
             mDialogListener.onDismiss();
             onDeckMenuListener.onDeckSelect(deckFile);
+            return true;
         });
 
     }

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

@@ -22,8 +22,8 @@
         android:id="@+id/ll_switch_show"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
         android:layout_gravity="start"
+        android:layout_margin="5dp"
         android:background="@drawable/button_radius_n"
         android:orientation="horizontal">
 
@@ -61,45 +61,33 @@
         android:src="@drawable/ic_add_white" />
 
     <LinearLayout
-        android:id="@+id/btn_download"
+        android:id="@+id/ll_download"
         android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="18dp"
         android:layout_marginTop="15dp"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/ll_download"
+        <TextView
+            android:id="@+id/my_online_deck_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginLeft="1dp"
             android:layout_marginTop="75dp"
-            android:background="@drawable/button_radius_red"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="10dp"
-                android:layout_height="10dp"
-                android:layout_marginLeft="5dp"
-                android:src="@drawable/ic_file_download_black_24dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="1dp"
-                android:layout_marginRight="5dp"
-                android:lines="1"
-                android:text="@string/pre_view"
-                android:textSize="5sp" />
-        </LinearLayout>
+            android:layout_marginRight="1dp"
+            android:lines="1"
+            android:text="@string/category_name"
+            android:textSize="5sp" />
 
         <TextView
             android:id="@+id/my_deck_name"
             android:layout_width="57dp"
-            android:layout_height="18dp"
+            android:layout_height="19dp"
             android:layout_gravity="center"
+            android:layout_marginLeft="1dp"
             android:gravity="center"
+            android:ellipsize="end"
             android:text="deck_name"
             android:textColor="@color/white"
             android:textSize="7sp" />
@@ -110,6 +98,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
+            android:layout_marginTop="1dp"
             android:lines="1"
             android:text="1900-02-03"
             android:textSize="6sp" />