diff --git a/app/build.gradle b/app/build.gradle index 871c86d..902b65f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ plugins { id 'kotlin-android' id 'kotlin-android-extensions' id 'kotlin-kapt' + id 'com.google.gms.google-services' id 'com.google.firebase.crashlytics' id 'com.google.firebase.firebase-perf' id 'org.jlleitschuh.gradle.ktlint' @@ -65,12 +66,6 @@ android { applicationIdSuffix = ".stg" manifestPlaceholders = [applicationName: "ProjectName-STG"] } - preProduct { - applicationIdSuffix = ".pre.prod" - manifestPlaceholders = [applicationName: "JC-ProjectName-PRD"] - versionCode build_versions.versionCodeRelease - versionName build_versions.versionNameRelease - } prd { manifestPlaceholders = [applicationName: "@string/app_name"] versionCode build_versions.versionCodeRelease @@ -98,10 +93,6 @@ android { buildTypes { debug { - ext.betaDistributionReleaseNotesFilePath = "release_notes.txt" - ext.betaDistributionGroupAliases = "QA3C" - ext.betaDistributionNotifications = true - applicationVariants.all { variant -> appendVersionNameVersionCode(variant) } } @@ -123,16 +114,12 @@ android { } applicationVariants.all { variant -> - def BASE_URL, CLIENT_ID, CLIENT_SECRET + def BASE_URL if (variant.buildType.isDebuggable()) { if (variant.flavorName.contains("stg")) { BASE_URL = "https://host.name.vn" - CLIENT_ID = "Android" - CLIENT_SECRET = "AndroidSecret" } else { BASE_URL = "https://4438b6c1.ngrok.io/" - CLIENT_ID = "Android" - CLIENT_SECRET = "AndroidSecret" } } else if (!System.getenv('CI')) { def signFile = file("../local.properties") @@ -143,8 +130,6 @@ android { } variant.buildConfigField "String", "BASE_URL", "\"${BASE_URL}\"" - variant.buildConfigField "String", "CLIENT_ID", "\"${CLIENT_ID}\"" - variant.buildConfigField "String", "CLIENT_SECRET", "\"${CLIENT_SECRET}\"" } } @@ -191,7 +176,7 @@ dependencies { kapt "com.google.dagger:dagger-android-processor:$versions.dagger2" // Import the BoM for the Firebase platform - implementation platform('com.google.firebase:firebase-bom:27.1.0') + implementation platform('com.google.firebase:firebase-bom:28.0.0') // Declare the dependencies for the Crashlytics and Analytics libraries // When using the BoM, you don't specify versions in Firebase library dependencies @@ -205,10 +190,6 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-core:$versions.espresso" } -repositories { - google() -} - ktlint { version = "0.37.0" android = true diff --git a/app/google-services.json b/app/google-services.json index f0d6e78..09499a3 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,41 +1,115 @@ { "project_info": { - "project_number": "478782649877", - "project_id": "picturepassword-b63c8", - "storage_bucket": "picturepassword-b63c8.appspot.com" + "project_number": "172896032281", + "project_id": "projectname-31ea2", + "storage_bucket": "projectname-31ea2.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:478782649877:android:cd8ae5d2e0ce6b04cc801c", + "mobilesdk_app_id": "1:172896032281:android:df29af0ecf67b2c503fc88", "android_client_info": { - "package_name": "com.ccc.projectnanme" + "package_name": "com.ccc.nameapp" } }, "oauth_client": [ { - "client_id": "478782649877-61shcaa97aj220fd9vip3q5ge35hbri1.apps.googleusercontent.com", + "client_id": "172896032281-sram0a913hcff3lgdsfhu9b1bjnqmgtj.apps.googleusercontent.com", "client_type": 1, "android_info": { - "package_name": "com.ccc.projectnanme", - "certificate_hash": "dfd612dcc63eb9e2ea02a3df9618dcd2d031227c" + "package_name": "com.ccc.nameapp", + "certificate_hash": "b9f56ba90349785fce3912ffedddccf0bc24cad2" } }, { - "client_id": "478782649877-fngfeecq1lf2e4avicebqko467p2aiv4.apps.googleusercontent.com", + "client_id": "172896032281-84n14ko19e3isu0hjv2ned7ud0i0qe6m.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyAsVmaoeAOmhkmj_YUrwPFtdeLZBuPOZik" + "current_key": "AIzaSyB7v5lTvysQS5Xg2-fU9hI3xAPA45UquZc" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "478782649877-fngfeecq1lf2e4avicebqko467p2aiv4.apps.googleusercontent.com", + "client_id": "172896032281-84n14ko19e3isu0hjv2ned7ud0i0qe6m.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:172896032281:android:2d0faa082e26550303fc88", + "android_client_info": { + "package_name": "com.ccc.nameapp.dev" + } + }, + "oauth_client": [ + { + "client_id": "172896032281-lvkd7p1shacokggkktmg23d1m6d3cbsf.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.ccc.nameapp.dev", + "certificate_hash": "b9f56ba90349785fce3912ffedddccf0bc24cad2" + } + }, + { + "client_id": "172896032281-84n14ko19e3isu0hjv2ned7ud0i0qe6m.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyB7v5lTvysQS5Xg2-fU9hI3xAPA45UquZc" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "172896032281-84n14ko19e3isu0hjv2ned7ud0i0qe6m.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:172896032281:android:1c2237d24d12c38403fc88", + "android_client_info": { + "package_name": "com.ccc.nameapp.stg" + } + }, + "oauth_client": [ + { + "client_id": "172896032281-9ghbddklbo99bec1s6fb1tgg0rs0m31b.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.ccc.nameapp.stg", + "certificate_hash": "b9f56ba90349785fce3912ffedddccf0bc24cad2" + } + }, + { + "client_id": "172896032281-84n14ko19e3isu0hjv2ned7ud0i0qe6m.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyB7v5lTvysQS5Xg2-fU9hI3xAPA45UquZc" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "172896032281-84n14ko19e3isu0hjv2ned7ud0i0qe6m.apps.googleusercontent.com", "client_type": 3 } ] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 40c1a8d..48d207a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,8 +29,8 @@ + android:name="firebase_performance_logcat_enabled" + android:value="true" /> diff --git a/app/src/main/java/com/ccc/nameapp/data/source/remote/service/RestfulApi.kt b/app/src/main/java/com/ccc/nameapp/data/source/remote/service/RestfulApi.kt index 39c32e3..d20906c 100644 --- a/app/src/main/java/com/ccc/nameapp/data/source/remote/service/RestfulApi.kt +++ b/app/src/main/java/com/ccc/nameapp/data/source/remote/service/RestfulApi.kt @@ -1,6 +1,5 @@ package com.ccc.nameapp.data.source.remote.service -import com.ccc.nameapp.BuildConfig import com.ccc.nameapp.data.model.Token import com.ccc.nameapp.data.source.remote.api.request.RefreshTokenRequest import io.reactivex.Single @@ -17,8 +16,6 @@ interface RestfulApi { @FormUrlEncoded fun loginWithEmailAndPassword( @Field("username") username: String, - @Field("password") password: String, - @Field("client_id") clientId: String = BuildConfig.CLIENT_ID, - @Field("client_secret") clientSecret: String = BuildConfig.CLIENT_SECRET + @Field("password") password: String ): Single } diff --git a/app/src/main/java/com/ccc/nameapp/scenes/login/main/MainLoginFragment.kt b/app/src/main/java/com/ccc/nameapp/scenes/login/main/MainLoginFragment.kt index f5aee32..50baf9b 100644 --- a/app/src/main/java/com/ccc/nameapp/scenes/login/main/MainLoginFragment.kt +++ b/app/src/main/java/com/ccc/nameapp/scenes/login/main/MainLoginFragment.kt @@ -88,7 +88,10 @@ class MainLoginFragment : DaggerFragment(), MainLoginView { } private fun handleEvents() { - mView.nextView.setOnClickListener { onNextClick() } + mView.nextView.setOnClickListener { + throw RuntimeException("Test Crash") // Force a crash + onNextClick() + } } private fun onNextClick() { diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 80dec00..aac7cc6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,9 +1,9 @@ - JobChat_Android_New + ProjectName yyyy/MM/dd - Đồng ý + Đồng ýF Hủy Từ chối Đóng diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 82ca840..5460d96 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - JobChat_Android_New + ProjectName yyyy/MM/dd diff --git a/gradle.properties b/gradle.properties index 23339e0..23fd297 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,3 +19,4 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +-Djavax.net.ssl.trustStore=/path/to/truststore -Djavax.net.ssl.trustStorePassword=password