Skip to content

Issue 6025: NFT back press issue #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Issue 6025: NFT back press issue #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b05f224
Fix back functionality in NFT screen
protoshadowmaker Nov 4, 2025
190841d
Fix NFT y position in collapsed state
protoshadowmaker Nov 4, 2025
5926332
Add dev variant
protoshadowmaker Nov 4, 2025
235b6f6
Add dev variant
protoshadowmaker Nov 4, 2025
a089d6e
Fix NFT y position in collapsed state
protoshadowmaker Nov 5, 2025
ba5e859
Merge branch 'master' into improvements
protoshadowmaker Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ...ules/UIAssets/src/main/java/org/mytonwallet/app_air/uiassets/viewControllers/nft/NftVC.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ import org.mytonwallet.app_air.uicomponents.widgets.menu.WMenuPopup
import org.mytonwallet.app_air.uicomponents.widgets.setBackgroundColor
import org.mytonwallet.app_air.uisend.sendNft.SendNftVC
import org.mytonwallet.app_air.uisend.sendNft.sendNftConfirm.ConfirmNftVC
import org.mytonwallet.app_air.walletcontext.WalletContextManager
import org.mytonwallet.app_air.walletcontext.globalStorage.WGlobalStorage
import org.mytonwallet.app_air.walletbasecontext.localization.LocaleController
import org.mytonwallet.app_air.walletbasecontext.theme.ViewConstants
import org.mytonwallet.app_air.walletbasecontext.theme.WColor
import org.mytonwallet.app_air.walletbasecontext.theme.color
import org.mytonwallet.app_air.walletcontext.WalletContextManager
import org.mytonwallet.app_air.walletcontext.globalStorage.WGlobalStorage
import org.mytonwallet.app_air.walletcontext.utils.AnimUtils.Companion.lerp
import org.mytonwallet.app_air.walletcontext.utils.VerticalImageSpan
import org.mytonwallet.app_air.walletcore.WalletCore
Expand Down Expand Up @@ -529,6 +529,10 @@ class NftVC(
super.scrollToTop()
if (wasTracking || !headerView.targetIsCollapsed)
return
performScrollToTop()
}

private fun performScrollToTop() {
recyclerView.smoothScrollBy(
0,
headerView.collapsedOffset - recyclerView.computeVerticalScrollOffset(),
Expand Down Expand Up @@ -769,6 +773,14 @@ class NftVC(
}
}

override fun onBackPressed(): Boolean {
if (!headerView.targetIsCollapsed) {
performScrollToTop()
return false
}
return super.onBackPressed()
}

override fun onPreviewTapped() {
val image = nft.image ?: return
touchHandler.stopScroll()
Expand Down
4 changes: 3 additions & 1 deletion ...s/src/main/java/org/mytonwallet/app_air/uiassets/viewControllers/nft/views/ScrollState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ sealed class ScrollState() {
}
override val avatarTranslationY: Float
get() {
return lerp(headerView.topExtraPadding.toFloat(), (-17f).dp, percent)
return with(headerView) {
lerp(topExtraPadding.toFloat(), topExtraPadding - 105f.dp, percent)
}
}
override val avatarScale: Float
get() {
Expand Down
2 changes: 1 addition & 1 deletion ...es/UIComponents/src/main/java/org/mytonwallet/app_air/uicomponents/base/WNavigationBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class WNavigationBar(
private val backButton: WImageButton by lazy {
WImageButton(context).apply {
setOnClickListener {
navigationController.pop()
navigationController.onBackPressed()
}
visibility = if (navigationController.isBackAllowed()) VISIBLE else GONE
val arrowDrawable =
Expand Down
3 changes: 3 additions & 0 deletions mobile/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
// signingConfig signingConfigs.debug
}
debug {
applicationIdSuffix ".dev"
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions mobile/android/app/src/debug/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">DevMTW</string>
<string name="title_activity_main">DevMTW</string>
</resources>
2 changes: 0 additions & 2 deletions mobile/android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">MyTonWallet</string>
<string name="title_activity_main">MyTonWallet</string>
<string name="package_name">org.mytonwallet.app</string>
<string name="custom_url_scheme_0">ton</string>
<string name="custom_url_scheme_1">tc</string>
Expand Down
5 changes: 5 additions & 0 deletions mobile/android/app/src/release/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">MyTonWallet</string>
<string name="title_activity_main">MyTonWallet</string>
</resources>