refact: rename repositories

CHANGELOG.md

@@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [2024.04.23]
 ### Upgraded
-- keyple-demo-common-lib `2.0.0-SNAPSHOT` -> `2.0.1-SNAPSHOT`
+- keyple-demo-ticketing-common-lib `2.0.0-SNAPSHOT` -> `2.0.1-SNAPSHOT`
 - All Keyple components (compiled to java 8)
     - keypop-reader-java-api `2.0.0` -> `2.0.1`
     - keypop-calypso-card-java-api `2.0.0` -> `2.1.0`
@@ -44,7 +44,7 @@ New dependencies
 
 ## [2023.06.01]
 ### Upgraded
-- `keyple-demo-common-lib:2.0.0-SNAPSHOT`
+- `keyple-demo-ticketing-common-lib:2.0.0-SNAPSHOT`
 - `calypsonet-terminal-reader-java-api:1.3.0`
 - `calypsonet-terminal-calypso-java-api:1.8.0`
 - `keyple-service-java-lib:2.3.1`
@@ -73,7 +73,7 @@ New dependencies
 - Build process using flavours mechanism replaced by standard single build process.
 - Major refactoring of the source code.
 ### Upgraded
-- `keyple-demo-common-lib:1.0.0-SNAPSHOT`
+- `keyple-demo-ticketing-common-lib:1.0.0-SNAPSHOT`
 - `calypsonet-terminal-reader-java-api:1.1.0`
 - `calypsonet-terminal-calypso-java-api:1.4.1`
 - `keyple-service-java-lib:2.1.1`
@@ -85,11 +85,11 @@ New dependencies
 - `keyple-plugin-cna-flowbird-android-java-lib-2.0.2-mock` (mocked library)
 - `keyple-util-java-lib:2.3.0`
 
-[Unreleased]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2024.09.20...HEAD
-[2024.09.20]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2024.04.23...2024.09.20
-[2024.04.23]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.12.06...2024.04.23
-[2023.12.06]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.06.01...2023.12.06
-[2023.06.01]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.03.03...2023.06.01
-[2023.03.03]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.02.24...2023.03.03
-[2023.02.24]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2022.11.18...2023.02.24
-[2022.11.18]: https://github.com/calypsonet/keyple-android-demo-validation/compare/v2021.11...2022.11.18
+[Unreleased]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2024.09.20...HEAD
+[2024.09.20]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2024.04.23...2024.09.20
+[2024.04.23]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.12.06...2024.04.23
+[2023.12.06]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.06.01...2023.12.06
+[2023.06.01]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.03.03...2023.06.01
+[2023.03.03]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.02.24...2023.03.03
+[2023.02.24]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2022.11.18...2023.02.24
+[2022.11.18]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/v2021.11...2022.11.18

CONTRIBUTING.md

@@ -4,8 +4,8 @@ Thanks for your interest in this project.
 
 ## Contributing
 
