Fixed minor messages FC. Reverted chat bubbles. Fixed toolbar on Api …

…21-22. Updated dependencies
PhoenixDevTeam · Nov 1, 2019 · 687bcf0 · 687bcf0
1 parent 6bca487
commit 687bcf0
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "dev.ezorrio.phoenix"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 10400
-        versionName '1.0.4'
+        versionCode 10500
+        versionName '1.0.5'
 
         buildConfigField 'int', 'VK_API_APP_ID', getProps("vk_app_id")
         buildConfigField 'String', 'FCM_SENDER_ID', getProps("fcm_sender_id")
@@ -96,15 +96,15 @@ ext {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "com.google.android.material:material:1.1.0-beta01"
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
     implementation 'androidx.core:core:1.2.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
     implementation "androidx.viewpager:viewpager:1.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.drawerlayout:drawerlayout:1.0.0"
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.media:media:1.1.0'
-    implementation 'androidx.browser:browser:1.2.0-alpha08'
+    implementation 'androidx.browser:browser:1.2.0-alpha09'
     implementation "androidx.preference:preference:1.1.0"
     implementation "androidx.exifinterface:exifinterface:1.0.0"
     implementation 'com.squareup.picasso:picasso:2.71828'
@@ -113,13 +113,13 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.2.13'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation files('libs/YouTubeAndroidPlayerApi.jar')
-    implementation project(path: ':mvpcore', configuration: 'default')
+    implementation project(path: ':mvpcore')
     implementation "com.squareup.retrofit2:retrofit:$retrofitLibraryVersion"
     implementation "com.squareup.retrofit2:converter-gson:$retrofitLibraryVersion"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitLibraryVersion"
     implementation "com.squareup.okhttp3:okhttp:$okhttpLibraryVersion"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttpLibraryVersion"
-    implementation 'com.google.firebase:firebase-core:17.2.0'
+    implementation 'com.google.firebase:firebase-core:17.2.1'
     implementation 'com.google.firebase:firebase-database:19.2.0'
     implementation 'com.google.firebase:firebase-messaging:20.0.0'
     releaseImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'

diff --git a/app/src/main/java/biz/dealnote/messenger/view/emoji/EmojiconsPopup.java b/app/src/main/java/biz/dealnote/messenger/view/emoji/EmojiconsPopup.java
@@ -115,6 +115,9 @@ public boolean isKeyBoardOpen() {
         @Override
         public void onGlobalLayout() {
             Rect r = new Rect();
+            if (rootView == null){
+                return;
+            }
             rootView.getWindowVisibleDisplayFrame(r);
 
             int screenHeight = rootView.getRootView().getHeight();

diff --git a/app/src/main/res/layout/item_message_my.xml b/app/src/main/res/layout/item_message_my.xml
@@ -49,7 +49,7 @@
         app:arrowLocation="right"
         app:arrowPosition="12dp"
         app:arrowWidth="8dp"
-        app:bubbleColor="?colorPrimary">
+        app:bubbleColor="?message_bubble_color">
 
         <biz.dealnote.messenger.view.emoji.EmojiconTextView
             android:id="@+id/item_message_text"

diff --git a/app/src/main/res/layout/item_message_my_gift.xml b/app/src/main/res/layout/item_message_my_gift.xml
@@ -49,7 +49,7 @@
         app:arrowLocation="right"
         app:arrowPosition="12dp"
         app:arrowWidth="8dp"
-        app:bubbleColor="?colorPrimary">
+        app:bubbleColor="?message_bubble_color">
 
         <biz.dealnote.messenger.view.emoji.EmojiconTextView
             android:id="@+id/item_message_text"

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -78,19 +78,25 @@
     </style>
 
     <style name="Theme.Toolbar" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
-        <item name="android:tint">?colorOnSurface</item>
+        <!--        <item name="android:tint">?colorOnSurface</item>-->
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
         <item name="actionMenuTextColor">?colorOnSurface</item>
         <item name="android:textColorPrimary">?colorOnSurface</item>
         <item name="android:textColorSecondary">?colorOnSurface</item>
     </style>
 
     <style name="Theme.Toolbar.Surface" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
-        <item name="android:tint">?colorOnSurface</item>
+        <!--        <item name="android:tint">?colorOnSurface</item>-->
+        <item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
         <item name="actionMenuTextColor">?colorOnSurface</item>
         <item name="android:textColorPrimary">?colorOnSurface</item>
         <item name="android:textColorSecondary">?colorOnSurface</item>
     </style>
 
+    <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="tint">?colorOnSurface</item>
+    </style>
+
     <style name="TextAppearance.Toolbar.Title" parent="@style/TextAppearance.MaterialComponents.Headline6">
         <item name="android:textSize">18dp</item>
     </style>

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-beta01'
+        classpath 'com.android.tools.build:gradle:3.6.0-beta02'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath 'io.fabric.tools:gradle:1.31.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 13 11:57:28 MSK 2019
+#Fri Nov 01 00:18:57 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
diff --git a/mvpcore/build.gradle b/mvpcore/build.gradle
@@ -22,8 +22,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.activity:activity:1.1.0-beta01'
-    implementation 'androidx.fragment:fragment:1.2.0-beta02'
+    implementation 'androidx.activity:activity:1.1.0-rc01'
+    implementation 'androidx.fragment:fragment:1.2.0-rc01'
     implementation 'androidx.loader:loader:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }