Merge pull request #565 from UseHover/qa

v1.12.16(174)
UseHover · Aug 16, 2022 · 617a5b9 · 617a5b9
2 parents 09c00b6 + c03f3e4
commit 617a5b9
Show file tree

Hide file tree

Showing 205 changed files with 3,655 additions and 3,840 deletions.
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,14 +39,14 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    compileSdk 31
+    compileSdk 32
 
     defaultConfig {
         applicationId "com.hover.stax"
         minSdk 21
-        targetSdk 31
-        versionCode 157
-        versionName "1.11.17"
+        targetSdk 32
+        versionCode 174
+        versionName "1.12.16"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -66,7 +66,6 @@ android {
 
     kotlinOptions {
         jvmTarget = "1.8"
-        useIR = true
     }
 
     buildTypes {
@@ -125,19 +124,18 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "androidx.biometric:biometric:1.1.0"
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
     implementation 'androidx.work:work-runtime-ktx:2.7.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
-    kapt "androidx.lifecycle:lifecycle-common-java8:2.4.1"
-
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.activity:activity-compose:1.5.1'
+    kapt "androidx.lifecycle:lifecycle-common-java8:2.5.1"
+    implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
@@ -146,12 +144,19 @@ dependencies {
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
+    implementation "androidx.compose.ui:ui-viewbinding:$compose_version"
+    implementation 'androidx.compose.runtime:runtime-livedata:1.3.0-alpha02'
+    implementation 'com.google.accompanist:accompanist-drawablepainter:0.25.1'
 
     //logging
     implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation 'com.uxcam:uxcam:3.4.2@aar'
+    implementation 'com.amplitude:android-sdk:3.35.1'
+    implementation 'com.appsflyer:af-android-sdk:6.8.0'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
 
     // Firebase
-    implementation platform('com.google.firebase:firebase-bom:28.4.0')
+    implementation platform('com.google.firebase:firebase-bom:30.3.2')
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-messaging'
@@ -161,48 +166,41 @@ dependencies {
     implementation 'com.google.android.play:core:1.10.3'
     implementation 'com.google.firebase:firebase-perf'
     implementation 'com.google.firebase:firebase-firestore-ktx'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4'
 
     //auth
     implementation 'com.google.android.gms:play-services-auth:20.2.0'
     implementation 'com.google.firebase:firebase-auth-ktx'
 
-    implementation 'com.amplitude:android-sdk:3.35.1'
     implementation "com.squareup.okhttp3:okhttp:4.9.3"
-    implementation "com.googlecode.libphonenumber:libphonenumber:8.12.50"
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.53'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
-    implementation 'com.appsflyer:af-android-sdk:6.6.1'
-    implementation 'com.android.installreferrer:installreferrer:2.2'
 
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     kapt 'com.github.bumptech.glide:compiler:4.13.2'
+    implementation "io.coil-kt:coil-compose:2.1.0"
 
-    def roomVersion = "2.4.2"
-    implementation "androidx.room:room-ktx:$roomVersion"
-    implementation "androidx.room:room-runtime:$roomVersion"
-    kapt "androidx.room:room-compiler:$roomVersion"
-    androidTestImplementation "androidx.room:room-testing:$roomVersion"
+    implementation "androidx.room:room-ktx:$room_version"
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    androidTestImplementation "androidx.room:room-testing:$room_version"
 
     implementation "androidx.core:core-ktx:1.8.0"
-    implementation "io.grpc:grpc-okhttp:1.44.1"
+    implementation 'io.grpc:grpc-okhttp:1.48.1'
 
     //di
-    def koin_version= "3.1.5"
     implementation "io.insert-koin:koin-android:$koin_version"
+    implementation "io.insert-koin:koin-androidx-compose:$koin_version"
 
     // Tests
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Hover SDK
-    debugImplementation project(":hover.sdk")
-    def sdk_version = "2.0.0-stax-1.11.0-pro"
-
-    // UXCam
-    implementation 'com.uxcam:uxcam:3.3.7@aar'
-
+    def sdk_version = "2.0.0-stax-1.12.14-pro"
     releaseImplementation "com.hover:android-sdk:$sdk_version"
-
+    debugImplementation project(":hover.sdk")
     debugImplementation 'com.android.volley:volley:1.2.1'
     debugImplementation 'com.google.android.gms:play-services-analytics:18.0.1'
     debugImplementation 'com.squareup.picasso:picasso:2.71828'
@@ -211,4 +209,5 @@ dependencies {
     //compose
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+
 }
diff --git a/app/schemas/com.hover.stax.database.AppDatabase/32.json b/app/schemas/com.hover.stax.database.AppDatabase/32.json
@@ -2,11 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 32,
-<<<<<<< HEAD
-    "identityHash": "7b995a5aacc2674bda5a1d44694c68b0",
-=======
     "identityHash": "e9dc3dbe16f88faa4d9a646e8503ec05",
->>>>>>> development
     "entities": [
       {
         "tableName": "channels",
@@ -130,11 +126,7 @@
       },
       {
         "tableName": "stax_transactions",
-<<<<<<< HEAD
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT NOT NULL, `action_id` TEXT NOT NULL, `environment` INTEGER NOT NULL DEFAULT 0, `transaction_type` TEXT NOT NULL, `channel_id` INTEGER NOT NULL, `status` TEXT NOT NULL DEFAULT 'pending', `category` TEXT, `initiated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `description` TEXT, `amount` REAL, `fee` REAL, `confirm_code` TEXT, `recipient_id` TEXT, `balance` TEXT, `counterparty` TEXT)",
-=======
         "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT NOT NULL, `action_id` TEXT NOT NULL, `environment` INTEGER NOT NULL DEFAULT 0, `transaction_type` TEXT NOT NULL, `channel_id` INTEGER NOT NULL, `status` TEXT NOT NULL DEFAULT 'pending', `initiated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `description` TEXT, `amount` REAL, `fee` REAL, `confirm_code` TEXT, `recipient_id` TEXT, `category` TEXT, `counterparty` TEXT)",
->>>>>>> development
         "fields": [
           {
             "fieldPath": "id",
@@ -181,15 +173,6 @@
             "defaultValue": "'pending'"
           },
           {
-<<<<<<< HEAD
-            "fieldPath": "category",
-            "columnName": "category",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-=======
->>>>>>> development
             "fieldPath": "initiated_at",
             "columnName": "initiated_at",
             "affinity": "INTEGER",
@@ -234,13 +217,8 @@
             "notNull": false
           },
           {
-<<<<<<< HEAD
-            "fieldPath": "balance",
-            "columnName": "balance",
-=======
             "fieldPath": "category",
             "columnName": "category",
->>>>>>> development
             "affinity": "TEXT",
             "notNull": false
           },
@@ -505,8 +483,6 @@
         },
         "indices": [],
         "foreignKeys": []
-<<<<<<< HEAD
-=======
       },
       {
         "tableName": "accounts",
@@ -603,17 +579,12 @@
             ]
           }
         ]
->>>>>>> development
       }
     ],
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-<<<<<<< HEAD
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7b995a5aacc2674bda5a1d44694c68b0')"
-=======
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e9dc3dbe16f88faa4d9a646e8503ec05')"
->>>>>>> development
     ]
   }
 }
