Fix/market search expand

app/src/main/java/one/mixin/android/ui/search/SearchExploreAdapter.kt

@@ -23,15 +23,17 @@ import one.mixin.android.vo.SearchBot
 import one.mixin.android.vo.market.Market
 import one.mixin.android.vo.safe.TokenItem
 
-class SearchExploreAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), StickyRecyclerHeadersAdapter<HeaderHolder> {
+class SearchExploreAdapter(
+    private val marketLimit: Boolean = true,
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), StickyRecyclerHeadersAdapter<HeaderHolder> {
     var onItemClickListener: SearchFragment.OnSearchClickListener? = null
     var query: String = ""
         set(value) {
             field = value
             data.showTip = shouldTips()
         }
 
-    private var data = SearchExploreDataPackage()
+    private var data = SearchExploreDataPackage(marketLimit = marketLimit)
 
     override fun getHeaderId(position: Int): Long =
         if (position == 0 && data.showTip) {
@@ -56,13 +58,13 @@ class SearchExploreAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), St
 
     @SuppressLint("NotifyDataSetChanged")
     fun clear() {
-        data = SearchExploreDataPackage()
+        data = SearchExploreDataPackage(marketLimit = marketLimit)
         notifyDataSetChanged()
     }
 
     @SuppressLint("NotifyDataSetChanged")
     fun setData(marketList: List<Market>?, dappList: List<Dapp>?, botList: List<SearchBot>?, url: String?) {
-        data = SearchExploreDataPackage(assetList = null, marketList = marketList, dappList = dappList, botList = botList, url = url)
+        data = SearchExploreDataPackage(assetList = null, marketList = marketList, dappList = dappList, botList = botList, url = url, marketLimit = marketLimit)
         data.showTip = shouldTips()
         notifyDataSetChanged()
     }
@@ -145,4 +147,3 @@ class SearchExploreAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), St
             else -> 0
         }
 }
-

app/src/main/java/one/mixin/android/ui/search/SearchExploreDataPackage.kt

