diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index bd586ccc..751a6284 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/dictionaries/Stardust.xml b/.idea/dictionaries/Stardust.xml index 56bd1478..09ec5769 100644 --- a/.idea/dictionaries/Stardust.xml +++ b/.idea/dictionaries/Stardust.xml @@ -4,6 +4,7 @@ autojs capturer dismissable + downvote fileprovider flowable imgproc @@ -16,6 +17,7 @@ storages tasker uncheck + upvote \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 469cf22f..a7085fde 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,6 +99,8 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testImplementation 'junit:junit:4.12' + // Kotlin + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.1" // Android Annotations annotationProcessor "org.androidannotations:androidannotations:$AAVersion" implementation "org.androidannotations:androidannotations-api:$AAVersion" @@ -148,6 +150,7 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0' + implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' //Glide implementation('com.github.bumptech.glide:glide:4.8.0', { exclude group: 'com.android.support' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fa798b90..2b708db8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -106,7 +106,9 @@ android:name=".ui.user.RegisterActivity_" android:windowSoftInputMode="adjustResize"/> - +