Feature/trade guide by SeniorZhai · Pull Request #6227 · MixinNetwork/android-app

SeniorZhai · 2026-03-17T03:17:25Z

No description provided.

SeniorZhai · 2026-03-17T06:19:53Z

@claude[agent]

Target files

./app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt
./app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt

1. Candle zoom behavior

Default zoom must be 1x.
Minimum zoom must be 1x (do not allow zooming out below default).
Maximum zoom must be 3x.
Zoom must affect only candle body width (single candle width), not spacing.
Two-finger pinch must feel responsive.
During two-finger pinch, do not trigger single-finger move/drag/selection behaviors.

2. Delayed candle detail on press (`down`)

On pointer down, do not show candle detail immediately.
Add a small delay before showing detail (about 100-150ms).
If user releases, moves, scrolls, or starts pinch during that delay, cancel showing detail.
When detail is shown, display:
- Open
- High
- Low
- Close
- Volume

3. Header layout above CandleChart

Header must keep a fixed total height across states.

Default state

Must render exactly as:

Title
Price + ICON on the far right (48dp)
Change

Candle-detail state

Must render exactly as:

Title + ICON on the far right (20dp)
Open High Low Close Volume

Additional layout constraints:

Price/Change must be hidden in candle-detail state.
Icon size transition can be animated, but must not change parent container height.
Icon container must not overlap/crop OHLCV content.

4. Keep existing behavior intact

Keep existing loading/error/empty states.
Keep existing candle drawing behavior.
Keep existing timeframe switch behavior.
Keep existing fiat conversion behavior for right-axis/price labels (do not regress).

Claude · 2026-03-17T06:19:59Z

@SeniorZhai I've opened a new pull request, #6228, to work on those changes. Once the pull request is ready, I'll request review from you.

…t pricing Add pinch zoom to candle chart

Copilot

Pull request overview

This PR adds new wallet onboarding/marketing UI (import/watch guidance + free-transfer promo) and introduces a Spot Trading Guide bottom sheet, alongside some related UI behavior tweaks (wallet tabs ordering, candle chart gestures).

Changes:

Add new localized strings/URLs and assets for wallet import/watch guidance and free-transfer promo.
Extend wallet UI to show empty-state guide cards for Import/Watch categories and add a dismissible “free transfers” card in the add-wallet bottom sheet.
Add Spot Trading Guide (Compose) and update Trade page/fragment plumbing to open the correct guide per tab; enhance candle chart with pinch/pan scaling.

Reviewed changes

Copilot reviewed 15 out of 23 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
app/src/main/res/values/strings.xml	Adds new English strings/URLs for wallet import/watch guides and trade guide copy; updates free-transfer campaign URL.
app/src/main/res/values-zh-rCN/strings.xml	Adds new Simplified Chinese counterparts; updates free-transfer campaign URL.
app/src/main/res/layout/fragment_add_wallet_bottom_sheet.xml	Makes add-wallet sheet scrollable and adds promo + “safe to import” content block.
app/src/main/res/drawable/ic_import_wallet.xml	Adds import-wallet vector icon.
app/src/main/res/drawable/ic_dot_assist.xml	Adds themed dot drawable used for bullet points.
app/src/main/res/drawable/ic_add_watch_wallet.xml	Adds watch-wallet vector icon.
app/src/main/res/drawable/ic_add_wallet_freee.xml	Adds promo icon used in add-wallet sheet.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_0.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_1.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_2.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_3.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_4.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_5.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_6.png	Adds import-safety preview image asset.
app/src/main/res/drawable-xxhdpi/mixin_import_safety_preview_7.png	Adds import-safety preview image asset (currently unused in the shown layout).
app/src/main/java/one/mixin/android/ui/wallet/components/WalletCategoryFilter.kt	Reorders the Safe tab placement in the category filter.
app/src/main/java/one/mixin/android/ui/wallet/components/AssetDashboardScreen.kt	Adds empty-state guide cards and refactors wallet filtering; introduces dynamic resource lookup helpers.
app/src/main/java/one/mixin/android/ui/wallet/AddWalletBottomSheetDialogFragment.kt	Adds promo-card dismissal persistence and click handling to open campaign docs.
app/src/main/java/one/mixin/android/ui/home/web3/trade/TradePage.kt	Changes trading-guide callback to include tab index and routes guide launches accordingly.
app/src/main/java/one/mixin/android/ui/home/web3/trade/TradeFragment.kt	Launches Spot vs Perpetual guide bottom sheets based on current tab/wallet context.
app/src/main/java/one/mixin/android/ui/home/web3/trade/SpotTradeGuidePage.kt	New Compose UI for Spot trade guide with tabs and interactive examples.
app/src/main/java/one/mixin/android/ui/home/web3/trade/SpotTradeGuideBottomSheetDialogFragment.kt	New full-height compose bottom sheet container for the Spot trade guide.
app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt	Adds transform gestures + scaling support to the candle chart.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-24T06:04:19Z

