添加卡组点赞按钮布局

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

@@ -244,7 +244,6 @@ public class DeckSquareFragment extends Fragment {
         binding.btnClearDeckName.setOnClickListener(view -> binding.etDeckSquareInputDeckName.getText().clear());
         binding.btnClearContributorName.setOnClickListener(view -> binding.etInputContributorName.getText().clear());
         deckSquareListAdapter.setOnItemLongClickListener((adapter, view, position) -> {
-
             OnlineDeckDetail item = (OnlineDeckDetail) adapter.getItem(position);
 
             // Show the dialog
@@ -253,18 +252,15 @@ public class DeckSquareFragment extends Fragment {
             dialog.show();
             return true;
         });
-// Set click listener in your adapter
+        // Set click listener in your adapter
         deckSquareListAdapter.setOnItemClickListener((adapter, view, position) -> {
             OnlineDeckDetail item = (OnlineDeckDetail) adapter.getItem(position);
             //调用
             mDialogListener.onDismiss();
             DeckFile deckFile = new DeckFile(item.getDeckId(), DeckType.ServerType.SQUARE_DECK);
             onDeckMenuListener.onDeckSelect(deckFile);
-
-
         });
         return binding.getRoot();
-
     }
 
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {

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

@@ -99,16 +99,6 @@ public class DeckSquareMyDeckFragment extends Fragment {
             dialog.show();
             return true;
         });
-/*
-        //点击“我的卡组”中的某个卡组后，弹出dialog，dialog根据卡组的同步情况自动显示对应的下载/上传按钮
-        deckListAdapter.setOnItemClickListener(
-                (adapter, view, position) -> {
-                    MyDeckItem item = (MyDeckItem) adapter.getItem(position);
-                    mDialogListener.onDismiss();
-                    DeckFile deckFile = new DeckFile(item.getDeckId(), DeckType.ServerType.MY_SQUARE);
-                    onDeckMenuListener.onDeckSelect(deckFile);
-                }
-        );*/
         return binding.getRoot();
 
     }

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

@@ -9,6 +9,8 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.garymb.ygomobile.bean.DeckType;
+import cn.garymb.ygomobile.bean.events.DeckFile;
 import cn.garymb.ygomobile.deck_square.api_response.BasicResponse;
 import cn.garymb.ygomobile.deck_square.api_response.LoginToken;
 import cn.garymb.ygomobile.deck_square.api_response.MyDeckResponse;
@@ -172,6 +174,13 @@ public class MyDeckListAdapter extends BaseQuickAdapter<MyDeckItem, BaseViewHold
             }
             LogUtil.i(TAG, "current " + item.toString());
             changeDeckPublicState(item);
+        });
+        helper.getView(R.id.ll_download).setOnClickListener(view -> {
+            //点击“我的卡组”中的某个卡组后，弹出dialog，dialog根据卡组的同步情况自动显示对应的下载/上传按钮
+            DeckFile deckFile = new DeckFile(item.getDeckId(), DeckType.ServerType.MY_SQUARE);
+
+
+
         });
 //        else if (item.getDeckSouce() == 1) {
 //            helper.setText(R.id.my_deck_id, item.getDeckId());

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

@@ -22,7 +22,6 @@
                 android:layout_height="match_parent" />
 
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="70dp"
@@ -40,16 +39,44 @@
                     android:orientation="vertical"
                     android:padding="5dp">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:shadowColor="@color/black"
-                        android:shadowDx="1"
-                        android:shadowDy="1"
-                        android:shadowRadius="2"
-                        android:text="@string/deck_name"
-                        android:textColor="@color/holo_blue_light"
-                        android:textStyle="bold" />
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:shadowColor="@color/black"
+                            android:shadowDx="1"
+                            android:shadowDy="1"
+                            android:shadowRadius="2"
+                            android:text="@string/deck_name"
+                            android:textColor="@color/holo_blue_light"
+                            android:textStyle="bold" />
+
+                        <LinearLayout
+                            android:id="@+id/ll_click_like"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/button_radius_red"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_marginStart="5dp"
+                                android:src="@drawable/baseline_thumb_up_24"/>
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="5dp"
+                                android:textColor="@color/white"
+                                android:text="@string/like_deck_thumb"/>
+                        </LinearLayout>
+
+                    </LinearLayout>
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/tv_deck"
@@ -58,12 +85,14 @@
                         android:layout_marginTop="2dp"
                         android:background="@drawable/button_radius_black_transparents"
                         android:ellipsize="end"
+                        android:gravity="center|left"
                         android:maxLines="1"
+                        android:paddingStart="5dp"
+                        android:paddingEnd="5dp"
                         android:shadowColor="@color/black"
                         android:shadowDx="1"
                         android:shadowDy="1"
                         android:shadowRadius="2"
-                        android:gravity="center|left"
                         android:text="@string/select_deck"
                         android:textColor="@color/white"
                         android:textSize="18sp"

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

@@ -69,6 +69,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/ll_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

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

@@ -386,5 +386,6 @@
     <string name="sort_by_thumb">En el orden recomendado</string>
     <string name="account_warning">Por favor, complete su correo electrónico o nombre de usuario!</string>
     <string name="pwd_warning">Por favor, introduzca su contraseña!</string>
