From f39614581d30929606e9a883f2309f4edfa406bc Mon Sep 17 00:00:00 2001 From: John Date: Mon, 4 Nov 2019 11:54:44 -0500 Subject: [PATCH 1/2] updating dependencies --- .idea/caches/build_file_checksums.ser | Bin 0 -> 542 bytes .idea/codeStyles/Project.xml | 134 ++++++++++++++---- .idea/misc.xml | 21 ++- .idea/modules.xml | 2 + .idea/vcs.xml | 6 + app/build.gradle | 54 ++++--- .../firemessage/ExampleInstrumentedTest.kt | 4 +- .../com/resocoder/firemessage/ChatActivity.kt | 8 +- .../com/resocoder/firemessage/MainActivity.kt | 6 +- .../resocoder/firemessage/SignInActivity.kt | 2 +- .../resocoder/firemessage/SplashActivity.kt | 2 +- .../firemessage/fragment/MyAccountFragment.kt | 10 +- .../firemessage/fragment/PeopleFragment.kt | 4 +- .../recyclerview/item/ImageMessageItem.kt | 4 +- .../recyclerview/item/PersonItem.kt | 4 +- app/src/main/res/layout/activity_chat.xml | 10 +- app/src/main/res/layout/activity_main.xml | 6 +- app/src/main/res/layout/activity_sign_in.xml | 4 +- .../main/res/layout/fragment_my_account.xml | 8 +- app/src/main/res/layout/fragment_people.xml | 2 +- app/src/main/res/layout/item_person.xml | 4 +- build.gradle | 6 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- 24 files changed, 211 insertions(+), 96 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/vcs.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..9eddab0ddfd3aae35bdba0a774e624dba49e5521 GIT binary patch literal 542 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7e*3Zh%$V*AhNlY#(teOO008Iiz`Xzf literal 0 HcmV?d00001 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 30aa626..ae78c11 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,29 +1,113 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fee3a84..a7923b5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,26 +5,41 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 6ce791f..4793e17 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,8 @@ + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c89f8cb..41aef94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,14 +5,15 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 27 + compileSdkVersion 29 defaultConfig { applicationId "com.resocoder.firemessage" minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion 29 + versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } buildTypes { @@ -26,32 +27,33 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' - implementation 'com.android.support:support-vector-drawable:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:customtabs:27.1.1' + //noinspection GradleCompatible + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.vectordrawable:vectordrawable:1.1.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.browser:browser:1.0.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' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' //anko implementation "org.jetbrains.anko:anko:$anko_version" implementation "org.jetbrains.anko:anko-design:$anko_version" implementation "org.jetbrains.anko:anko-coroutines:$anko_version" //firebase - implementation 'com.google.firebase:firebase-core:15.0.2' - implementation 'com.google.firebase:firebase-firestore:16.0.0' - implementation 'com.google.firebase:firebase-auth:15.1.0' - implementation 'com.firebaseui:firebase-ui-auth:3.3.1' - implementation 'com.google.firebase:firebase-storage:15.0.2' - implementation 'com.firebaseui:firebase-ui-storage:3.3.1' - implementation 'com.google.android.gms:play-services-auth:15.0.1' - implementation 'com.google.firebase:firebase-messaging:15.0.2' + implementation 'com.google.firebase:firebase-core:17.2.1' + implementation 'com.google.firebase:firebase-firestore:21.2.1' + implementation 'com.google.firebase:firebase-auth:19.1.0' + implementation 'com.firebaseui:firebase-ui-auth:4.3.2' + implementation 'com.google.firebase:firebase-storage:19.1.0' + implementation 'com.firebaseui:firebase-ui-storage:4.3.2' + implementation 'com.google.android.gms:play-services-auth:17.0.0' + implementation 'com.google.firebase:firebase-messaging:20.0.0' //glide - implementation 'com.github.bumptech.glide:glide:4.6.1' - kapt 'com.github.bumptech.glide:compiler:4.6.1' + implementation 'com.github.bumptech.glide:glide:4.10.0' + implementation 'com.github.bumptech.glide:compiler:4.10.0' //groupie implementation 'com.xwray:groupie:2.0.3' implementation 'com.xwray:groupie-kotlin-android-extensions:2.0.3' @@ -60,6 +62,14 @@ dependencies { //kotlin annotation processor apply plugin: 'kotlin-kapt' + + + //glide + def glide_version = "4.10.0" + implementation "com.github.bumptech.glide:glide:$glide_version" + annotationProcessor "com.github.bumptech.glide:compiler:$glide_version" + + kotlin { experimental { coroutines "enable" diff --git a/app/src/androidTest/java/com/resocoder/firemessage/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/resocoder/firemessage/ExampleInstrumentedTest.kt index 7f3feaf..7bfc3e2 100644 --- a/app/src/androidTest/java/com/resocoder/firemessage/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/resocoder/firemessage/ExampleInstrumentedTest.kt @@ -1,7 +1,7 @@ package com.resocoder.firemessage -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/main/java/com/resocoder/firemessage/ChatActivity.kt b/app/src/main/java/com/resocoder/firemessage/ChatActivity.kt index 8c9a47e..9ef4682 100644 --- a/app/src/main/java/com/resocoder/firemessage/ChatActivity.kt +++ b/app/src/main/java/com/resocoder/firemessage/ChatActivity.kt @@ -3,10 +3,10 @@ package com.resocoder.firemessage import android.app.Activity import android.content.Intent import android.graphics.Bitmap -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.provider.MediaStore -import android.support.v7.widget.LinearLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager import com.google.firebase.auth.FirebaseAuth import com.google.firebase.firestore.ListenerRegistration import com.resocoder.firemessage.model.ImageMessage @@ -20,8 +20,6 @@ import com.xwray.groupie.Section import com.xwray.groupie.kotlinandroidextensions.Item import com.xwray.groupie.kotlinandroidextensions.ViewHolder import kotlinx.android.synthetic.main.activity_chat.* -import org.jetbrains.anko.startActivityForResult -import org.jetbrains.anko.toast import java.io.ByteArrayOutputStream import java.util.* @@ -116,6 +114,6 @@ class ChatActivity : AppCompatActivity() { else updateItems() - recycler_view_messages.scrollToPosition(recycler_view_messages.adapter.itemCount - 1) + recycler_view_messages.scrollToPosition(recycler_view_messages.adapter!!.itemCount - 1) } } diff --git a/app/src/main/java/com/resocoder/firemessage/MainActivity.kt b/app/src/main/java/com/resocoder/firemessage/MainActivity.kt index 24e3f45..90b7d15 100644 --- a/app/src/main/java/com/resocoder/firemessage/MainActivity.kt +++ b/app/src/main/java/com/resocoder/firemessage/MainActivity.kt @@ -2,9 +2,9 @@ package com.resocoder.firemessage import android.annotation.SuppressLint import android.os.Bundle -import android.support.design.widget.BottomNavigationView -import android.support.v4.app.Fragment -import android.support.v7.app.AppCompatActivity +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.fragment.app.Fragment +import androidx.appcompat.app.AppCompatActivity import com.resocoder.firemessage.fragment.MyAccountFragment import com.resocoder.firemessage.fragment.PeopleFragment import kotlinx.android.synthetic.main.activity_main.* diff --git a/app/src/main/java/com/resocoder/firemessage/SignInActivity.kt b/app/src/main/java/com/resocoder/firemessage/SignInActivity.kt index 384b705..b94afb9 100644 --- a/app/src/main/java/com/resocoder/firemessage/SignInActivity.kt +++ b/app/src/main/java/com/resocoder/firemessage/SignInActivity.kt @@ -2,7 +2,7 @@ package com.resocoder.firemessage import android.app.Activity import android.content.Intent -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import com.firebase.ui.auth.AuthUI import com.firebase.ui.auth.ErrorCodes diff --git a/app/src/main/java/com/resocoder/firemessage/SplashActivity.kt b/app/src/main/java/com/resocoder/firemessage/SplashActivity.kt index ec7cc98..cec7407 100644 --- a/app/src/main/java/com/resocoder/firemessage/SplashActivity.kt +++ b/app/src/main/java/com/resocoder/firemessage/SplashActivity.kt @@ -1,6 +1,6 @@ package com.resocoder.firemessage -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import com.google.firebase.auth.FirebaseAuth import org.jetbrains.anko.startActivity diff --git a/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt b/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt index 98b9e33..0023f80 100644 --- a/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt +++ b/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.graphics.Bitmap import android.os.Bundle import android.provider.MediaStore -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,10 +14,8 @@ import com.firebase.ui.auth.AuthUI import com.resocoder.firemessage.R import com.resocoder.firemessage.SignInActivity -import com.resocoder.firemessage.glide.GlideApp import com.resocoder.firemessage.util.FirestoreUtil import com.resocoder.firemessage.util.StorageUtil -import kotlinx.android.synthetic.main.fragment_my_account.* import kotlinx.android.synthetic.main.fragment_my_account.view.* import org.jetbrains.anko.clearTask import org.jetbrains.anko.newTask @@ -81,9 +79,9 @@ class MyAccountFragment : Fragment() { selectedImageBmp.compress(Bitmap.CompressFormat.JPEG, 90, outputStream) selectedImageBytes = outputStream.toByteArray() - GlideApp.with(this) + Glide.with(this@MyAccountFragment.context!!) .load(selectedImageBytes) - .into(imageView_profile_picture) + .into(image) pictureJustChanged = true } @@ -96,7 +94,7 @@ class MyAccountFragment : Fragment() { editText_name.setText(user.name) editText_bio.setText(user.bio) if (!pictureJustChanged && user.profilePicturePath != null) - GlideApp.with(this) + Glide.with(this) .load(StorageUtil.pathToReference(user.profilePicturePath)) .placeholder(R.drawable.ic_account_circle_black_24dp) .into(imageView_profile_picture) diff --git a/app/src/main/java/com/resocoder/firemessage/fragment/PeopleFragment.kt b/app/src/main/java/com/resocoder/firemessage/fragment/PeopleFragment.kt index 3ffb8b5..1da6ce5 100644 --- a/app/src/main/java/com/resocoder/firemessage/fragment/PeopleFragment.kt +++ b/app/src/main/java/com/resocoder/firemessage/fragment/PeopleFragment.kt @@ -2,8 +2,8 @@ package com.resocoder.firemessage.fragment import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/java/com/resocoder/firemessage/recyclerview/item/ImageMessageItem.kt b/app/src/main/java/com/resocoder/firemessage/recyclerview/item/ImageMessageItem.kt index e88e471..e1b09b5 100644 --- a/app/src/main/java/com/resocoder/firemessage/recyclerview/item/ImageMessageItem.kt +++ b/app/src/main/java/com/resocoder/firemessage/recyclerview/item/ImageMessageItem.kt @@ -1,8 +1,8 @@ package com.resocoder.firemessage.recyclerview.item import android.content.Context +import com.bumptech.glide.Glide import com.resocoder.firemessage.R -import com.resocoder.firemessage.glide.GlideApp import com.resocoder.firemessage.model.ImageMessage import com.resocoder.firemessage.util.StorageUtil import com.xwray.groupie.kotlinandroidextensions.ViewHolder @@ -15,7 +15,7 @@ class ImageMessageItem(val message: ImageMessage, override fun bind(viewHolder: ViewHolder, position: Int) { super.bind(viewHolder, position) - GlideApp.with(context) + Glide.with(context) .load(StorageUtil.pathToReference(message.imagePath)) .placeholder(R.drawable.ic_image_black_24dp) .into(viewHolder.imageView_message_image) diff --git a/app/src/main/java/com/resocoder/firemessage/recyclerview/item/PersonItem.kt b/app/src/main/java/com/resocoder/firemessage/recyclerview/item/PersonItem.kt index 20dd83c..45179ca 100644 --- a/app/src/main/java/com/resocoder/firemessage/recyclerview/item/PersonItem.kt +++ b/app/src/main/java/com/resocoder/firemessage/recyclerview/item/PersonItem.kt @@ -1,8 +1,8 @@ package com.resocoder.firemessage.recyclerview.item import android.content.Context +import com.bumptech.glide.Glide import com.resocoder.firemessage.R -import com.resocoder.firemessage.glide.GlideApp import com.resocoder.firemessage.model.User import com.resocoder.firemessage.util.StorageUtil import com.xwray.groupie.kotlinandroidextensions.Item @@ -19,7 +19,7 @@ class PersonItem(val person: User, viewHolder.textView_name.text = person.name viewHolder.textView_bio.text = person.bio if (person.profilePicturePath != null) - GlideApp.with(context) + Glide.with(context) .load(StorageUtil.pathToReference(person.profilePicturePath)) .placeholder(R.drawable.ic_account_circle_black_24dp) .into(viewHolder.imageView_profile_picture) diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml index a094184..a86bf1d 100644 --- a/app/src/main/res/layout/activity_chat.xml +++ b/app/src/main/res/layout/activity_chat.xml @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 857d069..b71db60 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml index d209f80..629e2b5 100644 --- a/app/src/main/res/layout/activity_sign_in.xml +++ b/app/src/main/res/layout/activity_sign_in.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/fragment_my_account.xml b/app/src/main/res/layout/fragment_my_account.xml index 413370c..3168064 100644 --- a/app/src/main/res/layout/fragment_my_account.xml +++ b/app/src/main/res/layout/fragment_my_account.xml @@ -1,4 +1,4 @@ - - - - + diff --git a/app/src/main/res/layout/fragment_people.xml b/app/src/main/res/layout/fragment_people.xml index e6e6c0b..cf22070 100644 --- a/app/src/main/res/layout/fragment_people.xml +++ b/app/src/main/res/layout/fragment_people.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" tools:context="com.resocoder.firemessage.fragment.PeopleFragment"> - diff --git a/app/src/main/res/layout/item_person.xml b/app/src/main/res/layout/item_person.xml index f9cdcd3..038ac51 100644 --- a/app/src/main/res/layout/item_person.xml +++ b/app/src/main/res/layout/item_person.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 51fc795..6360833 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.3.50' ext.anko_version='0.10.4' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:3.2.0' + classpath 'com.google.gms:google-services:4.3.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 99da77f..babfff9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 29 21:19:27 CEST 2018 +#Sun Nov 03 19:47:25 EST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip From d28cfbf3ad71c2dc96d55c5a45f3f478a5de5194 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 4 Nov 2019 11:54:48 -0500 Subject: [PATCH 2/2] Update MyAccountFragment.kt --- .../java/com/resocoder/firemessage/fragment/MyAccountFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt b/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt index 0023f80..5a6dff4 100644 --- a/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt +++ b/app/src/main/java/com/resocoder/firemessage/fragment/MyAccountFragment.kt @@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.bumptech.glide.Glide import com.firebase.ui.auth.AuthUI import com.resocoder.firemessage.R