+private fun Context.stringByName(name: String): String {
+    val resourceId = resources.getIdentifier(name, "string", packageName)
+    return if (resourceId != 0) getString(resourceId) else ""
+}
+
+private fun Context.drawableByName(name: String): Int? {
+    return resources.getIdentifier(name, "drawable", packageName)
+        .takeIf { it != 0 }
+}


stringByName()/drawableByName() rely on Resources.getIdentifier, which is invisible to Android's resource shrinker. Since shrinkResources true is enabled (app/build.gradle:154), these strings/drawables can be removed in release builds, causing empty text / missing icons at runtime. Prefer referencing resources via R.string.* / R.drawable.* (or add an explicit keep rule for these resources if dynamic lookup is truly required).

Copilot · 2026-03-24T06:04:20Z

@@ -253,7 +311,7 @@ private fun ScrollableCandleChart(
                            }
                        )
                    }
-                    .horizontalScroll(scrollState, enabled = !isTouching)
+                    .horizontalScroll(scrollState, enabled = !isTouching && !isPinching)
                    .clipToBounds()


isPinching is set to true inside detectTransformGestures, but it is never reset to false. After the first pan/zoom gesture, the long-press crosshair (pointerInput below) and horizontalScroll remain disabled permanently (enabled = !isTouching && !isPinching). Reset the flag when the transform gesture ends/cancels (or switch to transformable and use its in-progress state) so other interactions keep working.

Copilot · 2026-03-24T06:04:20Z

+                <HorizontalScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:fillViewport="true"
+                    android:scrollbars="none">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:orientation="horizontal">


This HorizontalScrollView won't scroll as intended because its direct child FrameLayout is layout_width="match_parent". That constrains the inner LinearLayout and prevents it from becoming wider than the viewport. Use a wrap_content direct child (or make the FrameLayout wrap_content) so the preview images can overflow horizontally and actually scroll.

Copilot · 2026-03-24T06:04:20Z

+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="36dp"
+                    android:src="@drawable/ic_add_wallet_freee"


The drawable name ic_add_wallet_freee looks like a typo (extra 'e'), which makes the resource harder to discover/maintain and inconsistent with other ic_* names. Consider renaming to ic_add_wallet_free (and updating references) before this name spreads further.

Suggested change

android:src="@drawable/ic_add_wallet_freee"

android:src="@drawable/ic_add_wallet_free"

Copilot · 2026-03-24T06:04:20Z

+                "1 USDT ≈ ${inverted.numberFormat8()} BTC"
+            } else {
+                "1 BTC ≈ ${marketPrice.priceFormat()} USDT"


This file hard-codes several user-visible strings (e.g. "->" and "1 BTC ≈ … USDT" / "1 USDT ≈ … BTC"). These won't be translated and will ignore locale-specific formatting rules. Please move these to string resources with placeholders and use stringResource(...) (and consider formatting numbers via locale-aware APIs where appropriate).

Suggested change

"1 USDT ≈ ${inverted.numberFormat8()} BTC"

} else {

"1 BTC ≈ ${marketPrice.priceFormat()} USDT"

stringResource(

id = R.string.spot_trade_price_1_usdt_approx_btc,

inverted.numberFormat8(),

)

} else {

stringResource(

id = R.string.spot_trade_price_1_btc_approx_usdt,

marketPrice.priceFormat(),

)

Copilot · 2026-03-24T06:04:21Z

+    val usdtPrice = usdtToken?.priceUsd?.toBigDecimalOrNull()?.takeIf { it > BigDecimal.ZERO } ?: BigDecimal.ONE
+    val btcPrice = btcToken?.priceUsd?.toBigDecimalOrNull()?.takeIf { it > BigDecimal.ZERO } ?: BigDecimal("95594.89")


calculateMarketPrice() falls back to a hard-coded BTC price ("95594.89") when price data is missing. This value will quickly become stale and can mislead users in the guide if pricing fetch fails. Prefer showing a placeholder/disabled state until prices load, or derive a neutral fallback (e.g., BigDecimal.ZERO/ONE) and render accordingly.

Suggested change

val usdtPrice = usdtToken?.priceUsd?.toBigDecimalOrNull()?.takeIf { it > BigDecimal.ZERO } ?: BigDecimal.ONE

val btcPrice = btcToken?.priceUsd?.toBigDecimalOrNull()?.takeIf { it > BigDecimal.ZERO } ?: BigDecimal("95594.89")

val usdtPrice = usdtToken.safePrice()

val btcPrice = btcToken.safePrice()

Copilot · 2026-03-24T06:04:21Z

+            bindOptionalView("free_transfer_card") {
+                openFreeTransferDoc()
+            }
+            bindOptionalView("free_transfer_learn_more") {
+                openFreeTransferDoc()
+            }
        }
    }
