Fixes/hotworks progurad issue#84

app/build.gradle

@@ -53,11 +53,14 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
         release {
+//            debuggable true
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }

app/proguard-rules.pro

@@ -18,4 +18,16 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# Suppress warnings related to missing SSL/TLS provider classes
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+-dontwarn java.lang.invoke.StringConcatFactory

app/src/main/java/ai/passio/uimodule/MyPassioConnector.kt

@@ -2,8 +2,8 @@ package ai.passio.uimodule
 
 import ai.passio.nutrition.uimodule.PassioNutrientsExclusionStrategy
 import ai.passio.nutrition.uimodule.data.PassioConnector
-import ai.passio.nutrition.uimodule.data.UnitEnergySerializer
-import ai.passio.nutrition.uimodule.data.UnitMassSerializer
+import ai.passio.nutrition.uimodule.data.db.mapper.UnitEnergySerializer
+import ai.passio.nutrition.uimodule.data.db.mapper.UnitMassSerializer
 import ai.passio.nutrition.uimodule.ui.model.FoodRecord
 import ai.passio.nutrition.uimodule.ui.model.UserProfile
 import ai.passio.nutrition.uimodule.ui.model.WaterRecord

passio-ui-module/consumer-rules.pro

@@ -1,3 +1,56 @@
+-dontwarn java.lang.invoke.StringConcatFactory
 -keepclassmembers class ai.passio.nutrition.uimodule.NutritionUIConfiguration {
     public <fields>;
-}
+}
+
+#-keep class ai.passio.nutrition.** { *; }
+#-keep class ai.passio.passiosdk.** { *; }
+#-keep class ai.passio.nutrition.uimodule.** { *;}
+#-keepclassmembers class ai.passio.nutrition.uimodule.** {
+#    *;
+#}
+
+-keep class ai.passio.passiosdk.** { *; }
+#-keep class ai.passio.nutrition.uimodule.ui.** { *;}
+-keep class ai.passio.nutrition.uimodule.data.db.entity.** { *;}
+-keep class ai.passio.nutrition.uimodule.data.db.mapper.** { *;}
+-keep class ai.passio.nutrition.uimodule.data.db.typeconverter.** { *;}
+-keep class ai.passio.nutrition.uimodule.ui.model.** { *;}
+-keep class ai.passio.nutrition.uimodule.NutritionUIConfiguration {*;}
+-keep class ai.passio.nutrition.uimodule.NutritionUIModule {*;}
+-keep class ai.passio.nutrition.uimodule.data.PassioConnector {*;}
+#-dontwarn ai.passio.nutrition.uimodule.NutritionUIConfiguration
+#-dontwarn ai.passio.nutrition.uimodule.NutritionUIModule
+#-dontwarn ai.passio.nutrition.uimodule.data.PassioConnector
+
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken

passio-ui-module/proguard-rules.pro

@@ -19,6 +19,20 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-dontwarn java.lang.invoke.StringConcatFactory
 -keepclassmembers class ai.passio.nutrition.uimodule.NutritionUIConfiguration {
     public <fields>;
-}
+}
+
+
+#-keep class ai.passio.passiosdk.** { *; }
+#-keep class ai.passio.nutrition.uimodule.data.db.entity.** { *;}
+#-keep class ai.passio.nutrition.uimodule.data.db.mapper.** { *;}
+#-keep class ai.passio.nutrition.uimodule.data.db.typeconverter.** { *;}
+#-keep class ai.passio.nutrition.uimodule.ui.model.** { *;}
+#-keep class ai.passio.nutrition.uimodule.NutritionUIConfiguration {*;}
+#-keep class ai.passio.nutrition.uimodule.NutritionUIModule {*;}
+#-keep class ai.passio.nutrition.uimodule.data.PassioConnector {*;}
+#-dontwarn ai.passio.nutrition.uimodule.NutritionUIConfiguration
+#-dontwarn ai.passio.nutrition.uimodule.NutritionUIModule
+#-dontwarn ai.passio.nutrition.uimodule.data.PassioConnector

passio-ui-module/src/main/java/ai/passio/nutrition/uimodule/data/SharedPrefsPassioConnector.kt

