Merge pull request roughike#453 from roughike/development

Update master to version 2.0
wolearn · Aug 29, 2016 · fcaf7ab · fcaf7ab
2 parents a247d05 + befe6b8
commit fcaf7ab
Show file tree

Hide file tree

Showing 41 changed files with 1,120 additions and 677 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -15,4 +15,4 @@ before_script:
   - adb shell input keyevent 82 &
 
 script:
-   - ./gradlew assembleDebug connectedDebugAndroidTest
+   - ./gradlew connectedAndroidTest coveralls
diff --git a/BottomBar.iml b/BottomBar.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,17 @@
 
 (or: y u no add shiny new things?!)
 
-### Newest version: 2.0.1
+### 2.0.2
+
+* Now we're animating the color change on tab titles and icons.
+* Fixed a bug where the BottomBar wouldn't hide completely when it was both shy and drawing under navbar.
+* Made possible to inflate the BottomBar programmatically.
+* Made it possible to control whether the shadow is shown or not.
+* Made setItems to be public to allow writing tests without a designated Activity
+* Made setters for allowing setting tab colors, alphas, textappearances and typefaces programmatically.
+* Increased test coverage a little bit.
+
+### 2.0.1
 
 * Fixed a bug where the tab selection listener is set and multiple tabs could be selected at once
 * Fixed a bug where the reselection listener was fired even it shouldn't have.

diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 
 ## Version 2.0 released!
 
+[The latest version before that can be found in the v1 branch](https://github.com/roughike/BottomBar/tree/v1)
+
 * Cleaner code and better APIs
 * No more unnecessary stuff or spaghetti mess
 * Now the look, feel and behavior is defined in XML, as it should be
@@ -303,7 +305,8 @@ nearby.removeBadge/();
     app:bb_inActiveTabColor="#222222"
     app:bb_activeTabColor="@color/colorPrimary"
     app:bb_titleTextAppearance="@style/MyTextAppearance"
-    app:bb_titleTypeFace="fonts/MySuperDuperFont.ttf" />
+    app:bb_titleTypeFace="fonts/MySuperDuperFont.ttf"
+    app:bb_showShadow="true" />
 ```
 
 <dl>
@@ -325,6 +328,8 @@ nearby.removeBadge/();
     <dd>custom textAppearance for the titles</dd>
     <dt>bb_titleTypeFace</dt>
     <dd>path for your custom font file, such as <code>fonts/MySuperDuperFont.ttf</code>. In that case your font path would look like <code>src/main/assets/fonts/MySuperDuperFont.ttf</code>, but you only need to provide <code>fonts/MySuperDuperFont.ttf</code>, as the asset folder will be auto-filled for you.</dd>
+    <dt>bb_showShadow</dt>
+    <dd>controls whether the shadow is shown or hidden, defaults to true.</dd>
 </dl>
 
 ## Apps using BottomBar