From 6dd0772e9bd01e4bba4cb255801c070e57e3cefb Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Tue, 23 Apr 2024 14:49:46 +0200 Subject: [PATCH] feat: upgrade dependencies --- ...luebird-specific-nfc-java-lib-2.1.1-mock.aar | Bin 0 -> 20604 bytes .../keyple/demo/control/data/CardRepository.kt | 6 +++--- .../keyple/demo/control/ui/HomeActivity.kt | 2 -- .../keyple/demo/control/ui/MainActivity.kt | 5 ++--- .../deviceselection/DeviceSelectionActivity.kt | 3 ++- 5 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 app/libs/keyple-plugin-cna-bluebird-specific-nfc-java-lib-2.1.1-mock.aar diff --git a/app/libs/keyple-plugin-cna-bluebird-specific-nfc-java-lib-2.1.1-mock.aar b/app/libs/keyple-plugin-cna-bluebird-specific-nfc-java-lib-2.1.1-mock.aar new file mode 100644 index 0000000000000000000000000000000000000000..2b3f240d219760b3cb9e26a64b9f34d28a368707 GIT binary patch literal 20604 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 bW= Build.VERSION_CODES.O) { - event.eventDatetime.plusMinutes(AppSettings.validationPeriod.toLong()) + event.eventDatetime.plusMinutes(AppSettings.validationPeriod.toLong()) } else { - TODO("VERSION.SDK_INT < O") + TODO("VERSION.SDK_INT < O") } - // Step 7 - If EventLocation != value configured in the control terminal set the validated + // Step 7 - If EventLocation != value configured in the control terminal set the validated // contract valid flag as false and go to point CNT_READ. if (AppSettings.location.id != event.eventLocation) { contractEventValid = false diff --git a/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/HomeActivity.kt b/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/HomeActivity.kt index 1693bc1..766e3df 100644 --- a/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/HomeActivity.kt +++ b/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/HomeActivity.kt @@ -14,8 +14,6 @@ package org.calypsonet.keyple.demo.control.ui import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import org.calypsonet.keyple.demo.control.BuildConfig -import org.calypsonet.keyple.demo.control.R import org.calypsonet.keyple.demo.control.data.model.AppSettings import org.calypsonet.keyple.demo.control.databinding.ActivityHomeBinding import org.calypsonet.keyple.demo.control.databinding.LogoToolbarBinding diff --git a/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/MainActivity.kt b/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/MainActivity.kt index 86ff038..6c017b6 100644 --- a/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/MainActivity.kt +++ b/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/MainActivity.kt @@ -15,17 +15,16 @@ import android.content.Intent import android.os.Bundle import java.util.Timer import java.util.TimerTask -import org.calypsonet.keyple.demo.control.R import org.calypsonet.keyple.demo.control.databinding.ActivityMainBinding import org.calypsonet.keyple.demo.control.ui.deviceselection.DeviceSelectionActivity class MainActivity : BaseActivity() { - private lateinit var activityMainBinding: ActivityMainBinding + private lateinit var activityMainBinding: ActivityMainBinding override fun onCreate(savedInstanceState: Bundle?) { // Make sure this is before calling super.onCreate super.onCreate(savedInstanceState) - activityMainBinding=ActivityMainBinding.inflate(layoutInflater) + activityMainBinding = ActivityMainBinding.inflate(layoutInflater) setContentView(activityMainBinding.root) Timer() .schedule( diff --git a/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/deviceselection/DeviceSelectionActivity.kt b/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/deviceselection/DeviceSelectionActivity.kt index a30c0fc..385f7ad 100644 --- a/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/deviceselection/DeviceSelectionActivity.kt +++ b/app/src/main/kotlin/org/calypsonet/keyple/demo/control/ui/deviceselection/DeviceSelectionActivity.kt @@ -38,7 +38,8 @@ class DeviceSelectionActivity : BaseActivity() { super.onCreate(savedInstanceState) activityDeviceSelectionBinding = ActivityDeviceSelectionBinding.inflate(layoutInflater) setContentView(activityDeviceSelectionBinding.root) - activityDeviceSelectionBinding.appVersion.text = getString(R.string.version, BuildConfig.VERSION_NAME) + activityDeviceSelectionBinding.appVersion.text = + getString(R.string.version, BuildConfig.VERSION_NAME) // Bluebird if (BluebirdPlugin.PLUGIN_NAME.contains(mock)) { activityDeviceSelectionBinding.bluebirdBtn.setBackgroundColor(Color.GRAY)