Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added active icon option #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added active icon option #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,20 @@ bottomBar.onItemLongClick = {
## Customization

```xml

<menu ...
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
...
app:activeIcon="@drawable/ic_activate"/>

...

</menu>



<me.ibrahimsn.lib.NiceBottomBar
android:id="@+id/bottomBar"
android:layout_width="match_parent"
Expand Down
35 changes: 31 additions & 4 deletions app/src/main/res/menu/bottom_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<item

<!--<item
android:id="@+id/item2"
android:title="@string/servers"
android:icon="@drawable/ic_dns_black_24dp" />
android:icon="@drawable/ic_dns_black_24dp"/>

<item
android:id="@+id/item1"
Expand All @@ -19,5 +21,30 @@
<item
android:id="@+id/item0"
android:title="@string/account"
android:icon="@drawable/ic_account_circle_black_24dp" />
android:icon="@drawable/ic_account_circle_black_24dp" />-->

<item
android:id="@+id/item2"
android:title="@string/servers"
android:icon="@drawable/ic_dns_black_24dp"
app:activeIcon="@drawable/ic_launcher_background"/>

<item
android:id="@+id/item1"
android:title="@string/search"
android:icon="@drawable/ic_search_black_24dp"
app:activeIcon="@drawable/ic_launcher_background" />

<item
android:id="@+id/item3"
android:title="@string/billing"
android:icon="@drawable/ic_receipt_black_24dp"
app:activeIcon="@drawable/ic_launcher_background" />

<item
android:id="@+id/item0"
android:title="@string/account"
android:icon="@drawable/ic_account_circle_black_24dp"
app:activeIcon="@drawable/ic_launcher_background" />

</menu>
2 changes: 1 addition & 1 deletion lib/src/main/java/me/ibrahimsn/lib/BottomBarItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package me.ibrahimsn.lib
import android.graphics.RectF
import android.graphics.drawable.Drawable

data class BottomBarItem(var title: String, val icon: Drawable,
data class BottomBarItem(var title: String, val icon: Drawable, val activeIcon: Drawable?,
var rect: RectF = RectF(), var badgeSize: Float = 0f)
5 changes: 4 additions & 1 deletion lib/src/main/java/me/ibrahimsn/lib/BottomBarParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ class BottomBarParser(private val context: Context, res: Int) {
val attributeCount = parser.attributeCount
var itemText: String? = null
var itemDrawable: Drawable? = null
var activeItemDrawable: Drawable? = null

for (i in 0 until attributeCount)
when (parser.getAttributeName(i)) {
Constants.ICON_ATTRIBUTE -> itemDrawable =
ContextCompat.getDrawable(context, parser.getAttributeResourceValue(i, 0))
Constants.ACTIVE_ICON_ATTRIBUTE -> activeItemDrawable =
ContextCompat.getDrawable(context, parser.getAttributeResourceValue(i, 0))
Constants.TITLE_ATTRIBUTE -> {
itemText = try {
context.getString(parser.getAttributeResourceValue(i, 0))
Expand All @@ -42,6 +45,6 @@ class BottomBarParser(private val context: Context, res: Int) {
}
}

return BottomBarItem(itemText!!, itemDrawable!!)
return BottomBarItem(itemText!!, itemDrawable!!, activeItemDrawable)
}
}
1 change: 1 addition & 0 deletions lib/src/main/java/me/ibrahimsn/lib/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package me.ibrahimsn.lib
object Constants {
const val ITEM_TAG = "item"
const val ICON_ATTRIBUTE = "icon"
const val ACTIVE_ICON_ATTRIBUTE = "activeIcon"
const val TITLE_ATTRIBUTE = "title"
const val WHITE_COLOR_HEX = "#FFFFFF"

Expand Down
28 changes: 20 additions & 8 deletions lib/src/main/java/me/ibrahimsn/lib/NiceBottomBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,26 @@ class NiceBottomBar : View {
val additionalTopMargin = if (barIndicatorGravity == 1) 0f else 10f

for ((i, item) in items.withIndex()) {
item.icon.mutate()
item.icon.setBounds(item.rect.centerX().toInt() - itemIconSize.toInt() / 2,
height / 2 - itemIconSize.toInt() - itemIconMargin.toInt() / 2 + additionalTopMargin.toInt(),
item.rect.centerX().toInt() + itemIconSize.toInt() / 2,
height / 2 - itemIconMargin.toInt() / 2 + additionalTopMargin.toInt())

DrawableCompat.setTint(item.icon , if (i == activeItem) currentActiveItemColor else itemTextColor)
item.icon.draw(canvas)

if (i == activeItem && item.activeIcon!=null) {
item.activeIcon.mutate()
item.activeIcon.setBounds(item.rect.centerX().toInt() - itemIconSize.toInt() / 2,
height / 2 - itemIconSize.toInt() - itemIconMargin.toInt() / 2 + additionalTopMargin.toInt(),
item.rect.centerX().toInt() + itemIconSize.toInt() / 2,
height / 2 - itemIconMargin.toInt() / 2 + additionalTopMargin.toInt())
} else {
item.icon.mutate()
item.icon.setBounds(item.rect.centerX().toInt() - itemIconSize.toInt() / 2,
height / 2 - itemIconSize.toInt() - itemIconMargin.toInt() / 2 + additionalTopMargin.toInt(),
item.rect.centerX().toInt() + itemIconSize.toInt() / 2,
height / 2 - itemIconMargin.toInt() / 2 + additionalTopMargin.toInt())
}

DrawableCompat.setTint(if (i == activeItem && item.activeIcon!=null) item.activeIcon else item.icon, if (i == activeItem) currentActiveItemColor else itemTextColor)
if (i == activeItem && item.activeIcon!=null)
item.activeIcon.draw(canvas)
else
item.icon.draw(canvas)

// Draw item title
this.paintText.color = if (i == activeItem) currentActiveItemColor else itemTextColor
Expand Down
3 changes: 2 additions & 1 deletion lib/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<attr name="textSize" format="dimension" />
<attr name="iconSize" format="dimension" />
<attr name="iconMargin" format="dimension" />
<attr name="activeIcon" format="reference"/>
<attr name="activeItem" format="integer" />
<attr name="indicatorInterpolator" format="enum">
<attr name="indicatorInterpolator" format="enum">
<enum name="accelerate" value="0"/>
<enum name="decelerate" value="1"/>
<enum name="accelerateDecelerate" value="2"/>
Expand Down