diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 2b93e5da78..408b8cefdc 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -97,7 +97,7 @@ navi-alfred = "2.1.0" navi-elex = "1.9.1" navi-guarddog = "3.12.0" navi-pulse = "1.14.0" -navi-uitron = "2.6.0" +navi-uitron = "2.7.0" navigation = "2.8.5" okhttp-bom = "4.12.0" otaliastudios-cameraview = "2.7.2" diff --git a/android/navi-coin/src/main/java/com/navi/coin/ui/compose/common/ScratchCardListRenderer.kt b/android/navi-coin/src/main/java/com/navi/coin/ui/compose/common/ScratchCardListRenderer.kt index 1534dfcc97..68a72c22ae 100644 --- a/android/navi-coin/src/main/java/com/navi/coin/ui/compose/common/ScratchCardListRenderer.kt +++ b/android/navi-coin/src/main/java/com/navi/coin/ui/compose/common/ScratchCardListRenderer.kt @@ -470,7 +470,7 @@ fun ScratchCardLockedOrExpired( .background(Color_F9F9F9) .setScratchCardMargin(firstElement) .aspectRatio(1f) - .clip(RoundedCornerShape(8.dp)) + .clip(RoundedCornerShape(5.dp)) .clickable( interactionSource = NoRippleIndicationSource(), indication = null, @@ -554,7 +554,7 @@ fun ScratchCardScratched( .setScratchCardMargin(firstElement) .aspectRatio(1f) .size(156.dp) - .background(color = Color.White, shape = RoundedCornerShape(8.dp)) + .background(color = Color.White, shape = RoundedCornerShape(5.dp)) .clickable( interactionSource = NoRippleIndicationSource(), indication = null, @@ -565,7 +565,7 @@ fun ScratchCardScratched( renderBottomSheet = renderBottomSheet ) } - .border(width = 1.dp, color = borderAlt, shape = RoundedCornerShape(8.dp)) + .border(width = 1.dp, color = borderAlt, shape = RoundedCornerShape(5.dp)) ) { metadata?.get(SCRATCHED_SCRATCH_CARD_URL_KEY)?.let { AsyncImage( diff --git a/android/navi-common/src/main/res/raw/holiday_celebration_confetti.lottie b/android/navi-common/src/main/res/raw/holiday_celebration_confetti.lottie index 226feb5002..c590eb3664 100644 Binary files a/android/navi-common/src/main/res/raw/holiday_celebration_confetti.lottie and b/android/navi-common/src/main/res/raw/holiday_celebration_confetti.lottie differ 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 28504532b8..46fc7b01a2 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 @@ -1808,7 +1808,7 @@ object NaviWidgetIconUtils { 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 - HOLIDAY_SCRATCH_CARD_IMAGE -> R.drawable.holiday_scratch_card_image + HOLIDAY_SCRATCH_CARD_IMAGE -> R.drawable.ic_christmas_sc else -> -1 } } diff --git a/android/navi-widgets/src/main/res/drawable/holiday_scratch_card_image.png b/android/navi-widgets/src/main/res/drawable/holiday_scratch_card_image.png deleted file mode 100644 index 9552f0b255..0000000000 Binary files a/android/navi-widgets/src/main/res/drawable/holiday_scratch_card_image.png and /dev/null differ diff --git a/android/navi-widgets/src/main/res/drawable/ic_christmas_sc.xml b/android/navi-widgets/src/main/res/drawable/ic_christmas_sc.xml new file mode 100644 index 0000000000..ea31b4a555 --- /dev/null +++ b/android/navi-widgets/src/main/res/drawable/ic_christmas_sc.xml @@ -0,0 +1,1703 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +