Update: Add default indicator color and default icon size

doctor-blue · Jul 18, 2020 · c1fd88e · c1fd88e
1 parent 99a2dc1
commit c1fd88e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 47 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,6 +30,8 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -110,11 +110,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:menu="@menu/bottom_menu"
-        app:indicatorColor="@color/colorPrimary"
-        app:iconTintActive="@color/colorPrimary"
-        app:iconSize="24dp"
-        app:indicatorType="point"
-        app:indicatorPosition="bottom"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
diff --git a/noname_library/src/main/java/com/doctorblue/noname_library/NoNameBottomBar.kt b/noname_library/src/main/java/com/doctorblue/noname_library/NoNameBottomBar.kt
@@ -17,6 +17,7 @@ import androidx.annotation.Dimension
 import androidx.annotation.XmlRes
 import androidx.core.graphics.drawable.DrawableCompat
 import kotlin.math.abs
+import kotlin.math.roundToInt
 
 /**
  * Create by Nguyen Van Tan 7/2020
@@ -57,7 +58,7 @@ class NoNameBottomBar @JvmOverloads constructor(
         }
 
     @Dimension
-    var itemIconSize: Float = 0f
+    var itemIconSize: Float = (24f * resources.displayMetrics.density).roundToInt().toFloat()
         set(@Dimension value) {
             field = value
             invalidate()
@@ -370,7 +371,7 @@ class NoNameBottomBar @JvmOverloads constructor(
 
     companion object {
         private const val INVALID_RES = -1
-        private const val DEFAULT_INDICATOR_COLOR = Color.WHITE
+        private const val DEFAULT_INDICATOR_COLOR = Color.GRAY
         private const val OPAQUE = 255
         private const val TRANSPARENT = 0
     }