diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchExploreAdapter.kt b/app/src/main/java/one/mixin/android/ui/search/SearchExploreAdapter.kt index c0e2173a6e..70eef25851 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchExploreAdapter.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchExploreAdapter.kt @@ -23,7 +23,9 @@ import one.mixin.android.vo.SearchBot import one.mixin.android.vo.market.Market import one.mixin.android.vo.safe.TokenItem -class SearchExploreAdapter : RecyclerView.Adapter(), StickyRecyclerHeadersAdapter { +class SearchExploreAdapter( + private val marketLimit: Boolean = true, +) : RecyclerView.Adapter(), StickyRecyclerHeadersAdapter { var onItemClickListener: SearchFragment.OnSearchClickListener? = null var query: String = "" set(value) { @@ -31,7 +33,7 @@ class SearchExploreAdapter : RecyclerView.Adapter(), St 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(), St @SuppressLint("NotifyDataSetChanged") fun clear() { - data = SearchExploreDataPackage() + data = SearchExploreDataPackage(marketLimit = marketLimit) notifyDataSetChanged() } @SuppressLint("NotifyDataSetChanged") fun setData(marketList: List?, dappList: List?, botList: List?, 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(), St else -> 0 } } - diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchExploreDataPackage.kt b/app/src/main/java/one/mixin/android/ui/search/SearchExploreDataPackage.kt index b383b0cf75..210ed9b9ad 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchExploreDataPackage.kt +++ b/app/src/main/java/one/mixin/android/ui/search/SearchExploreDataPackage.kt @@ -12,6 +12,7 @@ class SearchExploreDataPackage( var dappList: List? = null, var botList: List? = 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 diff --git a/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt b/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt index 9f9b2e3704..3d6fb6ae0b 100644 --- a/app/src/main/java/one/mixin/android/ui/search/SearchExploreFragment.kt +++ b/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() - 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) { diff --git a/app/src/main/res/layout/item_pin_logs.xml b/app/src/main/res/layout/item_pin_logs.xml index 8892b2d0c4..f18e821480 100644 --- a/app/src/main/res/layout/item_pin_logs.xml +++ b/app/src/main/res/layout/item_pin_logs.xml @@ -39,16 +39,16 @@ app:layout_constraintTop_toBottomOf="@id/log_desc"> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a38521e132..e477666e30 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2399,12 +2399,12 @@ 修改恢复联系人 导出助记词 修改手机号 - ✅ 桌面端已登录 - ✅ 通过手机号登录 - ✅ 通过助记词登录 - ✅ 通过恢复联系人登录 - ✅ 客户端已退出登录 - ✅ 桌面端已退出登录 + ✅ 已登录 + ✅ 已通过手机号登录 + ✅ 已通过助记词登录 + ✅ 已通过恢复联系人登录 + ✅ 已退出登录 + ✅ 已退出登录 ✅ 账号已升级 ❌ PIN 不正确 ✅ PIN 已设置 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32fee5b340..62ddf09439 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2469,12 +2469,12 @@ Change Recovery Contact Export Mnemonic Phrase Change Mobile Number - ✅ Signed in on desktop + ✅ Signed in ✅ Signed in via mobile number ✅ Signed in via mnemonic phrase ✅ Signed in via recovery contact - ✅ Signed out on mobile - ✅ Signed out on desktop + ✅ Signed out + ✅ Signed out ✅ Account upgraded ❌ PIN incorrect ✅ PIN set diff --git a/build.gradle b/build.gradle index 5d48a2720c..ddcdaa8c21 100644 --- a/build.gradle +++ b/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'