diff --git a/app/schemas/com.hover.stax.database.AppDatabase/33.json b/app/schemas/com.hover.stax.database.AppDatabase/33.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 33,
-    "identityHash": "4ce93c73680a412f95390c6e41575c61",
+    "identityHash": "5da73f0f0303be4fe1af75bd8911fa71",
     "entities": [
       {
         "tableName": "channels",
@@ -126,7 +126,7 @@
       },
       {
         "tableName": "stax_transactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT NOT NULL, `action_id` TEXT NOT NULL, `environment` INTEGER NOT NULL DEFAULT 0, `transaction_type` TEXT NOT NULL, `channel_id` INTEGER NOT NULL, `status` TEXT NOT NULL DEFAULT 'pending', `initiated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `description` TEXT, `amount` REAL, `fee` REAL, `confirm_code` TEXT, `recipient_id` TEXT, `category` TEXT, `account_id` INTEGER, `counterparty` TEXT)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uuid` TEXT NOT NULL, `action_id` TEXT NOT NULL, `environment` INTEGER NOT NULL DEFAULT 0, `transaction_type` TEXT NOT NULL, `channel_id` INTEGER NOT NULL, `status` TEXT NOT NULL DEFAULT 'pending', `initiated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, `description` TEXT, `amount` REAL, `fee` REAL, `confirm_code` TEXT, `recipient_id` TEXT, `category` TEXT, `counterparty` TEXT)",
         "fields": [
           {
             "fieldPath": "id",
@@ -222,12 +222,6 @@
             "affinity": "TEXT",
             "notNull": false
           },
-          {
-            "fieldPath": "accountId",
-            "columnName": "account_id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
           {
             "fieldPath": "counterparty",
             "columnName": "counterparty",
@@ -492,7 +486,7 @@
       },
       {
         "tableName": "accounts",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `alias` TEXT, `logo_url` TEXT NOT NULL, `account_no` TEXT, `channelId` INTEGER NOT NULL, `primary_color_hex` TEXT NOT NULL, `secondary_color_hex` TEXT NOT NULL, `isDefault` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `latestBalance` TEXT, `latestBalanceTimestamp` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(`channelId`) REFERENCES `channels`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `alias` TEXT NOT NULL, `logo_url` TEXT NOT NULL, `account_no` TEXT, `channelId` INTEGER NOT NULL, `primary_color_hex` TEXT NOT NULL, `secondary_color_hex` TEXT NOT NULL, `isDefault` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `latestBalance` TEXT, `latestBalanceTimestamp` INTEGER NOT NULL DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(`channelId`) REFERENCES `channels`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "name",
@@ -504,7 +498,7 @@
             "fieldPath": "alias",
             "columnName": "alias",
             "affinity": "TEXT",
-            "notNull": false
+            "notNull": true
           },
           {
             "fieldPath": "logoUrl",
@@ -596,7 +590,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4ce93c73680a412f95390c6e41575c61')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5da73f0f0303be4fe1af75bd8911fa71')"
     ]
   }
 }