@@ -1,6 +1,8 @@
 package ai.passio.nutrition.uimodule.data
 
 import ai.passio.nutrition.uimodule.PassioNutrientsExclusionStrategy
+import ai.passio.nutrition.uimodule.data.db.mapper.UnitEnergySerializer
+import ai.passio.nutrition.uimodule.data.db.mapper.UnitMassSerializer
 import ai.passio.nutrition.uimodule.ui.model.FoodRecord
 import ai.passio.nutrition.uimodule.ui.model.UserProfile
 import ai.passio.nutrition.uimodule.ui.model.WaterRecord

passio-ui-module/src/main/java/ai/passio/nutrition/uimodule/data/db/mapper/FoodLogMapper.kt

@@ -2,9 +2,12 @@ package ai.passio.nutrition.uimodule.data.db.mapper
 
 import ai.passio.nutrition.uimodule.data.db.entity.FoodLogEntity
 import ai.passio.nutrition.uimodule.data.db.entity.FoodLogIngredientEntity
+import ai.passio.nutrition.uimodule.data.passioGson
 import ai.passio.nutrition.uimodule.ui.model.FoodRecord
 import ai.passio.nutrition.uimodule.ui.model.FoodRecordIngredient
 import ai.passio.nutrition.uimodule.ui.model.MealLabel