-}

+    private fun bindOptionalView(
+        idName: String,
+        onClick: () -> Unit,
+    ) {
+        val id = binding.root.resources.getIdentifier(idName, "id", requireContext().packageName)
+        if (id == 0) return
+        binding.root.findViewById<View>(id)?.setOnClickListener { onClick() }
+    }


bindOptionalView() uses resources.getIdentifier + findViewById to attach click listeners to views that already exist in this binding (freeTransferCard, freeTransferLearnMore). This adds indirection and makes refactors (renaming IDs) easier to break silently. Prefer using the generated binding properties directly, or switch to binding.root.findViewById(R.id.free_transfer_learn_more) if you truly need optional lookup.

- Add explicit elevation=0.dp to all Button that didn't have it - Create MixinButton reusable component in MaterialButton.kt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

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

Copilot

Pull request overview

Copilot reviewed 23 out of 31 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-26T04:52:28Z

+    val importWalletTitle = context.stringByName("import_wallet_title")
+    val importWalletDescription = context.stringByName("import_wallet_empty_description")
+    val importWalletGuideUrl = context.stringByName("import_wallet_guide_url")
+    val watchWalletDescription = context.stringByName("watch_wallet_empty_description")
+    val watchWalletGuideUrl = context.stringByName("watch_wallet_guide_url")
+    val importWalletIconRes = context.drawableByName("ic_import_wallet")
+    val watchWalletIconRes = context.drawableByName("ic_add_watch_wallet")


stringByName("import_wallet_title" / "import_wallet_empty_description" / "import_wallet_guide_url" / "watch_wallet_empty_description" / "watch_wallet_guide_url") currently resolves to an empty string because these string resources don’t exist in the project, so the empty-state guide cards will render blank text and attempt to open an empty URL. Please add the missing string resources (all locales) and reference them via stringResource(...) (or at least fail fast when getIdentifier returns 0) so this can’t silently ship with empty content.

Copilot · 2026-03-26T04:52:29Z

+    <string name="Trading_Guide">Spot Trading Guide</string>
    <string name="Overview">Overview</string>


Trading_Guide is used as the label in HelpBottomSheetContent (shown from both spot and perpetual contexts). Changing it to “Spot Trading Guide” will make the help option misleading when the current page is perpetual. Consider keeping Trading_Guide generic (e.g. “Trading Guide”) and introducing a separate spot-specific title string for the spot guide page, or make the help sheet title depend on the current tab.

Copilot · 2026-03-26T04:52:29Z

    <string name="wallet_summary_tip_all">Safe 金库、观察钱包和隐藏的资产不计入统计</string>
    <string name="wallet_summary_tip_safe">共管的 Safe 金库不计入统计</string>
-    <string name="Trading_Guide">交易说明</string>
+    <string name="Trading_Guide">现货交易指南</string>


Trading_Guide is also used as the help-sheet option title from both spot and perpetual contexts. Translating it specifically as “现货交易指南” will be misleading when the current page is perpetual. Please keep Trading_Guide as a generic “交易指南/交易说明” equivalent and add a separate spot-specific string for the spot guide title if needed.

Suggested change

<string name="Trading_Guide">现货交易指南</string>

<string name="Trading_Guide">交易指南</string>

