From 5f6ec236bfa6315d61da6a55d3c04c126eed3ae3 Mon Sep 17 00:00:00 2001 From: Shihaam Abdul Rahman Date: Wed, 3 Jun 2026 04:10:05 +0500 Subject: [PATCH] redsign wheel page (reorgnatize wheel) --- .../basedbank/ui/home/CircularNavFragment.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/sh/sar/basedbank/ui/home/CircularNavFragment.kt b/app/src/main/java/sh/sar/basedbank/ui/home/CircularNavFragment.kt index 960e294..9981451 100644 --- a/app/src/main/java/sh/sar/basedbank/ui/home/CircularNavFragment.kt +++ b/app/src/main/java/sh/sar/basedbank/ui/home/CircularNavFragment.kt @@ -55,12 +55,12 @@ class CircularNavFragment : Fragment() { CircularWheelView.WheelItem(def.id, def.iconRes, ctx.getString(def.titleRes)) } items = listOf( - CircularWheelView.WheelItem(R.id.nav_dashboard, R.drawable.ic_nav_dashboard, ctx.getString(R.string.nav_dashboard)), - savedSlots[0], // 2 o'clock - savedSlots[1], // 4 o'clock - CircularWheelView.WheelItem(R.id.nav_more, R.drawable.ic_nav_more, ctx.getString(R.string.nav_more)), - savedSlots[2], // 8 o'clock - savedSlots[3], // 10 o'clock + savedSlots[3], // 4 o'clock (strip slot 3) + CircularWheelView.WheelItem(R.id.nav_dashboard, R.drawable.ic_nav_dashboard, ctx.getString(R.string.nav_dashboard)), // 6 o'clock + CircularWheelView.WheelItem(R.id.nav_more, R.drawable.ic_nav_more, ctx.getString(R.string.nav_more)), // 8 o'clock + savedSlots[0], // 10 o'clock (strip slot 0 — first in strip) + savedSlots[1], // 12 o'clock (strip slot 1) + savedSlots[2], // 2 o'clock (strip slot 2) ) accentColor = colorPrimary surfaceColor = colorSurface @@ -264,7 +264,7 @@ class CircularWheelView @JvmOverloads constructor( // Divider lines between segments dividerPaint.color = (labelColor and 0x00FFFFFF) or (100 shl 24) for (i in 0 until segCount) { - val rad = Math.toRadians((-90.0 + i * segDeg)) + val rad = Math.toRadians((i * segDeg).toDouble()) val cos = cos(rad).toFloat() val sin = sin(rad).toFloat() canvas.drawLine( @@ -276,7 +276,7 @@ class CircularWheelView @JvmOverloads constructor( // Segment content for (i in 0 until segCount) { - val midDeg = -90f + i * segDeg + segDeg / 2f + val midDeg = i * segDeg + segDeg / 2f drawSegment(canvas, i, midDeg) } @@ -419,7 +419,7 @@ class CircularWheelView @JvmOverloads constructor( private fun segmentAt(x: Float, y: Float): Int { var a = angleAt(x, y) - wheelAngle - a = ((a + 90f) % 360f + 360f) % 360f + a = (a % 360f + 360f) % 360f return (a / (360f / items.size)).toInt() % items.size }