add support for digital coupons

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.44.0]
+
+### Added
+- Added support for DIGITAL coupons with additional fields
+
 ## [0.43.2]
 
 ### Added

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.43.2'
+        sdkVersion='0.44.0'
         versionCode=1
 
         compileSdkVersion=30

core/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply from:'../scripts/maven.gradle'
+apply plugin: "org.jetbrains.kotlin.plugin.parcelize"
 
 android {
     compileSdkVersion project.compileSdkVersion

core/src/main/java/io/snabble/sdk/Coupons.kt

@@ -1,30 +1,50 @@
 package io.snabble.sdk
 
+import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 data class Coupon (
     val id: String,
-    val name: String,
+    val name: String?,
+    val description: String?,
+    val promotionDescription: String?,
     val type: CouponType,
-    val codes: List<CouponCode>,
-)
+    val codes: List<CouponCode>?,
+    val code: String?,
+    val validFrom: String?,
+    val validUntil: String?,
+    val image: CouponImage?
+) : Parcelable
 
+@Parcelize
 data class CouponCode (
     val code: String,
     val template: String,
-)
+) : Parcelable
+
+@Parcelize
+data class CouponImage (
+    val name: String,
+    val formats: List<CouponImageFormats>,
+) : Parcelable
+
+@Parcelize
+data class CouponImageFormats (
+    val contentType: String,
+    val width: Int,
+    val height: Int,
+    val size: String,
+    val url: String,
+) : Parcelable
 
 enum class CouponType {
     @SerializedName("manual") MANUAL,
     @SerializedName("printed") PRINTED,
     @SerializedName("digital") DIGITAL,
 }
 
-data class PersistedCouponData (
-    val activatedCouponIds: MutableList<String> = mutableListOf(),
-    val printedCouponsIds: MutableList<String> = mutableListOf(),
-)
-
 class Coupons (
     private val coupons: List<Coupon>,
 ) {

core/src/main/java/io/snabble/sdk/ShoppingCart.java

@@ -130,6 +130,22 @@ public void add(Item item) {
         insert(item, 0);
     }
 
+    /**
+     * Adds coupons without adding a scanned code to it, you can use this function to quickly
+     * add DIGITAL coupons that do not have a barcode associated with them
+     */
+    public void addCoupon(Coupon coupon) {
+        add(newItem(coupon, null));
+    }
+
+    /**
+     * Adds coupons with a scanned code to it, you can use this function to quickly
+     * add PRINTED coupons
+     */
+    public void addCoupon(Coupon coupon, ScannedCode scannedCode) {
+        add(newItem(coupon, scannedCode));
+    }
+
     public void insert(Item item, int index) {
         insert(item, index, true);
     }

ui/build.gradle

@@ -60,6 +60,7 @@ dependencies {
     implementation 'me.relex:circleindicator:2.1.6'
     implementation 'ch.datatrans:android-sdk:1.4.1'
     implementation 'com.google.android.gms:play-services-wallet:18.1.3'
+    implementation 'eu.rekisoft.android.util:LazyWorker:2.0.1'
 
     def camerax_version = "1.0.0"
     implementation "androidx.camera:camera-core:${camerax_version}"
@@ -77,5 +78,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation 'eu.rekisoft.android.util:LazyWorker:2.0.0'
 }

ui/src/main/java/io/snabble/sdk/ui/utils/UIUtils.java

@@ -128,7 +128,7 @@ public void onLayoutChange(View view, int left, int top, int right, int bottom,
 
         Handler infoHandler = new Handler(Looper.getMainLooper());
         infoHandler.removeCallbacksAndMessages(null);
-        LazyWorker.Job hide = LazyWorker.createLifeCycleAwareJob(parent.getContext(), () -> {
+        LazyWorker.Job hide = LazyWorker.createLifeCycleAwareJob(parent.getContext(), (job) -> {
             if(info.isAttachedToWindow()) {
                 info.animate()
                         .translationY(-offsetY - info.getHeight())