From 9ccbcb8522c3ae9efbf8550e62c7deaa1ba7e532 Mon Sep 17 00:00:00 2001 From: Kosh Date: Wed, 23 Nov 2016 22:02:58 +0800 Subject: [PATCH] update support libs & fixed wrong checking when it should check for parent fragment and not the presenter. --- app/build.gradle | 4 ++-- .../ui/modules/apps/folders/create/CreateFolderView.java | 2 +- .../java/com/fastaccess/ui/modules/cloud/auth/LoginMvp.java | 1 - build.gradle | 2 +- color-picker/build.gradle | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b802f9f..04a213f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,8 +55,8 @@ repositories { } dependencies { ext { - supportVerion = "25.0.0" - firebase = "9.8.0" + supportVerion = "25.0.1" + firebase = "10.0.0" } compile fileTree(include: ['*.jar'], dir: 'libs') compile "com.android.support:appcompat-v7:${supportVerion}" diff --git a/app/src/main/java/com/fastaccess/ui/modules/apps/folders/create/CreateFolderView.java b/app/src/main/java/com/fastaccess/ui/modules/apps/folders/create/CreateFolderView.java index 493c070..0a9b035 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/apps/folders/create/CreateFolderView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/apps/folders/create/CreateFolderView.java @@ -101,7 +101,7 @@ public static CreateFolderView newInstance(long folderId) { @Override public void onAttach(Context context) { super.onAttach(context); - if (getPresenter() != null && getParentFragment() instanceof OnNotifyFoldersAdapter) { + if (getParentFragment() != null && getParentFragment() instanceof OnNotifyFoldersAdapter) { callback = (OnNotifyFoldersAdapter) getParentFragment(); } else if (context instanceof OnNotifyFoldersAdapter) { callback = (OnNotifyFoldersAdapter) context; diff --git a/app/src/main/java/com/fastaccess/ui/modules/cloud/auth/LoginMvp.java b/app/src/main/java/com/fastaccess/ui/modules/cloud/auth/LoginMvp.java index 4db8482..a856068 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/cloud/auth/LoginMvp.java +++ b/app/src/main/java/com/fastaccess/ui/modules/cloud/auth/LoginMvp.java @@ -33,7 +33,6 @@ interface View { void onSignedIn(@NonNull GoogleSignInAccount account); - void onFirebaseUser(@NonNull FirebaseUser user); } diff --git a/build.gradle b/build.gradle index db6c0c0..ea71441 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.0-alpha2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.google.gms:google-services:3.0.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/color-picker/build.gradle b/color-picker/build.gradle index 0c87afb..1394fa3 100755 --- a/color-picker/build.gradle +++ b/color-picker/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "24.0.2" + buildToolsVersion "25.0.0" defaultConfig { minSdkVersion 18 @@ -21,7 +21,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - ext { supportVerion = "25.0.0" } + ext { supportVerion = "25.0.1" } compile "com.android.support:appcompat-v7:${supportVerion}" compile "com.android.support:design:${supportVerion}" compile "com.android.support:preference-v14:${supportVerion}"