Merge pull request #60 from Beldex-Coin/dev

Beldex-Coin · Nov 13, 2024 · 948df3f · 948df3f
2 parents 656615a + 812732e
commit 948df3f
Show file tree

Hide file tree

Showing 857 changed files with 56,623 additions and 18,335 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,13 +6,28 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'com.google.firebase.crashlytics'
 apply from: 'buildGradle/dependencies.gradle'
 
+dependencies {
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-graphics'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.ui:ui-text-android:1.6.6'
+    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+}
+
 configurations.all {
     exclude module: "commons-logging"
 }
-def canonicalVersionCode = 67
-def canonicalVersionName = "2.5.3"
+def canonicalVersionCode = 70
+def canonicalVersionName = "2.6.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -100,9 +115,29 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
+            firebaseCrashlytics {
+                // Enable processing and uploading of native symbols to Firebase servers.
+                // By default, this is disabled to improve build speeds.
+                // This flag must be enabled to see properly-symbolicated native
+                // stack traces in the Crashlytics dashboard.
+                nativeSymbolUploadEnabled true
+            }
+            manifestPlaceholders = [
+                    providerId: "io.beldex",
+                    appName: "BChat Messenger"
+            ]
+            buildConfigField "String", "providerId", "\"io.beldex\""
         }
         debug {
             minifyEnabled false
+            applicationIdSuffix '.debug'
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
+            manifestPlaceholders = [
+                    providerId: "io.beldex.debug",
+                    appName: "BChat Debug"
+            ]
+            buildConfigField "String", "providerId", "\"io.beldex.debug\""
         }
     }
 
@@ -165,7 +200,7 @@ android {
         buildConfig = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
+        kotlinCompilerExtensionVersion = "1.5.4"
     }
     externalNativeBuild {
         cmake {

diff --git a/app/buildGradle/dependencies.gradle b/app/buildGradle/dependencies.gradle
@@ -62,7 +62,6 @@ dependencies {
     }
     implementation 'com.annimon:stream:1.1.8'
     implementation project(':stickyheader')
-    //implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
     implementation 'com.github.dmytrodanylyk:android-morphing-button:1.0'
     implementation 'androidx.sqlite:sqlite-ktx:2.3.1'
     implementation 'net.zetetic:sqlcipher-android:4.5.4@aar'
@@ -73,7 +72,7 @@ dependencies {
     implementation project(":libsignal")
     implementation project(":libsession")
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion"
-    implementation "org.whispersystems:curve25519-java:$curve25519Version"
+    implementation "com.github.oxen-io.session-android-curve-25519:curve25519-java:$curve25519Version"
     implementation 'com.goterl:lazysodium-android:5.0.2@aar'
     implementation "net.java.dev.jna:jna:5.12.1@aar"
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
@@ -101,7 +100,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
     // Core library
-    androidTestImplementation 'androidx.test:core:1.4.0'
+    androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation('com.adevinta.android:barista:4.2.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
@@ -146,10 +145,10 @@ dependencies {
 
     implementation 'app.cash.copper:copper-flow:1.0.0'
     implementation 'com.google.code.gson:gson:2.8.7'
-    //implementation 'com.google.firebase:firebase-crash:16.2.1'
 
     //compose
     def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
+    def compose_nav_version = "2.5.3"
     implementation composeBom
     androidTestImplementation composeBom
     implementation 'androidx.compose.material3:material3'
@@ -160,14 +159,26 @@ dependencies {
     implementation 'androidx.compose.ui:ui-tooling-preview'
     debugImplementation 'androidx.compose.ui:ui-tooling'
     implementation 'androidx.compose.material:material-icons-extended'
+    implementation("androidx.navigation:navigation-compose:$composeNavVersion")
+    implementation("androidx.hilt:hilt-navigation-compose:$hiltNavigationCompose")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:$composeLifecyleRuntime")
     implementation("io.coil-kt:coil-compose:2.3.0")
 
     //firebase new dependency
     implementation(platform("com.google.firebase:firebase-bom:33.2.0"))
     implementation("com.google.firebase:firebase-config")
+    implementation("com.google.firebase:firebase-crashlytics")
     implementation("com.google.firebase:firebase-analytics")
+    implementation("com.google.firebase:firebase-crashlytics-ndk")
 
     //memory leak dependency
-//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+//  debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+    implementation ("com.airbnb.android:lottie-compose:4.0.0")
 
+    //Scan Qr
+    implementation "androidx.camera:camera-camera2:1.0.2"
+    implementation "androidx.camera:camera-lifecycle:1.0.2"
+    implementation "androidx.camera:camera-view:1.0.0-alpha31"
+
+    implementation 'com.google.zxing:core:3.3.3'
 }
diff --git a/app/google-services.json b/app/google-services.json
@@ -6,7 +6,6 @@
   },
   "client": [
     {
-
       "client_info": {
         "mobilesdk_app_id": "1:225838187372:android:0244af7e6e872d4690e949",
         "android_client_info": {
@@ -41,6 +40,42 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:225838187372:android:c2e9affc7c70ba4490e949",
+        "android_client_info": {
+          "package_name": "io.beldex.bchat.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "225838187372-i76je26pae593nib5c57vfcbnosi05un.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB4nd4ZajmzyfUNpqKyveeRYBDn6IqI27c"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "225838187372-i76je26pae593nib5c57vfcbnosi05un.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "225838187372-jsohmcnjmqjfj7c262rr3gpoeh11qomp.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.beldex.bchat"
+              }
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"

diff --git a/app/playMainNet/release/output-metadata.json b/app/playMainNet/release/output-metadata.json
@@ -11,22 +11,22 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 67,
-      "versionName": "2.5.3",
-      "outputFile": "Bchat-2.5.3-universal.apk"
+      "versionCode": 70,
+      "versionName": "2.6.0",
+      "outputFile": "Bchat-2.6.0-universal.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 67,
-      "versionName": "2.5.3",
-      "outputFile": "Bchat-2.5.3-armeabi-v7a.apk"
+      "versionCode": 70,
+      "versionName": "2.6.0",
+      "outputFile": "Bchat-2.6.0-arm64-v8a.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -37,22 +37,22 @@
         }
       ],
       "attributes": [],
-      "versionCode": 67,
-      "versionName": "2.5.3",
-      "outputFile": "Bchat-2.5.3-x86_64.apk"
+      "versionCode": 70,
+      "versionName": "2.6.0",
+      "outputFile": "Bchat-2.6.0-x86_64.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
-      "versionCode": 67,
-      "versionName": "2.5.3",
-      "outputFile": "Bchat-2.5.3-arm64-v8a.apk"
+      "versionCode": 70,
+      "versionName": "2.6.0",
+      "outputFile": "Bchat-2.6.0-armeabi-v7a.apk"
     }
   ],
   "elementType": "File"