diff --git a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt index a8a5e9ef82..72f5f64836 100644 --- a/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt +++ b/android/app/src/main/java/com/naviapp/appsettings/ui/bottomSheets/NotificationSettingsBottomSheetContent.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ButtonDefaults import androidx.compose.runtime.Composable @@ -27,6 +26,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.navi.elex.atoms.ElexImage import com.navi.elex.atoms.ElexText import com.navi.elex.font.FontWeightEnum import com.navi.elex.molecules.ElexButtonWithText @@ -56,11 +56,11 @@ fun NotificationSettingBottomSheetContent(onDismiss: () -> Unit, onClick: () -> horizontalArrangement = Arrangement.Start, verticalAlignment = Alignment.Top ) { - Row( - modifier = Modifier.size(40.dp).background(Color(0xFFF5F5F5), shape = CircleShape), - horizontalArrangement = Arrangement.Start, - verticalAlignment = Alignment.CenterVertically - ) {} + ElexImage( + iconCode = com.navi.naviwidgets.R.drawable.navi_icon, + contentDescription = "Navi Logo", + modifier = Modifier.size(40.dp) + ) Column( modifier = Modifier.wrapContentSize().padding(8.dp, 0.dp, 0.dp, 0.dp), diff --git a/android/app/src/main/java/com/naviapp/home/compose/profile/ProfileAppUpdateNudgeWidget.kt b/android/app/src/main/java/com/naviapp/home/compose/profile/ProfileAppUpdateNudgeWidget.kt index 43cf61bbcf..12fbe7b175 100644 --- a/android/app/src/main/java/com/naviapp/home/compose/profile/ProfileAppUpdateNudgeWidget.kt +++ b/android/app/src/main/java/com/naviapp/home/compose/profile/ProfileAppUpdateNudgeWidget.kt @@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -46,6 +47,7 @@ fun ProfileAppUpdateWidget( appUpdateAnalytics: NaviAnalytics.InAppUpdate = NaviAnalytics.naviAnalytics.InAppUpdate(PROFILE_SCREEN) ) { + LaunchedEffect(Unit) { appUpdateAnalytics.appUpdateNudgeViewEvent() } Row( horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 7d1650a196..2339c8056a 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -525,7 +525,7 @@ To enable seamless payments to connections Allow notifications App notifications - To enable notification\n\nPhone settings > Apps > Navi > Permissions > notifications + To enable notification\n\nPhone settings > Apps > Navi > Permissions > Notifications Unable to load Something went wrong Please try again later diff --git a/android/navi-common/src/main/java/com/navi/common/utils/CommonNaviAnalytics.kt b/android/navi-common/src/main/java/com/navi/common/utils/CommonNaviAnalytics.kt index 1b1b5c0e06..53bd8567bd 100644 --- a/android/navi-common/src/main/java/com/navi/common/utils/CommonNaviAnalytics.kt +++ b/android/navi-common/src/main/java/com/navi/common/utils/CommonNaviAnalytics.kt @@ -1077,56 +1077,56 @@ class CommonNaviAnalytics private constructor() { inner class NotifyMe(val screenName: String? = null) { fun notifyMeNudgeViewEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_view_event", + eventName = "naviapp_notify_me_nudge_view_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgeClickEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_click_event", + eventName = "naviapp_notify_me_nudge_click_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgeDismissEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_dismiss_event", + eventName = "naviapp_notify_me_nudge_dismiss_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgePermissionPromptShownEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_permission_prompt_shown_event", + eventName = "naviapp_notify_me_nudge_permission_prompt_shown_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgePermissionGrantedEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_permission_granted_event", + eventName = "naviapp_notify_me_nudge_permission_granted_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgeOpenSettingsBottomSheetLandEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_open_settings_bottomsheet_land_event", + eventName = "naviapp_notify_me_nudge_open_settings_bottomsheet_land_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgeOpenSettingsBottomSheetClickEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_open_settings_bottomsheet_click_event", + eventName = "naviapp_notify_me_nudge_open_settings_bottomsheet_click_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } fun notifyMeNudgeOpenSettingsBottomSheetDismissEvent() { NaviTrackEvent.trackEvent( - eventName = "notify_me_nudge_open_settings_bottomsheet_dismiss_event", + eventName = "naviapp_notify_me_nudge_open_settings_bottomsheet_dismiss_event", eventValues = mapOf(Pair("screen_name", screenName.orEmpty())) ) } diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt index a491aca549..e1deda60b5 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/utils/NaviWidgetIconUtils.kt @@ -876,6 +876,7 @@ object NaviWidgetIconUtils { private const val OFFER_ICON_WHITE = "OFFER_ICON_WHITE" private const val OFFER_ICON_PURPLE_WITH_BORDER = "OFFER_ICON_PURPLE_WITH_BORDER" private const val BBPS_CATEGORY_ICON_PLACEHOLDER = "BBPS_CATEGORY_ICON_PLACEHOLDER" + private const val NAVI_ICON = "NAVI_ICON" fun updateIcon( imageDetail: ImageDetail, @@ -1783,6 +1784,7 @@ object NaviWidgetIconUtils { OFFER_ICON_WHITE -> R.drawable.ic_offer_white OFFER_ICON_PURPLE -> R.drawable.ic_offer_purple OFFER_ICON_PURPLE_WITH_BORDER -> R.drawable.ic_offer_purple_with_border + NAVI_ICON -> R.drawable.navi_icon else -> -1 } } diff --git a/android/navi-widgets/src/main/res/drawable/navi_icon.xml b/android/navi-widgets/src/main/res/drawable/navi_icon.xml new file mode 100644 index 0000000000..733871cc18 --- /dev/null +++ b/android/navi-widgets/src/main/res/drawable/navi_icon.xml @@ -0,0 +1,15 @@ + + + + +