+import android.util.Log
+
 /*
 internal fun List<FoodRecord>.toFoodLogEntities(): List<FoodLogEntity> {
     val foodRecords = this
@@ -18,6 +21,8 @@ internal fun List<FoodLogEntity>.toFoodRecords(): List<FoodRecord> {
 
 internal fun FoodRecord.toFoodLogEntity(): FoodLogEntity {
     val foodRecord = this
+    Log.d("food log","food log track: 001")
+    Log.d("food log","food log track: 001__ $passioGson.")
     return FoodLogEntity(
         uuid = foodRecord.uuid,
         id = foodRecord.id,
@@ -46,8 +51,11 @@ internal fun FoodRecord.toFoodLogEntity(): FoodLogEntity {
 
 internal fun FoodRecordIngredient.toFoodLogIngredientEntity(): FoodLogIngredientEntity {
     val ingredient = this
+    Log.d("food log","food log track: 002")
+
     return FoodLogIngredientEntity(
 //        foodUUID = currentFoodUUID,
+
         id = ingredient.id,
         refCode = ingredient.refCode,
         name = ingredient.name,

passio-ui-module/src/main/java/ai/passio/nutrition/uimodule/data/UnitMassSerializer.kt → passio-ui-module/src/main/java/ai/passio/nutrition/uimodule/data/db/mapper/UnitMassSerializer.kt

@@ -1,4 +1,4 @@
-package ai.passio.nutrition.uimodule.data
+package ai.passio.nutrition.uimodule.data.db.mapper
 
 import ai.passio.passiosdk.passiofood.data.measurement.Centigrams
 import ai.passio.passiosdk.passiofood.data.measurement.Decigrams

passio-ui-module/src/main/java/ai/passio/nutrition/uimodule/ui/model/FoodRecordData.kt

@@ -0,0 +1,109 @@
+package ai.passio.nutrition.uimodule.ui.model
+
+import com.google.gson.annotations.SerializedName
+
+data class FoodRecordData(
+    val uuid: String,
+    val createdAt: Double,
+    val scannedUnitName: String,
+    val passioID: String,
+    val name: String,
+    val selectedQuantity: Int,
+    val openFoodLicense: String,
+    val details: String,
+    val servingSizes: List<ServingSizeData>,
+    val id: String,
+    val selectedUnit: String,
+    val refCode: String,
+    val ingredients: List<IngredientData>
+)
+
+data class ServingSizeData(
+    val quantity: Int,
+    val unitName: String
+)
+
+data class IngredientData(
+    val details: String?,
+    val entityType: String,
+    val iconId: String,
+    val id: String,
+    val name: String,
+    val openFoodLicense: String?,
+    val refCode: String?,
+    val selectedQuantity: Double,
+    val selectedUnit: String,
+    val servingSizes: List<ServingSizeData>,
+    val servingUnits: List<ServingUnitData>,
+    val passioID: String,
+    val nutrients: PassioNutrientsData
+)
+
+data class ServingUnitData(
+    val unitName: String,
+    val weight: WeightData
+)
+
+data class WeightData(
+    val value: Double,
+    val unit: UnitData
+)
+
+data class UnitData(
+    val symbol: String,
+    val converter: ConverterData
+)
+
+data class ConverterData(
+    val constant: Double,
+    val coefficient: Double
+)
+
+data class PassioNutrientsData(
+    @SerializedName("_weight") val weight: UnitMassData,
+    @SerializedName("_referenceWeight") var referenceWeight: UnitMassData,
+    @SerializedName("_alcohol") var alcohol: UnitMassData?,
+    @SerializedName("_calcium") var calcium: UnitMassData?,
+    @SerializedName("_calories") var calories: UnitMassData?,
+    @SerializedName("_carbs") var carbs: UnitMassData?,
+    @SerializedName("_cholesterol") var cholesterol: UnitMassData?,
+    @SerializedName("_chromium") var chromium: UnitMassData?,
+    @SerializedName("_fibers") var fibers: UnitMassData?,
+    @SerializedName("_folicAcid") var folicAcid: UnitMassData?,
+    @SerializedName("_fat") var fat: UnitMassData?,
+    @SerializedName("_iron") var iron: UnitMassData?,
+    @SerializedName("_iodine") var iodine: UnitMassData?,
+    @SerializedName("_magnesium") var magnesium: UnitMassData?,
+    @SerializedName("_monounsaturatedFat") var monounsaturatedFat: UnitMassData?,
+    @SerializedName("_phosphorus") var phosphorus: UnitMassData?,
+    @SerializedName("_polyunsaturatedFat") var polyunsaturatedFat: UnitMassData?,
+    @SerializedName("_potassium") var potassium: UnitMassData?,
+    @SerializedName("_proteins") var proteins: UnitMassData?,
+    @SerializedName("_satFat") var satFat: UnitMassData?,
+    @SerializedName("_selenium") var selenium: UnitMassData?,
+    @SerializedName("_sodium") var sodium: UnitMassData?,
+    @SerializedName("_sugars") var sugars: UnitMassData?,
+    @SerializedName("_sugarsAdded") var sugarsAdded: UnitMassData?,
+    @SerializedName("_sugarAlcohol") var sugarAlcohol: UnitMassData?,
+    @SerializedName("_transFat") var transFat: UnitMassData?,
+    @SerializedName("_vitaminA") var vitaminA: Double?,
+    @SerializedName("_vitaminA_RAE") var vitaminA_RAE: UnitMassData?,
+    @SerializedName("_vitaminB6") var vitaminB6: UnitMassData?,
+    @SerializedName("_vitaminB12") var vitaminB12: UnitMassData?,
+    @SerializedName("_vitaminB12Added") var vitaminB12Added: UnitMassData?,
+    @SerializedName("_vitaminC") var vitaminC: UnitMassData?,
+    @SerializedName("_vitaminD") var vitaminD: UnitMassData?,
+    @SerializedName("_vitaminE") var vitaminE: UnitMassData?,
+    @SerializedName("_vitaminEAdded") var vitaminEAdded: UnitMassData?,
+    @SerializedName("_vitaminKPhylloquinone") var vitaminKPhylloquinone: UnitMassData?,
+    @SerializedName("_vitaminKMenaquinone4") var vitaminKMenaquinone4: UnitMassData?,
+    @SerializedName("_vitaminKDihydrophylloquinone") var vitaminKDihydrophylloquinone: UnitMassData?,
+    @SerializedName("_zinc") var zinc: UnitMassData?
+)
+
+
+
+data class UnitMassData(
+    val value: Double,
+    val unit: UnitData
+)

passio-ui-module/src/main/res/layout/fragment_diary.xml

@@ -158,7 +158,7 @@
         android:layout_height="0dp"
         android:background="@color/passio_white40p"
         android:clickable="true"
-        android:translationZ="4dp"
+        android:translationZ="6dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"