Skip to content

Master #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 25, 2024
Merged

Master #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
829bbfa
Bump SDK version to 2.8.4
AndreyEmtsov Feb 16, 2024
6d52602
Merge pull request #431 from mindbox-cloud/release/2.8.4
AndreyEmtsov Feb 16, 2024
152746a
Bump SDK version to 2.8.5
Mar 7, 2024
0f422b2
fixing system name lowercase
Robalim Mar 13, 2024
3a07404
Merge branch 'master' into release/2.8.5
Robalim Mar 13, 2024
1928e62
Merge pull request #437 from mindbox-cloud/release/2.8.5
AndreyEmtsov Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ android.enableJetifier=true
kotlin.code.style=official

# SDK version property
SDK_VERSION_NAME=2.8.3
SDK_VERSION_NAME=2.8.5
8 changes: 3 additions & 5 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import cloud.mindbox.mobile_sdk.inapp.data.dto.ElementDto
import cloud.mindbox.mobile_sdk.inapp.data.dto.GeoTargetingDto
import cloud.mindbox.mobile_sdk.inapp.data.dto.PayloadDto
import cloud.mindbox.mobile_sdk.inapp.domain.models.*
import cloud.mindbox.mobile_sdk.inapp.domain.models.InAppType.ModalWindow.*
import cloud.mindbox.mobile_sdk.inapp.data.dto.PayloadDto.ModalWindowDto.*
import cloud.mindbox.mobile_sdk.inapp.domain.models.ProductResponse
import cloud.mindbox.mobile_sdk.models.TreeTargetingDto
import cloud.mindbox.mobile_sdk.models.operation.Ids
Expand Down Expand Up @@ -202,10 +200,10 @@ internal class InAppMapper {
left = payloadDto.content.position.margin.left!!.roundToInt(),
right = payloadDto.content.position.margin.right!!.roundToInt(),
bottom = payloadDto.content.position.margin.bottom!!.roundToInt()
),
),


)
)
)
}

Expand Down Expand Up @@ -235,7 +233,7 @@ internal class InAppMapper {
)
} ?: emptyList(),
operations = inAppConfigResponse.settings?.map { (key, value) ->
key.enumValue<OperationName>() to OperationSystemName(value.systemName)
key.enumValue<OperationName>() to OperationSystemName(value.systemName.lowercase())
}?.toMap() ?: emptyMap(),
abtests = inAppConfigResponse.abtests?.map { dto ->
ABTest(
Expand Down
2 changes: 0 additions & 2 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/domain/InAppInteractorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ internal class InAppInteractorImpl(
}
}
}


}

override fun isInAppShown(): Boolean {
Expand Down