diff --git a/app/src/main/res/drawable/call_background_stroke.xml b/app/src/main/res/drawable/call_background_stroke.xml
index d8995de..8ddd33c 100644
--- a/app/src/main/res/drawable/call_background_stroke.xml
+++ b/app/src/main/res/drawable/call_background_stroke.xml
@@ -5,5 +5,5 @@
android:width="3dp"
android:color="@color/green_active" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/photos_background_stroke.xml b/app/src/main/res/drawable/photos_background_stroke.xml
index 653ab10..0dfa652 100644
--- a/app/src/main/res/drawable/photos_background_stroke.xml
+++ b/app/src/main/res/drawable/photos_background_stroke.xml
@@ -5,5 +5,5 @@
android:width="3dp"
android:color="@color/purple_active" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_rect_white.xml b/app/src/main/res/drawable/rounded_rect_white.xml
index 2573a80..e241cbb 100644
--- a/app/src/main/res/drawable/rounded_rect_white.xml
+++ b/app/src/main/res/drawable/rounded_rect_white.xml
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shop_background_stroke.xml b/app/src/main/res/drawable/shop_background_stroke.xml
index f9115cb..3ae03c0 100644
--- a/app/src/main/res/drawable/shop_background_stroke.xml
+++ b/app/src/main/res/drawable/shop_background_stroke.xml
@@ -5,5 +5,5 @@
android:width="3dp"
android:color="@color/blue_active" />
-
+
\ No newline at end of file
diff --git a/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleItem.java b/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleItem.java
index 4185985..1252737 100644
--- a/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleItem.java
+++ b/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleItem.java
@@ -23,6 +23,7 @@ class BubbleToggleItem {
private String title = "";
private int colorActive = Color.BLUE;
+ private int titleColorActive = colorActive;
private int colorInactive = Color.BLACK;
private int shapeColor = Integer.MIN_VALUE;
@@ -72,6 +73,14 @@ void setTitle(String title) {
this.title = title;
}
+ int getTitleColorActive() {
+ return titleColorActive;
+ }
+
+ void setTitleColorActive(int titleColorActive) {
+ this.titleColorActive = titleColorActive;
+ }
+
int getColorActive() {
return colorActive;
}
diff --git a/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleView.java b/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleView.java
index a511477..17a63ae 100644
--- a/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleView.java
+++ b/bubblenavigation/src/main/java/com/gauravk/bubblenavigation/BubbleToggleView.java
@@ -23,7 +23,6 @@
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
-import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat;
import android.support.v7.content.res.AppCompatResources;
@@ -34,6 +33,7 @@
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
+
import com.gauravk.bubblenavigation.util.ViewUtils;
/**
@@ -101,6 +101,7 @@ private void init(Context context, @Nullable AttributeSet attrs) {
Drawable shape = null;
int shapeColor = Integer.MIN_VALUE;
int colorActive = ViewUtils.getThemeAccentColor(context);
+ int titleColorActive = colorActive;
int colorInactive = ContextCompat.getColor(context, R.color.default_inactive_color);
float titleSize = context.getResources().getDimension(R.dimen.default_nav_item_text_size);
maxTitleWidth = context.getResources().getDimension(R.dimen.default_nav_item_title_max_width);
@@ -129,6 +130,7 @@ private void init(Context context, @Nullable AttributeSet attrs) {
title = ta.getString(R.styleable.BubbleToggleView_bt_title);
titleSize = ta.getDimension(R.styleable.BubbleToggleView_bt_titleSize, titleSize);
colorActive = ta.getColor(R.styleable.BubbleToggleView_bt_colorActive, colorActive);
+ titleColorActive = ta.getColor(R.styleable.BubbleToggleView_bt_titleColorActive, colorActive);
colorInactive = ta.getColor(R.styleable.BubbleToggleView_bt_colorInactive, colorInactive);
isActive = ta.getBoolean(R.styleable.BubbleToggleView_bt_active, false);
animationDuration = ta.getInteger(R.styleable.BubbleToggleView_bt_duration, DEFAULT_ANIM_DURATION);
@@ -160,6 +162,7 @@ private void init(Context context, @Nullable AttributeSet attrs) {
bubbleToggleItem.setTitlePadding(titlePadding);
bubbleToggleItem.setShapeColor(shapeColor);
bubbleToggleItem.setColorActive(colorActive);
+ bubbleToggleItem.setTitleColorActive(titleColorActive);
bubbleToggleItem.setColorInactive(colorInactive);
bubbleToggleItem.setIconWidth(iconWidth);
bubbleToggleItem.setIconHeight(iconHeight);
@@ -219,7 +222,7 @@ private void createBubbleItemView(Context context) {
lpTitle.addRule(RelativeLayout.RIGHT_OF, iconView.getId());
titleView.setLayoutParams(lpTitle);
titleView.setSingleLine(true);
- titleView.setTextColor(bubbleToggleItem.getColorActive());
+ titleView.setTextColor(bubbleToggleItem.getTitleColorActive());
titleView.setText(bubbleToggleItem.getTitle());
titleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, bubbleToggleItem.getTitleSize());
//get the current measured title width
diff --git a/bubblenavigation/src/main/res/values/attrs.xml b/bubblenavigation/src/main/res/values/attrs.xml
index fdefaa8..ac20267 100644
--- a/bubblenavigation/src/main/res/values/attrs.xml
+++ b/bubblenavigation/src/main/res/values/attrs.xml
@@ -10,6 +10,7 @@
+
diff --git a/sample/bn_four.gif b/sample/bn_four.gif
deleted file mode 100644
index bb99631..0000000
Binary files a/sample/bn_four.gif and /dev/null differ
diff --git a/sample/bn_one.gif b/sample/bn_one.gif
deleted file mode 100644
index 7f16409..0000000
Binary files a/sample/bn_one.gif and /dev/null differ
diff --git a/sample/bn_three.gif b/sample/bn_three.gif
deleted file mode 100644
index 78b9ae8..0000000
Binary files a/sample/bn_three.gif and /dev/null differ
diff --git a/sample/bn_two.gif b/sample/bn_two.gif
deleted file mode 100644
index 594b4c0..0000000
Binary files a/sample/bn_two.gif and /dev/null differ
diff --git a/sample/sample_bottom.gif b/sample/sample_bottom.gif
deleted file mode 100644
index 7e0f103..0000000
Binary files a/sample/sample_bottom.gif and /dev/null differ
diff --git a/sample/sample_middle.gif b/sample/sample_middle.gif
deleted file mode 100644
index ccf0867..0000000
Binary files a/sample/sample_middle.gif and /dev/null differ
diff --git a/sample/sample_top.gif b/sample/sample_top.gif
deleted file mode 100644
index 4eddaef..0000000
Binary files a/sample/sample_top.gif and /dev/null differ