<string name="Spot_Trading_Guide">现货交易指南</string>

Copilot · 2026-03-26T04:52:29Z

+private fun StepperButton(
+    text: String,
+    enabled: Boolean,
+    onClick: () -> Unit,
+) {
+    Surface(
+        color = if (enabled) Color.Transparent else MixinAppTheme.colors.backgroundWindow,
+        shape = CircleShape,
+        border = BorderStroke(1.dp, MixinAppTheme.colors.borderColor),
+        modifier = Modifier
+            .size(24.dp)
+            .clickable(enabled = enabled, onClick = onClick),
+    ) {
+        Box(contentAlignment = Alignment.Center) {
+            Text(
+                text = text,
+                fontSize = 14.sp,
+                color = if (enabled) MixinAppTheme.colors.textPrimary else MixinAppTheme.colors.textAssist,
+            )
+        }
+    }
+}
+
+@Composable


StepperButton is defined but never used in this file, so it will generate an unused-function warning and adds maintenance overhead. Please remove it or wire it into the UI (e.g., use it in AmountStepper / OrderPriceStepper) so the source of truth for stepper styling isn’t duplicated.

Suggested change

private fun StepperButton(

text: String,

enabled: Boolean,

onClick: () -> Unit,

) {

Surface(

color = if (enabled) Color.Transparent else MixinAppTheme.colors.backgroundWindow,

shape = CircleShape,

border = BorderStroke(1.dp, MixinAppTheme.colors.borderColor),

modifier = Modifier

.size(24.dp)

.clickable(enabled = enabled, onClick = onClick),

) {

Box(contentAlignment = Alignment.Center) {

Text(

text = text,

fontSize = 14.sp,

color = if (enabled) MixinAppTheme.colors.textPrimary else MixinAppTheme.colors.textAssist,

)

}

}

}

@Composable

Copilot · 2026-03-26T04:52:30Z