-1. [Fork](https://help.github.com/articles/fork-a-repo/) the [calypsonet/keyple-android-demo-validation](https://github.com/calypsonet/keyple-android-demo-validation) repository
-2. Clone repository: `git clone https://github.com/[your_github_username]/keyple-android-demo-validation.git`
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the [calypsonet/keyple-demo-ticketing-validation-app](https://github.com/calypsonet/keyple-demo-ticketing-validation-app) repository
+2. Clone repository: `git clone https://github.com/[your_github_username]/keyple-demo-ticketing-validation-app.git`
 3. Create your feature branch: `git checkout -b my-new-feature`
 4. Make your changes
 5. Commit your changes: `git commit -m "Add some feature" -s`

README.md

@@ -6,14 +6,14 @@ This demo is an open source project provided by the [Calypso Networks Associatio
 the [Eclipse Keyple SDK](https://keyple.org) in a typical use case that can serve as a basis for building a ticketing
 ecosystem based on contactless cards and/or NFC smartphones.
 
-The source code and APK are available at  [calypsonet/keyple-android-demo-validation/releases](https://github.com/calypsonet/keyple-android-demo-validation/releases)
+The source code and APK are available at  [calypsonet/keyple-demo-ticketing-validation-app/releases](https://github.com/calypsonet/keyple-demo-ticketing-validation-app/releases)
 
 The code can be easily adapted to other cards, terminals and business logic.
 
 It shows how to check if a card is authorized to enter a controlled area (entering the transport network with
 a Season Pass and/or Multi-trip ticket), a validation event is added in the event log to be checked by the
-[Keyple Demo Control](https://github.com/calypsonet/keyple-android-demo-control)  application.
-The contracts are loaded in the Calypso card with the Android application of the [Keyple Reload Demo package](https://github.com/calypsonet/keyple-java-demo-remote).
+[Keyple Demo Control](https://github.com/calypsonet/keyple-demo-ticketing-control-app)  application.
+The contracts are loaded in the Calypso card with the Android application of the [Keyple Reload Demo package](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote).
 
 The demo application was tested on the following terminals:
 - `Famoco FX205` via the open source plugins [Famoco](https://github.com/calypsonet/keyple-famoco) (for SAM access) and [Android NFC](https://keyple.org/components-java/plugins/nfc/) (for card access).
@@ -28,14 +28,14 @@ As all the exchanges made with the card are cryptographically secured by a secur
 ## Keyple Demos
 
 This demo is part of a set of three demos:
-* [Keyple Reload Demo](https://github.com/calypsonet/keyple-java-demo-remote)
-* [Keyple Validation Demo](https://github.com/calypsonet/keyple-android-demo-validation)
-* [Keyple Control Demo](https://github.com/calypsonet/keyple-android-demo-control)
+* [Keyple Reload Demo](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote)
+* [Keyple Validation Demo](https://github.com/calypsonet/keyple-demo-ticketing-validation-app)
+* [Keyple Control Demo](https://github.com/calypsonet/keyple-demo-ticketing-control-app)
 
 These demos are all based on a common library that defines elements such as constants and data structures implemented 
-for the logic of the ticketing application: [Keyple Demo Common Library](https://github.com/calypsonet/keyple-demo-common-lib).
+for the logic of the ticketing application: [Keyple Demo Common Library](https://github.com/calypsonet/keyple-demo-ticketing-common-lib).
 
-Please refer to the [README](https://github.com/calypsonet/keyple-demo-common-lib/blob/main/README.md) 
+Please refer to the [README](https://github.com/calypsonet/keyple-demo-ticketing-common-lib/blob/main/README.md) 
 file of this library to discover these data structures.
 
 ## Validation Procedure

app/build.gradle.kts

@@ -116,7 +116,8 @@ android {
 
 dependencies {
     // Demo common
-    implementation("org.calypsonet.keyple:keyple-demo-common-lib:2.0.1-SNAPSHOT") { isChanging = true }
+    implementation("org.calypsonet.keyple:keyple-demo-ticketing-common-lib:2.0.2-SNAPSHOT") { isChanging = true }
+    implementation("org.threeten:threetenbp:1.7.0")
 
     // Keyple reader plugins proprietary libs
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))

app/src/main/kotlin/org/calypsonet/keyple/demo/validation/data/CardRepository.kt

@@ -12,8 +12,6 @@
 package org.calypsonet.keyple.demo.validation.data
 
 import android.content.Context
-import java.time.LocalDate
-import java.time.LocalDateTime
 import org.calypsonet.keyple.demo.common.constant.CardConstant
 import org.calypsonet.keyple.demo.common.model.EventStructure
 import org.calypsonet.keyple.demo.common.model.type.DateCompact
@@ -37,6 +35,8 @@ import org.eclipse.keypop.calypso.card.transaction.ChannelControl
 import org.eclipse.keypop.calypso.card.transaction.SecureRegularModeTransactionManager
 import org.eclipse.keypop.calypso.card.transaction.SymmetricCryptoSecuritySetting
 import org.eclipse.keypop.reader.CardReader
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
 import timber.log.Timber
 
 class CardRepository {

app/src/main/kotlin/org/calypsonet/keyple/demo/validation/data/model/CardReaderResponse.kt

@@ -12,9 +12,9 @@
 package org.calypsonet.keyple.demo.validation.data.model
 
 import android.os.Parcelable
-import java.time.LocalDate
-import java.time.LocalDateTime
 import kotlinx.android.parcel.Parcelize
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
 
 @Parcelize
 data class CardReaderResponse(

app/src/main/kotlin/org/calypsonet/keyple/demo/validation/data/model/Validation.kt

@@ -12,8 +12,8 @@
 package org.calypsonet.keyple.demo.validation.data.model
 
 import android.os.Parcelable
-import java.time.LocalDateTime
 import kotlinx.android.parcel.Parcelize
+import org.threeten.bp.LocalDateTime
 
 @Parcelize
 data class Validation(

app/src/main/kotlin/org/calypsonet/keyple/demo/validation/domain/TicketingService.kt

@@ -13,7 +13,6 @@ package org.calypsonet.keyple.demo.validation.domain
 
 import android.app.Activity
 import android.content.Context
-import java.time.LocalDateTime
 import javax.inject.Inject
 import org.calypsonet.keyple.demo.common.constant.CardConstant
 import org.calypsonet.keyple.demo.validation.data.CardRepository
@@ -40,6 +39,7 @@ import org.eclipse.keypop.reader.selection.CardSelectionManager
 import org.eclipse.keypop.reader.selection.CardSelectionResult
 import org.eclipse.keypop.reader.selection.ScheduledCardSelectionsResponse
 import org.eclipse.keypop.reader.spi.CardReaderObserverSpi
+import org.threeten.bp.LocalDateTime
 import timber.log.Timber
 
 @AppScoped

app/src/main/kotlin/org/calypsonet/keyple/demo/validation/ui/CardSummaryActivity.kt

@@ -14,14 +14,14 @@ package org.calypsonet.keyple.demo.validation.ui
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
-import java.time.format.DateTimeFormatter
 import java.util.*
 import org.calypsonet.keyple.demo.validation.R
 import org.calypsonet.keyple.demo.validation.data.model.AppSettings
 import org.calypsonet.keyple.demo.validation.data.model.CardReaderResponse
 import org.calypsonet.keyple.demo.validation.data.model.ReaderType
 import org.calypsonet.keyple.demo.validation.data.model.Status
 import org.calypsonet.keyple.demo.validation.databinding.ActivityCardSummaryBinding
+import org.threeten.bp.format.DateTimeFormatter
 import timber.log.Timber
 
 class CardSummaryActivity : BaseActivity() {

gradle.properties

@@ -1,5 +1,5 @@
 version = 2024.09.20
-archivesBaseName = keyple-android-demo-validation
+archivesBaseName = keyple-demo-ticketing-validation-app
 
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:

settings.gradle

@@ -1,3 +1,3 @@
-rootProject.name = "keyple-android-demo-validation"
+rootProject.name = "keyple-demo-ticketing-validation-app"
 
 include ':app'