varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix R8 Transitive Dependencies

Browse Source
This commit is contained in:
Shivam Goyal
2023-09-22 02:57:51 +05:30
parent 6a0db1dcb1
commit 4715c44ac9
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
navi-hl/src/main/java/com/navi/homeloan/common/customview/ConsentDetailView.kt
View File

@@ -13,7 +13,6 @@ import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.databinding.DataBindingUtil
import com.navi.design.R as designR
import com.navi.homeloan.R
import com.navi.homeloan.databinding.HlViewConsentDetailBinding
import com.navi.naviwidgets.extensions.setCornerRadius
@@ -54,10 +53,10 @@ class ConsentDetailView(context: Context, attrs: AttributeSet?) : ConstraintLayo
fun setExpanded(isExpanded: Boolean) {
if (isExpanded) {
binding.detailsWrapper.visibility = View.VISIBLE
binding.arrowIv.setImageResource(designR.drawable.ic_arrow_rise)
binding.arrowIv.setImageResource(R.drawable.ic_arrow_rise)
} else {
binding.detailsWrapper.visibility = View.GONE
binding.arrowIv.setImageResource(designR.drawable.arrow_down)
binding.arrowIv.setImageResource(R.drawable.arrow_down)
}
this.isExpanded = isExpanded
}

26
navi-hl/src/main/java/com/navi/homeloan/common/utils/HLIconUtils.kt
View File

