Changed Package name, replaced Gson with Jackson, updated BaseViewMod…

…el to allow data updates and easy POST method integration. Also setup Active session to show bill, members and orders and also allow adding members and cancelling orders.
checkin-team · Aug 20, 2018 · 16fc6b8 · 16fc6b8
1 parent f0b3d42
commit 16fc6b8
Show file tree

Hide file tree

Showing 276 changed files with 2,470 additions and 5,999 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'io.objectbox'
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "com.alcatraz.admin.project_alcatraz"
+        applicationId "com.checkin.app.checkin"
         minSdkVersion 19
         targetSdkVersion 27
         versionCode 1
@@ -14,7 +14,7 @@ android {
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [
-                        "objectbox.myObjectBoxPackage": "com.alcatraz.admin.project_alcatraz"
+                        "objectbox.myObjectBoxPackage": "com.checkin.app.checkin"
                 ]
             }
         }
@@ -37,6 +37,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-messaging:17.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
@@ -55,12 +57,16 @@ dependencies {
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation 'com.yarolegovich:discrete-scrollview:1.4.7'
     implementation 'com.appyvet:materialrangebar:1.4.3'
+    implementation 'com.github.javiersantos:MaterialStyledDialogs:2.1'
 
     // Network libraries and JSON <-> POJO
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation(
+            [group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "$jackson_version"],
+            [group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "$jackson_version"],
+            [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jackson_version"]
+    )
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation "com.hootsuite.android:nachos:1.1.1"
+    implementation 'com.squareup.retrofit2:converter-jackson:2.4.0'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 
     // ObjectBox components
@@ -78,7 +84,8 @@ dependencies {
     // Modified libraries
     implementation project(':library:MaterialSearchView')
     implementation project(':library:NiceSpinner')
-    implementation project(':library:MaterialChipView')
+
+    implementation "com.hootsuite.android:nachos:1.1.1"
 
     // Graphs
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
@@ -89,3 +96,5 @@ dependencies {
     implementation "com.andkulikov:transitionseverywhere:1.8.0"
     implementation 'com.jsibbold:zoomage:1.1.0'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/objectbox-models/default.json b/app/objectbox-models/default.json
@@ -80,7 +80,7 @@
     },
     {
       "id": "4:8792488809676470805",
-      "lastPropertyId": "5:2873565625349267435",
+      "lastPropertyId": "6:4140086161701088967",
       "name": "ItemCustomizationGroup",
       "properties": [
         {
@@ -100,16 +100,16 @@
           "name": "name"
         },
         {
-          "id": "5:2873565625349267435",
-          "indexId": "4:3035713941381745113",
-          "name": "menuItemId"
+          "id": "6:4140086161701088967",
+          "indexId": "7:7366426349237276981",
+          "name": "itemId"
         }
       ],
       "relations": []
     },
     {
       "id": "5:3615293227517264495",
-      "lastPropertyId": "11:6620884739598162003",
+      "lastPropertyId": "19:5448704526429864056",
       "name": "MenuItemModel",
       "properties": [
         {
@@ -128,14 +128,6 @@
           "id": "4:5935032680677761705",
           "name": "typeCost"
         },
-        {
-          "id": "5:3849345501825238335",
-          "name": "baseTypeIndex"
-        },
-        {
-          "id": "6:4296191239800169373",
-          "name": "unit"
-        },
         {
           "id": "7:3220715890339537694",
           "name": "description"
@@ -156,13 +148,45 @@
           "id": "11:6620884739598162003",
           "indexId": "5:69683604010069842",
           "name": "groupId"
+        },
+        {
+          "id": "12:8100373727744353980",
+          "name": "shop"
+        },
+        {
+          "id": "13:1807794737803967169",
+          "name": "available"
+        },
+        {
+          "id": "14:7472205444293814822",
+          "name": "image"
+        },
+        {
+          "id": "15:4366740687401342815",
+          "name": "video"
+        },
+        {
+          "id": "16:4929136922825449978",
+          "name": "availableMeals"
+        },
+        {
+          "id": "17:8292698264967788736",
+          "name": "recipe"
+        },
+        {
+          "id": "18:5838660730037572361",
+          "name": "ingredients"
+        },
+        {
+          "id": "19:5448704526429864056",
+          "name": "remarks"
         }
       ],
       "relations": []
     },
     {
       "id": "6:8773626543538239808",
-      "lastPropertyId": "6:1478788319118135673",
+      "lastPropertyId": "8:9134513983167030694",
       "name": "ItemCustomizationField",
       "properties": [
         {
@@ -178,24 +202,20 @@
           "name": "name"
         },
         {
-          "id": "4:4721447168274332179",
-          "name": "price"
-        },
-        {
-          "id": "5:6340519530372395296",
-          "name": "isSelected"
+          "id": "7:1387878133577339607",
+          "name": "cost"
         },
         {
-          "id": "6:1478788319118135673",
-          "indexId": "6:1418313063729064730",
-          "name": "customizationGroupId"
+          "id": "8:9134513983167030694",
+          "indexId": "8:8382399519732724393",
+          "name": "groupId"
         }
       ],
       "relations": []
     },
     {
       "id": "8:3006473999842963322",
-      "lastPropertyId": "3:1788703918471935416",
+      "lastPropertyId": "4:4976793404674944604",
       "name": "UserModel",
       "properties": [
         {
@@ -207,27 +227,37 @@
           "name": "username"
         },
         {
-          "id": "3:1788703918471935416",
-          "name": "imageUrl"
+          "id": "4:4976793404674944604",
+          "name": "profilePic"
         }
       ],
       "relations": []
     }
   ],
   "lastEntityId": "8:3006473999842963322",
-  "lastIndexId": "6:1418313063729064730",
+  "lastIndexId": "8:8382399519732724393",
   "lastRelationId": "0:0",
   "lastSequenceId": "0:0",
   "modelVersion": 4,
   "modelVersionParserMinimum": 4,
   "retiredEntityUids": [
     4431701432253560041
   ],
-  "retiredIndexUids": [],
+  "retiredIndexUids": [
+    3035713941381745113,
+    1418313063729064730
+  ],
   "retiredPropertyUids": [
     2380700835998941893,
     396444863511990148,
-    8121280058519918450
+    8121280058519918450,
+    2873565625349267435,
+    3849345501825238335,
+    4296191239800169373,
+    4721447168274332179,
+    6340519530372395296,
+    1478788319118135673,
+    1788703918471935416
   ],
   "retiredRelationUids": [],
   "version": 1