宗玉杰提交

zongyujie · Jun 27, 2019 · fba41a2 · fba41a2
1 parent ec748b1
commit fba41a2
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 23 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@
 	    xmlns:tools="http://schemas.android.com/tools"
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
-	    tools:context="com.zhmf.library.bottomnavigation.MainActivity">
+	    tools:context="com.zhmf.library.MainActivity">
 
 	    <com.zhmf.library.bottomnavigation.BottomNavigationBar
 	        android:id="@+id/bottom_navigation_bar"

diff --git a/bottomnavigation/build.gradle b/bottomnavigation/build.gradle
@@ -17,6 +17,9 @@ android {
 }
 
 dependencies {
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
     compile 'com.android.support:support-v4:26.1.0'
     compile 'com.android.support:support-annotations:26.1.0'
     compile fileTree(include: ['*.jar'], dir: 'libs')

diff --git a/bottomnavigation/src/main/res/layout/bottom_navigation_item.xml b/bottomnavigation/src/main/res/layout/bottom_navigation_item.xml
@@ -20,13 +20,16 @@
 
         <TextView
             android:id="@+id/bottom_navigation_badge_text_view"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:gravity="center"
             android:textColor="#FFFFFF"
             android:textSize="8sp"
-            tools:ignore="SmallSp" />
+            tools:ignore="SmallSp"
+            android:singleLine="true"
+            android:ellipsize="end"
+            />
     </FrameLayout>
 
     <TextView

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -6,7 +6,7 @@ android {
 
 
     defaultConfig {
-        applicationId "com.zhmf.library.bottomnavigation"
+        applicationId "com.zhmf.library"
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhmf.library.bottomnavigation">
+    package="com.zhmf.library">
 
     <application
         android:allowBackup="true"

diff --git a/...ibrary/bottomnavigation/MainActivity.java → ...n/java/com/zhmf/library/MainActivity.java b/...ibrary/bottomnavigation/MainActivity.java → ...n/java/com/zhmf/library/MainActivity.java
@@ -1,10 +1,14 @@
-package com.zhmf.library.bottomnavigation;
+package com.zhmf.library;
 
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 
+import com.zhmf.library.bottomnavigation.BottomNavigationBar;
+import com.zhmf.library.bottomnavigation.BottomNavigationItem;
+import com.zhmf.library.bottomnavigation.OnTabSelectedListener;
+
 public class MainActivity extends Activity {
 
 
@@ -25,7 +29,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setBadgeDrawable(getResources().getDrawable(R.drawable.red_point))
                 .setTitle("首页")
 
-                .setBadgeMessage("99+")
+                .setBadgeMessage("")
                 .setIconWidth(25);
 
         BottomNavigationItem item2 = new BottomNavigationItem()
@@ -36,13 +40,13 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setTitle("城市")
                 .setIconWidth(25);
 
-        BottomNavigationItem item3 = new BottomNavigationItem()
-                .setIconActiveDrawable(getResources().getDrawable(R.mipmap.tab_post))
-                .setIconInactiveDrawable(getResources().getDrawable(R.mipmap.tab_post))
-                .setLabelInActiveColor(Color.parseColor("#000000"))
-                .setLabelActiveColor(Color.parseColor("#FF0000"))
-                .setTitle("发布")
-                .setIconWidth(65);
+//        BottomNavigationItem item3 = new BottomNavigationItem()
+//                .setIconActiveDrawable(getResources().getDrawable(R.mipmap.tab_post))
+//                .setIconInactiveDrawable(getResources().getDrawable(R.mipmap.tab_post))
+//                .setLabelInActiveColor(Color.parseColor("#000000"))
+//                .setLabelActiveColor(Color.parseColor("#FF0000"))
+//                .setTitle("发布")
+//                .setIconWidth(65);
 
         BottomNavigationItem item4 = new BottomNavigationItem()
                 .setIconActiveDrawable(getResources().getDrawable(R.mipmap.tab_find_selected))
@@ -60,15 +64,15 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setTitle("我的")
                 .setIconWidth(25);
 
-        bottom_navigation_bar.addItem(item1).addItem(item2).addItem(item3).addItem(item4).addItem(item5);
+        bottom_navigation_bar.addItem(item1).addItem(item2).addItem(item4).addItem(item5);
         bottom_navigation_bar.setFirstSelectedPosition(0);
         bottom_navigation_bar.setViewLineVisible(true);
-        bottom_navigation_bar.setMenuHeight(90);
+//        bottom_navigation_bar.setMenuHeight(90);
         bottom_navigation_bar.initialise();
 
         bottom_navigation_bar.setBadgeVisible(0, true);
-        bottom_navigation_bar.setBadgeMargin(0, 10,10,10,0); // 自行调整至合适状态
-        bottom_navigation_bar.setBadgeText(0, "99+");
+        bottom_navigation_bar.setBadgeMargin(0, 10,10,0,0); // 自行调整至合适状态
+        bottom_navigation_bar.setBadgeText(0, "");
 
         // 需要在初始化完成之后调用
 

diff --git a/demo/src/main/res/drawable/red_point.xml b/demo/src/main/res/drawable/red_point.xml
@@ -6,6 +6,8 @@
                 <corners android:topLeftRadius="5.0dip" android:topRightRadius="5.0dip" android:bottomLeftRadius="5.0px" android:bottomRightRadius="5.0px" />
     -->
             <solid android:color="#EF3F3F" />
+            <size android:width="10dp"
+                android:height="10dp" />
         </shape>
     </item>
 </layer-list>
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFFFFF"
-    tools:context="com.zhmf.library.bottomnavigation.MainActivity">
+    tools:context="com.zhmf.library.MainActivity">
 
 
     <com.zhmf.library.bottomnavigation.BottomNavigationBar