Skip to content

Commit

Permalink
[SMARTI-1446] Backport to master (#45)
Browse files Browse the repository at this point in the history
* update version 2.8.0

* [SMARTI-1399] bump version sdk 2.8.0 (#41)

* Feature barcode reader has been implemented

* update version library SDK

* update CHANGELOG.md

* update name library

---------

Co-authored-by: Jaime Trujillo <[email protected]>

* Fixed screen orientation changing when using barcode feature.

* update file CHANGELOG.md

* update file CHANGELOG.md

* update name library (#44)

* remove version old

---------

Co-authored-by: Jaime Trujillo <[email protected]>
Co-authored-by: Jaime Trujillo <[email protected]>
  • Loading branch information
3 people authored Jul 9, 2024
1 parent 0087523 commit c2f1cbe
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 31 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# v2.8.2
## Fixed
- Implement sending payment flow response data to PTM

# v2.8.1
## Fixed
- Fixed screen orientation changing when using barcode feature.

# v2.8.0
## Added
- The functionality for reading barcodes was added.
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ android {

dependencies {

mainappImplementation files("libs/nativesdk-mainapp-2.8.0.aar")
miniappImplementation files("libs/nativesdk-miniapp-2.8.0.aar")
mainappImplementation files("libs/nativesdk-mainapp-2.8.2.aar")
miniappImplementation files("libs/nativesdk-miniapp-2.8.2.aar")
// AndroidX
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
implementation "androidx.appcompat:appcompat:$appcompatVersion"
Expand Down
Binary file removed app/libs/nativesdk-mainapp-2.8.0.aar
Binary file not shown.
Binary file added app/libs/nativesdk-mainapp-2.8.2.aar
Binary file not shown.
Binary file removed app/libs/nativesdk-miniapp-2.8.0.aar
Binary file not shown.
Binary file added app/libs/nativesdk-miniapp-2.8.2.aar
Binary file not shown.
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@
<activity
android:name=".view.camera.CameraScannerActivity"
android:exported="false" />

<meta-data
android:name="com.mercadolibre.android.sdk.CLIENT_ID"
android:value="193213529837179L" />

<meta-data
android:name="com.mercadolibre.android.sdk.OAUTH_ENABLED"
android:value="false" />
android:value="true" />
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,38 @@ class CameraScannerActivity : AppCompatActivity() {

override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
MPManager.cameraScanner.handleScannerResponse(resultCode, data)
.doIfSuccess { qrResult ->
binding.run {
pointMainappDemoAppStateImg.visibility = View.VISIBLE
when (qrResult.status) {
CameraScannerStatus.Ok -> {
val result = getString(R.string.point_mainapp_demo_app_cammera_scanner_start_scan_success)
.format(qrResult.message)
pointMainappDemoAppCameraScannerResult.text = result
pointMainappDemoAppStateImg.setImageResource(R.drawable.point_mainapp_demo_app_ic_check_white)
}
MPManager.cameraScanner.handleScannerResponse(this, resultCode, data) { response ->
response
.doIfSuccess { qrResult ->
binding.run {
pointMainappDemoAppStateImg.visibility = View.VISIBLE
when (qrResult.status) {
CameraScannerStatus.Ok -> {
val result = getString(R.string.point_mainapp_demo_app_cammera_scanner_start_scan_success)
.format(qrResult.message)
pointMainappDemoAppCameraScannerResult.text = result
pointMainappDemoAppStateImg.setImageResource(R.drawable.point_mainapp_demo_app_ic_check_white)
}

CameraScannerStatus.Error -> {
val error = getString(R.string.point_mainapp_demo_app_cammera_scanner_start_scan_error)
.format(qrResult.message)
pointMainappDemoAppCameraScannerResult.text = error
pointMainappDemoAppStateImg.setImageResource(R.drawable.point_mainapp_demo_app_ic_error)
}
CameraScannerStatus.Error -> {
val error = getString(R.string.point_mainapp_demo_app_cammera_scanner_start_scan_error)
.format(qrResult.message)
pointMainappDemoAppCameraScannerResult.text = error
pointMainappDemoAppStateImg.setImageResource(R.drawable.point_mainapp_demo_app_ic_error)
}

CameraScannerStatus.Unknown -> {
val message = getString(R.string.point_mainapp_demo_app_cammera_scanner_start_scan_undefined)
.format(qrResult.message)
pointMainappDemoAppCameraScannerResult.text = message
pointMainappDemoAppStateImg.visibility = View.GONE
CameraScannerStatus.Unknown -> {
val message = getString(R.string.point_mainapp_demo_app_cammera_scanner_start_scan_undefined)
.format(qrResult.message)
pointMainappDemoAppCameraScannerResult.text = message
pointMainappDemoAppStateImg.visibility = View.GONE
}
}
}
}
}
.doIfError { error ->
toast(error.message.orEmpty())
}
.doIfError { error ->
toast(error.message.orEmpty())
}
}
}
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ miniAppAplicationId=com.mercadolibre.android.point_miniapp_demo

# IMPORTANT: We're using http://semver.org/ for all Android projects, please remember to follow this convention.
# IMPORTANT: The version will be THE SAME for all modules.
versionCode=200800
versionName=2.8.0
versionCode=200802
versionName=2.8.2
minSdkVersion = 23
targetSdkVersion=33
compileSdkVersion=33
Expand Down

0 comments on commit c2f1cbe

Please sign in to comment.