Skip to content

Commit

Permalink
update support libs & fixed wrong checking when it should check for p…
Browse files Browse the repository at this point in the history
…arent fragment and not the presenter.
  • Loading branch information
Kosh committed Nov 23, 2016
1 parent 56a0dae commit 9ccbcb8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ interface View {

void onSignedIn(@NonNull GoogleSignInAccount account);


void onFirebaseUser(@NonNull FirebaseUser user);
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions color-picker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion "24.0.2"
buildToolsVersion "25.0.0"

defaultConfig {
minSdkVersion 18
Expand All @@ -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}"
Expand Down

0 comments on commit 9ccbcb8

Please sign in to comment.