diff --git a/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradeFragment.kt b/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradeFragment.kt index d60aae6b9c..d8e5da2626 100644 --- a/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradeFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/home/web3/trade/TradeFragment.kt @@ -1437,12 +1437,8 @@ class TradeFragment : BaseFragment() { updateMixinDialog = alertDialogBuilder() .setTitle(R.string.Update_Mixin) - .setMessage( - getString( - R.string.update_mixin_description, - requireContext().packageManager.getPackageInfo(requireContext().packageName, 0).versionName, - ), - ).setNegativeButton(R.string.Later) { dialog, _ -> + .setMessage(R.string.mixin_version_expired_description) + .setNegativeButton(R.string.Later) { dialog, _ -> dialog.dismiss() activity?.onBackPressedDispatcher?.onBackPressed() }.setPositiveButton(R.string.Update) { dialog, _ -> diff --git a/app/src/main/java/one/mixin/android/ui/landing/OldVersionFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/OldVersionFragment.kt index e2cf3e56a3..9676be70c1 100644 --- a/app/src/main/java/one/mixin/android/ui/landing/OldVersionFragment.kt +++ b/app/src/main/java/one/mixin/android/ui/landing/OldVersionFragment.kt @@ -3,8 +3,10 @@ package one.mixin.android.ui.landing import android.os.Bundle import android.view.View import dagger.hilt.android.AndroidEntryPoint +import one.mixin.android.BuildConfig import one.mixin.android.R import one.mixin.android.databinding.FragmentOldVersionBinding +import one.mixin.android.extension.openCustomerService import one.mixin.android.extension.openMarket import one.mixin.android.ui.common.BaseFragment import one.mixin.android.util.viewBinding @@ -25,11 +27,16 @@ class OldVersionFragment : BaseFragment(R.layout.fragment_old_version) { ) { super.onViewCreated(view, savedInstanceState) binding.apply { - desTv.text = - getString(R.string.update_mixin_description, requireContext().packageManager.getPackageInfo(requireContext().packageName, 0).versionName) updateTv.setOnClickListener { requireContext().openMarket() } + supportIb.setOnClickListener { + openCustomerService() + } + contactSupport.setOnClickListener { + openCustomerService() + } + version.text = getString(R.string.about_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) } } } diff --git a/app/src/main/res/layout/fragment_old_version.xml b/app/src/main/res/layout/fragment_old_version.xml index 6337ca6cea..62264d6f46 100644 --- a/app/src/main/res/layout/fragment_old_version.xml +++ b/app/src/main/res/layout/fragment_old_version.xml @@ -1,57 +1,96 @@ - - + - + - + + + + + + + + + +