From f44c3620b96bde3362f4d25a333e7e5d52f401f6 Mon Sep 17 00:00:00 2001 From: Bogdan Kornev Date: Wed, 19 Sep 2018 17:26:43 +0300 Subject: [PATCH] fix npe when adapter is not yet set --- README.md | 2 +- bubblepagerindicator/build.gradle | 2 +- .../com/shuhart/bubblepagerindicator/BubblePageIndicator.java | 2 +- .../com/shuhart/bubblepagerindicator/sample/BlankActivity.java | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9633c35..1868272 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Usage ----- 1. Add jcenter() to repositories block in your gradle file. -2. Add `implementation 'com.shuhart.bubblepagerindicator:bubblepagerindicator:1.1.0'` to your dependencies. +2. Add `implementation 'com.shuhart.bubblepagerindicator:bubblepagerindicator:1.1.1'` to your dependencies. 3. Add `BubblePageIndicator` into your layouts or view hierarchy: ```xml diff --git a/bubblepagerindicator/build.gradle b/bubblepagerindicator/build.gradle index 907b08b..0571689 100644 --- a/bubblepagerindicator/build.gradle +++ b/bubblepagerindicator/build.gradle @@ -15,7 +15,7 @@ ext { siteUrl = 'https://github.com/shuhart/BubblePagerIndicator' gitUrl = 'https://github.com/shuhart/BubblePagerIndicator.git' - libraryVersion = '1.1.0' + libraryVersion = '1.1.1' developerId = 'shuhart' developerName = 'Redrick Shuhart' diff --git a/bubblepagerindicator/src/main/java/com/shuhart/bubblepagerindicator/BubblePageIndicator.java b/bubblepagerindicator/src/main/java/com/shuhart/bubblepagerindicator/BubblePageIndicator.java index 5f0ba71..7ab6099 100644 --- a/bubblepagerindicator/src/main/java/com/shuhart/bubblepagerindicator/BubblePageIndicator.java +++ b/bubblepagerindicator/src/main/java/com/shuhart/bubblepagerindicator/BubblePageIndicator.java @@ -182,7 +182,7 @@ public float getRadius() { @Override protected int getCount() { - return viewPager.getAdapter().getCount(); + return viewPager.getAdapter() == null ? 0 : viewPager.getAdapter().getCount(); } @Override diff --git a/sample/src/main/java/com/shuhart/bubblepagerindicator/sample/BlankActivity.java b/sample/src/main/java/com/shuhart/bubblepagerindicator/sample/BlankActivity.java index 33006b5..1abc506 100644 --- a/sample/src/main/java/com/shuhart/bubblepagerindicator/sample/BlankActivity.java +++ b/sample/src/main/java/com/shuhart/bubblepagerindicator/sample/BlankActivity.java @@ -4,7 +4,6 @@ import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.View; public class BlankActivity extends AppCompatActivity { @@ -13,8 +12,6 @@ public class BlankActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_blank); - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() {