Merge pull request #15 from mercadolibre/feature/SMARTI-482_kotlin_1_8

[SMARTI-482] update kotlin version
mercadolibre · May 31, 2023 · a7116b9 · a7116b9
2 parents 62aaea8 + e2307ce
commit a7116b9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v2.0.0
+## Modified
+- Update kotlin version
+
 # V1.4.0
 ## Fixed
 - Fixed on click listener in payment button

diff --git a/...ava/com/mercadolibre/android/point_mainapp_demo/app/view/printer/PrinterBitmapActivity.kt b/...ava/com/mercadolibre/android/point_mainapp_demo/app/view/printer/PrinterBitmapActivity.kt
@@ -1,23 +1,23 @@
 package com.mercadolibre.android.point_mainapp_demo.app.view.printer
 
 import android.graphics.BitmapFactory
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.coroutineScope
 import com.mercadolibre.android.point_integration_sdk.nativesdk.MPManager
 import com.mercadolibre.android.point_mainapp_demo.app.R
-import com.mercadolibre.android.point_mainapp_demo.app.databinding.ActivityPrinterBitmapBinding
+import com.mercadolibre.android.point_mainapp_demo.app.databinding.PointMainappDemoAppActivityPrinterBitmapBinding
 import com.mercadolibre.android.point_mainapp_demo.app.util.gone
 import com.mercadolibre.android.point_mainapp_demo.app.util.visible
 import kotlinx.coroutines.launch
 
 class PrinterBitmapActivity : AppCompatActivity() {
 
-    private var binding: ActivityPrinterBitmapBinding? = null
+    private var binding: PointMainappDemoAppActivityPrinterBitmapBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityPrinterBitmapBinding.inflate(layoutInflater)
+        binding = PointMainappDemoAppActivityPrinterBitmapBinding.inflate(layoutInflater)
         setContentView(binding?.root)
 
         onPrintImageBitmap()
@@ -46,7 +46,7 @@ class PrinterBitmapActivity : AppCompatActivity() {
 
     private fun printImageBitmap() {
 
-        val bitmap = BitmapFactory.decodeResource(resources, R.drawable.ic_datafono)
+        val bitmap = BitmapFactory.decodeResource(resources, R.drawable.point_mainapp_demo_app_ic_datafono)
 
         lifecycle.coroutineScope.launch {
             MPManager.bitmapPrinter.makePrint(bitmap) {

diff --git a/app/src/main/res/drawable/ic_datafono.bmp → ...le/point_mainapp_demo_app_ic_datafono.bmp b/app/src/main/res/drawable/ic_datafono.bmp → ...le/point_mainapp_demo_app_ic_datafono.bmp
diff --git a/...in/res/layout/activity_printer_bitmap.xml → ...napp_demo_app_activity_printer_bitmap.xml b/...in/res/layout/activity_printer_bitmap.xml → ...napp_demo_app_activity_printer_bitmap.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/primaryLightColor"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/primaryLightColor"
     tools:context=".view.printer.PrinterBitmapActivity">
 
+    <ProgressBar
+        android:id="@+id/progress_circular"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon_description"
         android:layout_width="@dimen/ui_8m"
         android:layout_height="@dimen/ui_8m"
-        android:layout_marginTop="@dimen/ui_4m"
         android:layout_marginBottom="@dimen/ui_1_25m"
+        android:layout_marginTop="@dimen/ui_4m"
         android:tint="@color/primaryColor"
         app:layout_constraintBottom_toTopOf="@+id/descriptionPrinterBitmap"
         app:layout_constraintEnd_toEndOf="parent"
@@ -26,8 +35,8 @@
         android:id="@+id/descriptionPrinterBitmap"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/ui_4m"
         android:layout_marginEnd="@dimen/ui_4m"
+        android:layout_marginStart="@dimen/ui_4m"
         android:drawablePadding="@dimen/ui_1_25m"
         android:text="@string/point_mainapp_demo_app_home_descption_printer_bitmap"
         android:textAlignment="center"
@@ -41,25 +50,15 @@
         android:id="@+id/print_image_bitmap"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/ui_4m"
         android:layout_marginHorizontal="@dimen/ui_6m"
         android:paddingVertical="@dimen/ui_1_25m"
         android:text="@string/point_mainapp_demo_app_text_button_printer_bitmap"
         android:textAllCaps="false"
         app:cornerRadius="@dimen/ui_1_25m"
-        android:layout_marginBottom="@dimen/ui_4m"
         app:icon="@drawable/point_mainapp_demo_app_black_ic_print"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <ProgressBar
-        android:id="@+id/progress_circular"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/gradle.properties b/gradle.properties
@@ -38,8 +38,8 @@ applicationId=com.mercadolibre.android.point_mainapp_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=100300
-versionName=1.3.0
+versionCode=200000
+versionName=2.0.0
 minSdkVersion = 23
 targetSdkVersion=33
 compileSdkVersion=33
@@ -51,7 +51,7 @@ buildToolsVersion=33.0.0
 gradleBuildToolsVersion=4.2.1
 gradleWrapperVersion=7.4
 dexCountGradlePlugin=1.0.3
-kotlinVersion=1.7.21
+kotlinVersion=1.8.10
 materialDesignVersion=1.7.0
 jacocoVersion=0.8.7
 renderscriptTargetApiVersion = 20