@@ -12,6 +12,7 @@ class SearchExploreDataPackage(
     var dappList: List<Dapp>? = null,
     var botList: List<SearchBot>? = null,
     var url: String? = null,
+    private val marketLimit: Boolean = true,
 ) {
     companion object {
         const val LIMIT_COUNT = 3
@@ -20,7 +21,6 @@ class SearchExploreDataPackage(
     var showTip = false
 
     private var assetLimit = true
-    private var marketLimit = true
     private var botLimit = true
     private var dappLimit = true
 

app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt

@@ -57,10 +57,6 @@ import kotlinx.coroutines.withContext
 class SearchExploreFragment : BaseFragment(R.layout.fragment_search_explore) {
     private val searchViewModel by viewModels<SearchViewModel>()
 
-    private val searchAdapter: SearchExploreAdapter by lazy {
-        SearchExploreAdapter()
-    }
-
     companion object {
         const val TAG = "SearchExploreFragment"
         const val SEARCH_DEBOUNCE = 300L
@@ -79,6 +75,10 @@ class SearchExploreFragment : BaseFragment(R.layout.fragment_search_explore) {
         arguments?.getBoolean(ARG_HIDE_RECENT, false) ?: false
     }
 
+    private val searchAdapter: SearchExploreAdapter by lazy {
+        SearchExploreAdapter(marketLimit = !hideRecent)
+    }
+
     private var keyword: String? = null
         set(value) {
             if (field != value) {

app/src/main/res/layout/item_pin_logs.xml

@@ -39,16 +39,16 @@
         app:layout_constraintTop_toBottomOf="@id/log_desc">
 
         <TextView
-            android:id="@+id/log_address"
+            android:id="@+id/ip_location"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="6dp"
             android:textColor="?attr/text_remarks" />
 
         <TextView
-            android:id="@+id/ip_location"
+            android:id="@+id/log_address"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
             android:textColor="?attr/text_remarks" />
     </LinearLayout>
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -2399,12 +2399,12 @@
     <string name="pin_log_title_change_recovery_contact">修改恢复联系人</string>
     <string name="pin_log_title_export_mnemonic_phrase">导出助记词</string>
     <string name="pin_log_title_change_mobile_number">修改手机号</string>
-    <string name="pin_log_subtitle_signed_in_on_desktop">✅ 桌面端已登录</string>
-    <string name="pin_log_subtitle_signed_in_via_mobile_number">✅ 通过手机号登录</string>
-    <string name="pin_log_subtitle_signed_in_via_mnemonic_phrase">✅ 通过助记词登录</string>
-    <string name="pin_log_subtitle_signed_in_via_recovery_contact">✅ 通过恢复联系人登录</string>
-    <string name="pin_log_subtitle_signed_out_on_mobile">✅ 客户端已退出登录</string>
-    <string name="pin_log_subtitle_signed_out_on_desktop">✅ 桌面端已退出登录</string>
+    <string name="pin_log_subtitle_signed_in_on_desktop">✅ 已登录</string>
+    <string name="pin_log_subtitle_signed_in_via_mobile_number">✅ 已通过手机号登录</string>
+    <string name="pin_log_subtitle_signed_in_via_mnemonic_phrase">✅ 已通过助记词登录</string>
+    <string name="pin_log_subtitle_signed_in_via_recovery_contact">✅ 已通过恢复联系人登录</string>
+    <string name="pin_log_subtitle_signed_out_on_mobile">✅ 已退出登录</string>
+    <string name="pin_log_subtitle_signed_out_on_desktop">✅ 已退出登录</string>
     <string name="pin_log_subtitle_account_upgraded">✅ 账号已升级</string>
     <string name="pin_log_subtitle_pin_incorrect">❌ PIN 不正确</string>
     <string name="pin_log_subtitle_pin_set">✅ PIN 已设置</string>

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

@@ -2469,12 +2469,12 @@
     <string name="pin_log_title_change_recovery_contact">Change Recovery Contact</string>
     <string name="pin_log_title_export_mnemonic_phrase">Export Mnemonic Phrase</string>
     <string name="pin_log_title_change_mobile_number">Change Mobile Number</string>
-    <string name="pin_log_subtitle_signed_in_on_desktop">✅ Signed in on desktop</string>
+    <string name="pin_log_subtitle_signed_in_on_desktop">✅ Signed in</string>
     <string name="pin_log_subtitle_signed_in_via_mobile_number">✅ Signed in via mobile number</string>
     <string name="pin_log_subtitle_signed_in_via_mnemonic_phrase">✅ Signed in via mnemonic phrase</string>
     <string name="pin_log_subtitle_signed_in_via_recovery_contact">✅ Signed in via recovery contact</string>
-    <string name="pin_log_subtitle_signed_out_on_mobile">✅ Signed out on mobile</string>
-    <string name="pin_log_subtitle_signed_out_on_desktop">✅ Signed out on desktop</string>
+    <string name="pin_log_subtitle_signed_out_on_mobile">✅ Signed out</string>
+    <string name="pin_log_subtitle_signed_out_on_desktop">✅ Signed out</string>
     <string name="pin_log_subtitle_account_upgraded">✅ Account upgraded</string>
     <string name="pin_log_subtitle_pin_incorrect">❌ PIN incorrect</string>
     <string name="pin_log_subtitle_pin_set">✅ PIN set</string>

build.gradle

@@ -119,7 +119,7 @@ buildscript {
         ext.playPayVersion = '16.5.0'
         ext.datastoreVersion = '1.2.1'
         ext.protobufVersion = '3.11.0'
-        ext.appsFlyerVersion ='6.17.3'
+        ext.appsFlyerVersion ='6.18.0'
         ext.installreferrerVersion ='2.2'
         ext.billingVersion ='8.3.0'