+    <string name="like_deck_thumb">Dar un me gusta al deck</string>
 </resources>
 

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

@@ -380,4 +380,5 @@
     <string name="sort_by_thumb">推薦順に</string>
     <string name="account_warning">メールアドレスまたはユーザー名を入力してください！</string>
     <string name="pwd_warning">パスワードを入力してください！</string>
+    <string name="like_deck_thumb">デッキに「いいね」をつける</string>
 </resources>

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

@@ -381,4 +381,5 @@
     <string name="sort_by_thumb">추천 순서대로</string>
     <string name="account_warning">이메일이나 사용자 이름을 입력해 주세요!</string>
     <string name="pwd_warning">비밀번호를 입력해 주세요!</string>
+    <string name="like_deck_thumb">데ッ크에 좋아요를 누르다</string>
 </resources>

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

@@ -370,5 +370,6 @@
     <string name="sort_by_thumb">Na ordem recomendada</string>
     <string name="account_warning">Por favor, preencha seu e - mail ou nome de usuário!</string>
     <string name="pwd_warning">Por favor, insira sua senha!</string>
+    <string name="like_deck_thumb">Curtir o deck</string>
 </resources>
 

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

@@ -385,4 +385,5 @@
     <string name="sort_by_thumb">按点赞顺序</string>
     <string name="account_warning">请填写你的邮箱或用户名！</string>
     <string name="pwd_warning">请填写你的密码！</string>
+    <string name="like_deck_thumb">为卡组点赞</string>
 </resources>

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

@@ -395,44 +395,6 @@
     <string name="second_fragment_label">Second Fragment</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
-
-    <string name="lorem_ipsum">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris
-        volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus
-        dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad
-        litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse blandit eleifend
-        diam, vel rutrum tellus vulputate quis. Aliquam eget libero aliquet, imperdiet nisl a,
-        ornare ex. Sed rhoncus est ut libero porta lobortis. Fusce in dictum tellus.\n\n
-        Suspendisse interdum ornare ante. Aliquam nec cursus lorem. Morbi id magna felis. Vivamus
-        egestas, est a condimentum egestas, turpis nisl iaculis ipsum, in dictum tellus dolor sed
-        neque. Morbi tellus erat, dapibus ut sem a, iaculis tincidunt dui. Interdum et malesuada
-        fames ac ante ipsum primis in faucibus. Curabitur et eros porttitor, ultricies urna vitae,
-        molestie nibh. Phasellus at commodo eros, non aliquet metus. Sed maximus nisl nec dolor
-        bibendum, vel congue leo egestas.\n\n
-        Sed interdum tortor nibh, in sagittis risus mollis quis. Curabitur mi odio, condimentum sit
-        amet auctor at, mollis non turpis. Nullam pretium libero vestibulum, finibus orci vel,
-        molestie quam. Fusce blandit tincidunt nulla, quis sollicitudin libero facilisis et. Integer
-        interdum nunc ligula, et fermentum metus hendrerit id. Vestibulum lectus felis, dictum at
-        lacinia sit amet, tristique id quam. Cras eu consequat dui. Suspendisse sodales nunc ligula,
-        in lobortis sem porta sed. Integer id ultrices magna, in luctus elit. Sed a pellentesque
-        est.\n\n
-        Aenean nunc velit, lacinia sed dolor sed, ultrices viverra nulla. Etiam a venenatis nibh.
-        Morbi laoreet, tortor sed facilisis varius, nibh orci rhoncus nulla, id elementum leo dui
-        non lorem. Nam mollis ipsum quis auctor varius. Quisque elementum eu libero sed commodo. In
-        eros nisl, imperdiet vel imperdiet et, scelerisque a mauris. Pellentesque varius ex nunc,
-        quis imperdiet eros placerat ac. Duis finibus orci et est auctor tincidunt. Sed non viverra
-        ipsum. Nunc quis augue egestas, cursus lorem at, molestie sem. Morbi a consectetur ipsum, a
-        placerat diam. Etiam vulputate dignissim convallis. Integer faucibus mauris sit amet finibus
-        convallis.\n\n
-        Phasellus in aliquet mi. Pellentesque habitant morbi tristique senectus et netus et
-        malesuada fames ac turpis egestas. In volutpat arcu ut felis sagittis, in finibus massa
-        gravida. Pellentesque id tellus orci. Integer dictum, lorem sed efficitur ullamcorper,
-        libero justo consectetur ipsum, in mollis nisl ex sed nisl. Donec maximus ullamcorper
-        sodales. Praesent bibendum rhoncus tellus nec feugiat. In a ornare nulla. Donec rhoncus
-        libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
-        vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
-    </string>
-
     <string name="down_complete">download complete</string>
     <string name="upload">upload</string>
     <string name="go_to">go to</string>
@@ -450,4 +412,5 @@
     <string name="sort_by_thumb">Sort by Thumb</string>
     <string name="account_warning">Please fill in your email or username!</string>
     <string name="pwd_warning">Please enter your password!</string>
+    <string name="like_deck_thumb">Like the deck</string>
 </resources>