添加卡查搜索结果计数

简化卡查布局
放大加入收藏按钮

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java

@@ -7,6 +7,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -56,15 +58,18 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
     private DuelAssistantManagement duelAssistantManagement;
     private CardDetail mCardDetail;
     private DialogPlus mDialog;
+    private Button btn_search;
+    private TextView mResult_count;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search);
+        mResult_count = findViewById(R.id.search_result_count);
         duelAssistantManagement = DuelAssistantManagement.getInstance();
         intentSearchMessage = getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
-        Toolbar toolbar = $(R.id.toolbar);
-        setSupportActionBar(toolbar);
+//        Toolbar toolbar = $(R.id.toolbar);
+//        setSupportActionBar(toolbar);
         enableBackHome();
         mDrawerlayout = $(R.id.drawer_layout);
         mImageLoader = ImageLoader.get(this);
@@ -73,7 +78,11 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
         mCardListAdapater.setItemBg(true);
         mListView.setLayoutManager(new FastScrollLinearLayoutManager(this));
         mListView.setAdapter(mCardListAdapater);
-//
+        btn_search = $(R.id.btn_search);
+        btn_search.setOnClickListener((v) -> {
+            showSearch(true);
+        });
+/*
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, mDrawerlayout, toolbar, R.string.search_open, R.string.search_close);
         toggle.setDrawerIndicatorEnabled(false);
@@ -82,7 +91,7 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
             onBack();
         });
         toggle.syncState();
-        //
+        */
         mCardLoader = new CardLoader(this);
         mCardLoader.setCallBack(this);
         mCardSelector = new CardSearcher($(R.id.nav_view_list), mCardLoader);
@@ -194,6 +203,7 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
     public void onSearchResult(List<Card> cardInfos, boolean isHide) {
 //        Log.d("kk", "find " + (cardInfos == null ? -1 : cardInfos.size()));
         mCardListAdapater.set(cardInfos);
+        mResult_count.setText(String.valueOf(cardInfos.size()));
         mCardListAdapater.notifyDataSetChanged();
         if (cardInfos != null && cardInfos.size() > 0) {
             mListView.smoothScrollToPosition(0);

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

@@ -187,7 +187,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="10dp"
                     android:background="@drawable/radius"
-                    android:gravity="right"
+                    android:gravity="center_horizontal"
                     android:text="0"
                     android:textColor="@color/gold"
                     android:textStyle="bold" />

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

@@ -12,13 +12,13 @@
         tools:openDrawer="right">
 
 
-        <LinearLayout
+        <FrameLayout
             android:id="@+id/layout_main"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <include layout="@layout/content_toolbar" />
+            <!--include layout="@layout/content_toolbar" /-->
 
             <com.tubb.smrv.SwipeMenuRecyclerView
                 android:id="@+id/list_cards"
@@ -28,8 +28,37 @@
                 android:dividerHeight="4dp"
                 android:padding="5dp"
                 android:scrollbars="none" />
+
+            <LinearLayout
+                android:layout_width="60dp"
+                android:layout_height="100dp"
+                android:layout_gravity="bottom|right"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="60dp"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/btn_search"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="10dp"
+                    android:background="@drawable/search"
+                    android:gravity="center" />
+
+                <TextView
+                    android:id="@+id/search_result_count"
+                    android:layout_width="60dp"
+                    android:layout_height="30dp"
+                    android:background="@drawable/radius"
+                    android:gravity="center_horizontal"
+                    android:text="0"
+                    android:textColor="@color/gold"
+                    android:textStyle="bold" />
             </LinearLayout>
 
+        </FrameLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -129,8 +129,8 @@
 
             <ImageView
             android:id="@+id/image_fav"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_gravity="bottom|right"
             android:paddingRight="5dp"
             android:scaleType="center"