@@ -10,9 +10,7 @@ package com.navi.homeloan.common.utils
import android.widget.ImageView
import androidx.annotation.Keep
import com.bumptech.glide.Glide
import com.navi.design.R as designR
import com.navi.homeloan.R
import com.navi.naviwidgets.R as widgetR
@Keep
object HLIconUtils {
@@ -57,23 +55,23 @@ object HLIconUtils {
ICON_ARROW_CROSS_BLUE -> R.drawable.ic_hl_blue_cross_svg
ICON_RED_BORDER_ALERT -> R.drawable.ic_hl_red_border_alert_svg
ICON_BLUE_BORDER_ALERT -> R.drawable.ic_hl_blue_border_alert_svg
ICON_SMALL_YELLOW_BULB -> widgetR.drawable.ic_small_yellow_bulb_svg
ICON_INFO_SIMPLE -> widgetR.drawable.ic_info_icon_svg
OUTLINED_INFO_ICON_BLACK -> designR.drawable.ic_info_icon_black
ICON_SMALL_YELLOW_BULB -> R.drawable.ic_small_yellow_bulb_svg
ICON_INFO_SIMPLE -> R.drawable.ic_info_icon_svg
OUTLINED_INFO_ICON_BLACK -> R.drawable.ic_info_icon_black
ICON_HL_SMALL_RED_WHITE_BG_RIGHT_ARROW ->
widgetR.drawable.ic_hl_small_circle_right_arrow_white_bg_svg
INVALID_CITY_ICON -> widgetR.drawable.ic_city_error
R.drawable.ic_hl_small_circle_right_arrow_white_bg_svg
INVALID_CITY_ICON -> R.drawable.ic_city_error
ICON_LARGE_PURPLE_ALERT_WITH_DOG -> R.drawable.ic_hl_large_purple_alert_with_dog_svg
ICON_HL_GREY_LOCK -> R.drawable.ic_hl_grey_lock_svg
ICON_HL_HELP_FAQ -> widgetR.drawable.ic_hl_help_faq_svg
ICON_HL_HELP_CHAT -> widgetR.drawable.ic_hl_help_chat_svg
ICON_HL_HELP_EMAIL -> widgetR.drawable.ic_hl_help_email_svg
ICON_HL_HELP_CALL -> widgetR.drawable.ic_hl_help_call
ICON_RED_BORDER_DOWNLOAD -> widgetR.drawable.ic_red_border_download_svg
ICON_HL_RED_TICK_SMALL -> widgetR.drawable.ic_red_tick_small
ICON_HL_HELP_FAQ -> R.drawable.ic_hl_help_faq_svg
ICON_HL_HELP_CHAT -> R.drawable.ic_hl_help_chat_svg
ICON_HL_HELP_EMAIL -> R.drawable.ic_hl_help_email_svg
ICON_HL_HELP_CALL -> R.drawable.ic_hl_help_call
ICON_RED_BORDER_DOWNLOAD -> R.drawable.ic_red_border_download_svg
ICON_HL_RED_TICK_SMALL -> R.drawable.ic_red_tick_small
ICON_ARROW_DOWN_RED -> R.drawable.ic_hl_arrow_down_red
ICON_GREY_DARK_INFO -> R.drawable.ic_hl_grey_dark_info_12
ICON_HL_INFO_FILLED_SIMPLE -> widgetR.drawable.ic_info_dark
ICON_HL_INFO_FILLED_SIMPLE -> R.drawable.ic_info_dark
ICON_HL_ERROR_INFO_RED -> R.drawable.ic_hl_error_info_red
OUTLINED_INFO_ICON_BLACK_LARGE -> R.drawable.ic_hl_info_icon_black_32
else -> -1

6
navi-rr/src/main/java/com/navi/rr/rewards/ui/activity/RewardDelightActivity.kt
View File

@@ -162,15 +162,15 @@ class RewardDelightActivity : BaseActivity(), ActionButtonClickListener {
when (rewardsWidgetData?.rewardsInfo?.rewardType) {
RewardType.GOLD.name -> {
ivRewardIcon.isVisible = false
com.navi.naviwidgets.R.drawable.ic_rewards_gold_detail_corner
R.drawable.ic_rewards_gold_detail_corner
}
RewardType.CASH.name -> {
ivRewardIcon.isVisible = true
com.navi.naviwidgets.R.drawable.ic_rewards_detail_corner
R.drawable.ic_rewards_detail_corner
}
else -> {
ivRewardIcon.isVisible = true
com.navi.naviwidgets.R.drawable.ic_rewards_detail_corner
R.drawable.ic_rewards_detail_corner
}
}
)

8
navi-rr/src/main/java/com/navi/rr/rewards/ui/bottomsheet/RewardsBottomsSheetView.kt
View File

@@ -70,10 +70,10 @@ constructor(parentContext: Context, attrs: AttributeSet? = null, defStyleAttr: I
tvAction.background = getNaviDrawableFromBackend(
backgroundColor = rewardInfo.ctaBgColor.parseColorSafe(),
radii = CornerRadius(
leftBottom = resources.getDimensionPixelSize(com.navi.naviwidgets.R.dimen.dp_32).toFloat(),
rightBottom = resources.getDimensionPixelSize(com.navi.naviwidgets.R.dimen.dp_32).toFloat(),
leftTop = resources.getDimensionPixelSize(com.navi.naviwidgets.R.dimen.dp_32).toFloat(),
rightTop = resources.getDimensionPixelSize(com.navi.naviwidgets.R.dimen.dp_32).toFloat()
leftBottom = resources.getDimensionPixelSize(R.dimen.dp_32).toFloat(),
rightBottom = resources.getDimensionPixelSize(R.dimen.dp_32).toFloat(),
leftTop = resources.getDimensionPixelSize(R.dimen.dp_32).toFloat(),
rightTop = resources.getDimensionPixelSize(R.dimen.dp_32).toFloat()
)
)
tvAction.text = rewardInfo.ctaText?.text.spannedText(

4
navi-rr/src/main/java/com/navi/rr/rewards/ui/fragment/RewardsDetailFragment.kt
View File

@@ -149,9 +149,9 @@ class RewardsDetailFragment :
tagLabel.background = getNaviDrawableFromBackend(
backgroundColor = rewardsWidgetData?.popUpTagInfo?.bgColor.parseColorSafe(),
radii = CornerRadius(
leftBottom = resources.getDimensionPixelSize(com.navi.naviwidgets.R.dimen.dp_16)
leftBottom = resources.getDimensionPixelSize(R.dimen.dp_16)
.toFloat(),
rightTop = resources.getDimensionPixelSize(com.navi.naviwidgets.R.dimen.dp_16)
rightTop = resources.getDimensionPixelSize(R.dimen.dp_16)
.toFloat()
)
)