From c1dcaab0b0b8c9138738d14b889c15bebb975bed Mon Sep 17 00:00:00 2001 From: Sayed Owais Ali Date: Tue, 28 Nov 2023 22:32:25 +0530 Subject: [PATCH] Hotfix touchpoint scale factor (#61) --- navi-alfred/build.gradle | 2 +- .../src/main/java/com/navi/alfred/AlfredConfig.kt | 4 +--- .../java/com/navi/alfred/utils/ScreenShotUtils.kt | 4 ---- .../java/com/navi/alfred/utils/UserBehaviourUtils.kt | 12 ++++++------ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/navi-alfred/build.gradle b/navi-alfred/build.gradle index 85dd805..2f6789b 100644 --- a/navi-alfred/build.gradle +++ b/navi-alfred/build.gradle @@ -6,7 +6,7 @@ plugins { id 'kotlin-parcelize' } -def VERSION_NAME = "1.0.11" +def VERSION_NAME = "1.0.12" android { namespace 'com.navi.alfred' diff --git a/navi-alfred/src/main/java/com/navi/alfred/AlfredConfig.kt b/navi-alfred/src/main/java/com/navi/alfred/AlfredConfig.kt index b2f58fd..92bd864 100644 --- a/navi-alfred/src/main/java/com/navi/alfred/AlfredConfig.kt +++ b/navi-alfred/src/main/java/com/navi/alfred/AlfredConfig.kt @@ -62,9 +62,7 @@ data class AlfredConfig( internal var memoryUsageBeforeEventStart: Float? = null, internal var storageUsageBeforeEventStart: Float? = null, internal var batteryPercentageBeforeEventStart: Float? = null, - internal var cruiseAttributes: CruiseAttributes = CruiseAttributes(), - internal var xScaleFactor: Float? = null, - internal var yScaleFactor: Float? = null + internal var cruiseAttributes: CruiseAttributes = CruiseAttributes() ) { constructor(appName: String, appVersionCode: String, appVersionName: String, flavor: String, apiKey: String) : this( appVersionCode = appVersionCode, diff --git a/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt b/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt index 70742ce..900dcc6 100644 --- a/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt +++ b/navi-alfred/src/main/java/com/navi/alfred/utils/ScreenShotUtils.kt @@ -103,10 +103,6 @@ internal fun insertScreenShotPathInDb( } } bitmap?.compress(Bitmap.CompressFormat.JPEG, videoQuality, fos) - if (AlfredManager.config.xScaleFactor == null || AlfredManager.config.yScaleFactor == null) { - AlfredManager.config.xScaleFactor = bitmap?.width?.toFloat()?.div(Resources.getSystem().displayMetrics.widthPixels) - AlfredManager.config.yScaleFactor = bitmap?.height?.toFloat()?.div(Resources.getSystem().displayMetrics.heightPixels) - } fos.flush() fos.close() if (bottomSheetFlow == false) { diff --git a/navi-alfred/src/main/java/com/navi/alfred/utils/UserBehaviourUtils.kt b/navi-alfred/src/main/java/com/navi/alfred/utils/UserBehaviourUtils.kt index 37966c9..1da0ea9 100644 --- a/navi-alfred/src/main/java/com/navi/alfred/utils/UserBehaviourUtils.kt +++ b/navi-alfred/src/main/java/com/navi/alfred/utils/UserBehaviourUtils.kt @@ -32,14 +32,14 @@ internal fun getTouchEvent( (difference(currentTouchEvent?.rawX, previousTouchEvent?.rawX) && difference(currentTouchEvent?.rawY, previousTouchEvent?.rawY)) ) { - properties[AlfredConstants.START_X] = min(previousTouchEvent?.pointerPositionX ?: 0f, screenWidth.toFloat()).times(AlfredManager.config.xScaleFactor ?: 0.5f).toString() - properties[AlfredConstants.START_Y] = min(previousTouchEvent?.pointerPositionY ?: 0f, screenHeight.toFloat()).times(AlfredManager.config.yScaleFactor ?: 0.5f).toString() + properties[AlfredConstants.START_X] = min(previousTouchEvent?.pointerPositionX ?: 0f, screenWidth.toFloat()).times(0.5f).toString() + properties[AlfredConstants.START_Y] = min(previousTouchEvent?.pointerPositionY ?: 0f, screenHeight.toFloat()).times(0.5f).toString() AlfredConstants.TOUCH_EVENT } else { - properties[AlfredConstants.START_X] = min(previousTouchEvent?.pointerPositionX ?: 0f, screenWidth.toFloat()).times(AlfredManager.config.xScaleFactor ?: 0.5f).toString() - properties[AlfredConstants.START_Y] = min(previousTouchEvent?.pointerPositionY ?: 0f, screenHeight.toFloat()).times(AlfredManager.config.yScaleFactor ?: 0.5f).toString() - properties[AlfredConstants.END_X] = min(currentTouchEvent?.getX(pointerIndex) ?: 0f, screenWidth.toFloat()).times(AlfredManager.config.xScaleFactor ?: 0.5f).toString() - properties[AlfredConstants.END_Y] = min(currentTouchEvent?.getY(pointerIndex) ?: 0f, screenHeight.toFloat()).times(AlfredManager.config.yScaleFactor ?: 0.5f).toString() + properties[AlfredConstants.START_X] = min(previousTouchEvent?.pointerPositionX ?: 0f, screenWidth.toFloat()).times(0.5f).toString() + properties[AlfredConstants.START_Y] = min(previousTouchEvent?.pointerPositionY ?: 0f, screenHeight.toFloat()).times(0.5f).toString() + properties[AlfredConstants.END_X] = min(currentTouchEvent?.getX(pointerIndex) ?: 0f, screenWidth.toFloat()).times(0.5f).toString() + properties[AlfredConstants.END_Y] = min(currentTouchEvent?.getY(pointerIndex) ?: 0f, screenHeight.toFloat()).times(0.5f).toString() AlfredConstants.SCROLL_EVENT } return Pair(eventName, properties)