+                "1 USDT ≈ ${inverted.numberFormat8()} BTC"
+            } else {
+                "1 BTC ≈ ${marketPrice.priceFormat()} USDT"


PriceSubtitle builds user-visible text with hardcoded English strings (e.g. "1 USDT ≈ ... BTC" / "1 BTC ≈ ... USDT"). This bypasses localization and makes translation impossible for non-English locales. Please move these to strings.xml with proper formatting arguments and use stringResource(...) here.

Suggested change

"1 USDT ≈ ${inverted.numberFormat8()} BTC"

} else {

"1 BTC ≈ ${marketPrice.priceFormat()} USDT"

stringResource(

id = R.string.spot_trade_price_subtitle_usdt_btc,

inverted.numberFormat8(),

)

} else {

stringResource(

id = R.string.spot_trade_price_subtitle_btc_usdt,

marketPrice.priceFormat(),

)

This reverts commit 4b8d482.

SeniorZhai added the testing Now testing, but you can review label Mar 17, 2026

SeniorZhai force-pushed the feature/trde_guide branch from 9ecee6a to 9fd9840 Compare March 17, 2026 03:19

Claude AI mentioned this pull request Mar 17, 2026

feat(trade): candle chart zoom, delayed selection, and fixed header layout #6228

Closed

SeniorZhai force-pushed the feature/trde_guide branch from b2c2d44 to 7c413f4 Compare March 17, 2026 07:12

SeniorZhai force-pushed the feature/trading_perpetual branch from 2b12cc2 to e08b485 Compare March 17, 2026 07:41

SeniorZhai force-pushed the feature/trde_guide branch 5 times, most recently from bc7b411 to 88c81a4 Compare March 24, 2026 04:14

Base automatically changed from feature/trading_perpetual to master March 24, 2026 04:56

SeniorZhai added 2 commits March 24, 2026 13:52

Trade spot guide, refine wallet onboarding guides and spot trade limi…

8dd1d36

…t pricing Add pinch zoom to candle chart

Add pinch zoom to candle chart

26c5b84

SeniorZhai force-pushed the feature/trde_guide branch from 88c81a4 to 26c5b84 Compare March 24, 2026 05:58

SeniorZhai removed the testing Now testing, but you can review label Mar 24, 2026

SeniorZhai requested a review from Copilot March 24, 2026 05:58

SeniorZhai marked this pull request as ready for review March 24, 2026 05:58

Copilot started reviewing on behalf of SeniorZhai March 24, 2026 05:58 View session

Copilot AI reviewed Mar 24, 2026

View reviewed changes

SeniorZhai and others added 9 commits March 24, 2026 15:20

Update guide style

adb780b

Add elevation to Button and create MixinButton component

a68ed60

- Add explicit elevation=0.dp to all Button that didn't have it - Create MixinButton reusable component in MaterialButton.kt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

refactor: reuse mixin compose button

e625f6a

style: drop explicit normal button weights

4d59c47

fix: exclude zero-volume perps markets

262d179

fix: convert perps market change to percentage correctly

b1bc4fb

fix: use upsert to preserve rowid in perps tables

e3a451e

refactor: unify perps market change percent calculation and formatting

38d5ef5

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge branch 'fix/button-elevation' into feature/trde_guide

2a46fa8

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

SeniorZhai added 2 commits March 26, 2026 11:59

fix candle chart drag after zoom

b1013b9

adjust candle chart price precision

add5726

SeniorZhai force-pushed the feature/trde_guide branch from 7679ea7 to add5726 Compare March 26, 2026 04:10

SeniorZhai and others added 2 commits March 26, 2026 12:21

update guide navigation buttons

ef32d61

Merge branch 'master' into feature/trde_guide

d842b0c

crossle requested a review from Copilot March 26, 2026 04:47

Copilot started reviewing on behalf of crossle March 26, 2026 04:48 View session

Copilot AI reviewed Mar 26, 2026

View reviewed changes

SeniorZhai added 5 commits March 26, 2026 12:53

adjust spot guide example amounts

7f4ab6e

Update position card

450a1d3

fix web header icon for fixed title

587961c

Update spot button

14f9cf5

Update font weight

9543956

SeniorZhai force-pushed the feature/trde_guide branch from e9db566 to 9543956 Compare March 26, 2026 06:34

SeniorZhai and others added 3 commits March 26, 2026 15:22

Update title

e3f9c97

show trading guides once per category

10c55d4

Merge branch 'master' into feature/trde_guide

239a409

crossle changed the title ~~Feature/trde guide~~ Feature/trade guide Mar 26, 2026

SeniorZhai and others added 10 commits March 26, 2026 17:41

Update padding

3ff0d8b

fix button padding

4b8d482

Revert "fix button padding"

732a88e

This reverts commit 4b8d482.

Update padding

351a264

customize trade guide menu titles

513285a

Update padding

8e8d54a

Update horizontal arrangement

e645a70

Update horizontal arrangement

6c2b72b

fix help menu text

fd544da

fix typo

83f5712

crossle merged commit 713959b into master Mar 26, 2026
3 checks passed

crossle deleted the feature/trde_guide branch March 26, 2026 11:03

	android:src="@drawable/ic_add_wallet_freee"
	android:src="@drawable/ic_add_wallet_free"

-                "1 USDT ≈ ${inverted.numberFormat8()} BTC"
-            } else {
-                "1 BTC ≈ ${marketPrice.priceFormat()} USDT"
+                stringResource(
+                    id = R.string.spot_trade_price_1_usdt_approx_btc,
+                    inverted.numberFormat8(),
+                )
+            } else {
+                stringResource(
+                    id = R.string.spot_trade_price_1_btc_approx_usdt,
+                    marketPrice.priceFormat(),
+                )

		val usdtPrice = usdtToken?.priceUsd?.toBigDecimalOrNull()?.takeIf { it > BigDecimal.ZERO } ?: BigDecimal.ONE
		val btcPrice = btcToken?.priceUsd?.toBigDecimalOrNull()?.takeIf { it > BigDecimal.ZERO } ?: BigDecimal("95594.89")

		<string name="Trading_Guide">Spot Trading Guide</string>
		<string name="Overview">Overview</string>

	<string name="Trading_Guide">现货交易指南</string>
	<string name="Trading_Guide">交易指南</string>
	<string name="Spot_Trading_Guide">现货交易指南</string>

Uh oh!

Conversation

SeniorZhai commented Mar 17, 2026

Uh oh!

SeniorZhai commented Mar 17, 2026

Target files

1. Candle zoom behavior

2. Delayed candle detail on press (down)

3. Header layout above CandleChart

Default state

Candle-detail state

4. Keep existing behavior intact

Uh oh!

Claude AI commented Mar 17, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

2. Delayed candle detail on press (`down`)