Add option to set custom typeface on badge text views

build.gradle

@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.32"
+
+    ext.kotlin_version = '1.6.20'
+
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
     }
@@ -17,12 +19,11 @@ allprojects {
         google()
         mavenCentral()
     }
-
-    plugins.withId("com.vanniktech.maven.publish") {
+    /*plugins.withId("com.vanniktech.maven.publish") {
         mavenPublish {
             sonatypeHost = "S01"
         }
-    }
+    }*/
 }
 
 subprojects {

demo/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "nl.joery.demo.animatedbottombar"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode 3
-
         versionName "1.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -32,17 +32,24 @@ android {
 }
 
 dependencies {
+
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.2.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
+
     implementation 'com.jaredrummler:colorpicker:1.1.0'
+
     implementation project(path: ':library')
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
 }

demo/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         </activity>
         <activity
             android:name=".playground.PlaygroundActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

demo/src/main/java/nl/joery/demo/animatedbottombar/playground/PlaygroundActivity.kt

@@ -216,6 +216,11 @@ class PlaygroundActivity : AppCompatActivity() {
                 TypedValue.COMPLEX_UNIT_SP
             )
         )
+        properties.add(
+            TypefaceProperty(
+                "badgeTypeface"
+            )
+        )
     }
 
     private fun initRecyclerView() {

demo/src/main/java/nl/joery/demo/animatedbottombar/playground/properties/TypefaceProperty.kt

@@ -0,0 +1,3 @@
+package nl.joery.demo.animatedbottombar.playground.properties
+
+class TypefaceProperty(name: String) : Property(name)

gradle.properties

@@ -20,23 +20,23 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-GROUP=nl.joery.animatedbottombar
-POM_ARTIFACT_ID=library
-VERSION_NAME=1.1.0
+#GROUP=nl.joery.animatedbottombar
+#POM_ARTIFACT_ID=library
+#VERSION_NAME=1.1.0
 
-POM_NAME=AnimatedBottomBar
-POM_DESCRIPTION=A customizable and easy to use BottomBar navigation view with sleek animations.
-POM_INCEPTION_YEAR=2020
-POM_URL=https://github.com/Droppers/AnimatedBottomBar
+#POM_NAME=AnimatedBottomBar
+#POM_DESCRIPTION=A customizable and easy to use BottomBar navigation view with sleek animations.
+#POM_INCEPTION_YEAR=2020
+#POM_URL=https://github.com/Droppers/AnimatedBottomBar
 
-POM_LICENCE_NAME=The MIT License
-POM_LICENCE_URL=https://github.com/Droppers/AnimatedBottomBar/blob/master/LICENSE
-POM_LICENCE_DIST=repo
+#POM_LICENCE_NAME=The MIT License
+#POM_LICENCE_URL=https://github.com/Droppers/AnimatedBottomBar/blob/master/LICENSE
+#POM_LICENCE_DIST=repo
 
-POM_SCM_URL=https://github.com/Droppers/AnimatedBottomBar
-POM_SCM_CONNECTION=scm:git:git://github.com/Droppers/AnimatedBottomBar.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Droppers/AnimatedBottomBar.git
+#POM_SCM_URL=https://github.com/Droppers/AnimatedBottomBar
+#POM_SCM_CONNECTION=scm:git:git://github.com/Droppers/AnimatedBottomBar.git
+#POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Droppers/AnimatedBottomBar.git
 
-POM_DEVELOPER_ID=Droppers
-POM_DEVELOPER_NAME=Joery Droppers
-POM_DEVELOPER_URL=https://github.com/Droppers
+#POM_DEVELOPER_ID=Droppers
+#POM_DEVELOPER_NAME=Joery Droppers
+#POM_DEVELOPER_URL=https://github.com/Droppers

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 27 16:22:39 CET 2020
+#Mon Apr 04 13:26:57 IRDT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+zipStoreBase=GRADLE_USER_HOME

library/build.gradle

@@ -1,16 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: "com.vanniktech.maven.publish"
+//apply plugin: "com.vanniktech.maven.publish"
 
 android {
-    compileSdkVersion 29
+
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 1
-        versionName VERSION_NAME
-
+        targetSdkVersion 32
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -25,25 +23,26 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-
-        kotlinOptions.freeCompilerArgs += ['-module-name', "${GROUP}.${POM_ARTIFACT_ID}"]
+        //kotlinOptions.freeCompilerArgs += ['-module-name', "${GROUP}.${POM_ARTIFACT_ID}"]
     }
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    api 'androidx.core:core-ktx:1.5.0'
-    api 'androidx.appcompat:appcompat:1.3.0'
 
-    api 'androidx.recyclerview:recyclerview:1.2.0'
-    api 'androidx.viewpager2:viewpager2:1.0.0'
-    api 'com.google.android.flexbox:flexbox:3.0.0'
-    api 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+
+    implementation "androidx.navigation:navigation-ui-ktx:2.4.1"
 
-    api "androidx.navigation:navigation-ui-ktx:2.3.5"
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

library/src/main/java/nl/joery/animatedbottombar/AnimatedBottomBar.kt

@@ -16,6 +16,7 @@ import android.view.animation.AnimationUtils
 import android.widget.FrameLayout
 import androidx.annotation.*
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.navigation.NavController
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
@@ -218,6 +219,13 @@ class AnimatedBottomBar @JvmOverloads constructor(
                     R.styleable.AnimatedBottomBar_abb_badgeTextSize,
                     tabStyle.badge.textSize
                 )
+            badgeTypeface =
+                if (attr.hasValue(R.styleable.AnimatedBottomBar_abb_badgeTypeface))
+                    ResourcesCompat.getFont(
+                        context,
+                        attr.getResourceId(R.styleable.AnimatedBottomBar_abb_badgeTypeface, 0)
+                    ) ?: Typeface.DEFAULT
+                else Typeface.DEFAULT
 
             // Initials tabs
             val tabsResId = attr.getResourceId(R.styleable.AnimatedBottomBar_abb_tabs, -1)
@@ -1075,6 +1083,13 @@ class AnimatedBottomBar @JvmOverloads constructor(
             applyTabStyle(BottomBarStyle.StyleUpdateType.BADGE)
         }
 
+    var badgeTypeface
+        get() = tabStyle.badge.typeface
+        set(value) {
+            tabStyle.badge.typeface = value
+            applyTabStyle(BottomBarStyle.StyleUpdateType.BADGE)
+        }
+
     class Tab internal constructor(
         val icon: Drawable,
         var iconSize: Int = -1,
@@ -1088,10 +1103,11 @@ class AnimatedBottomBar @JvmOverloads constructor(
         val text: String? = null,
         @ColorInt val backgroundColor: Int? = null,
         @ColorInt val textColor: Int? = null,
-        @Dimension val textSize: Int? = null
+        @Dimension val textSize: Int? = null,
+        val typeface: Typeface? = null
     ) {
-        constructor() : this(null, null, null, null)
-        constructor(text: String?) : this(text, null, null, null)
+        constructor() : this(null, null, null, null, null)
+        constructor(text: String?) : this(text, null, null, null, null)
     }
 
     enum class TabType(val id: Int) {

library/src/main/java/nl/joery/animatedbottombar/BadgeView.kt

@@ -124,6 +124,17 @@ class BadgeView @JvmOverloads constructor(
             invalidate()
         }
 
+    private var _typeface: Typeface = Typeface.DEFAULT
+    var typeface: Typeface
+        get() = _typeface
+        set(value) {
+            _typeface = value
+
+            textPaint.typeface = value
+            updateTextBounds()
+            invalidate()
+        }
+
     init {
         isEnabled = false
     }

library/src/main/java/nl/joery/animatedbottombar/BottomBarStyle.kt

@@ -47,7 +47,8 @@ object BottomBarStyle {
         var animationDuration: Int = 150,
         @ColorInt var backgroundColor: Int = Color.rgb(255, 12, 16),
         @ColorInt var textColor: Int = Color.WHITE,
-        @Dimension var textSize: Int = 9.spPx
+        @Dimension var textSize: Int = 9.spPx,
+        var typeface: Typeface = Typeface.DEFAULT
     )
 
     data class Indicator(

library/src/main/java/nl/joery/animatedbottombar/TabView.kt

@@ -320,6 +320,7 @@ internal class TabView @JvmOverloads constructor(
                 it.setBackgroundColor(badge.backgroundColor ?: style.badge.backgroundColor)
                 it.textColor = badge.textColor ?: style.badge.textColor
                 it.textSize = badge.textSize ?: style.badge.textSize
+                it.typeface = badge.typeface ?: style.badge.typeface
 
                 it.isEnabled = true
             }
@@ -403,9 +404,8 @@ internal class TabView @JvmOverloads constructor(
 
         val valueFrom: Float
         val valueTo: Float
-        val animationType = if (selected) style.tabAnimationSelected else style.tabAnimation
 
-        when(animationType) {
+        when(if (selected) style.tabAnimationSelected else style.tabAnimation) {
             AnimatedBottomBar.TabAnimation.SLIDE -> {
                 if (selected) {
                     valueFrom = when {

library/src/main/res/values/attrs.xml

@@ -68,5 +68,6 @@
         <attr name="abb_badgeBackgroundColor" format="color" />
         <attr name="abb_badgeTextColor" format="color" />
         <attr name="abb_badgeTextSize" format="dimension" />
+        <attr name="abb_badgeTypeface" format="reference" />
     </declare-styleable>
 </resources>