Skip to content

Commit

Permalink
1.3.0 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashok-Varma committed Jul 3, 2016
1 parent 6beb9c0 commit 9e8ba60
Show file tree
Hide file tree
Showing 7 changed files with 235 additions and 221 deletions.
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,28 @@ language: android

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- tools
- platform-tools

# The BuildTools version used by your project
- build-tools-23.0.3

# The SDK version used to compile your project
- android-23

# Additional components
#- extra-google-google_play_services
#- extra-google-m2repository
- extra-android-m2repository

# Specify at least one system image,
# if you need to run emulator(s) during your tests
#- sys-img-armeabi-v7a-android-23
#licenses:
#- 'android-sdk-license-.+'

cache:
directories:
- $HOME/.gradle/caches/2.10
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ Download [the latest JAR][mavenAarDownload] or grab via Maven:
<dependency>
<groupId>com.ashokvarma.android</groupId>
<artifactId>bottom-navigation-bar</artifactId>
<version>1.2.2</version>
<version>1.3.0</version>
<type>pom</type>
</dependency>
```
or Gradle:
```groovy
compile 'com.ashokvarma.android:bottom-navigation-bar:1.2.2'
compile 'com.ashokvarma.android:bottom-navigation-bar:1.3.0'
```
or Ivy:
```xml
<dependency org='com.ashokvarma.android' name='bottom-navigation-bar' rev='1.2.2'>
<dependency org='com.ashokvarma.android' name='bottom-navigation-bar' rev='1.3.0'>
<artifact name='$AID' ext='pom'></artifact>
</dependency>
```
Expand Down Expand Up @@ -73,5 +73,5 @@ limitations under the License.
[wikiLink]: https://github.com/Ashok-Varma/BottomNavigation/wiki/Usage
[googlePlayStoreLink]: https://play.google.com/store/apps/details?id=com.ashokvarma.bottomnavigation.sample
[googlePage]: https://www.google.com/design/spec/components/bottom-navigation.html
[mavenAarDownload]: https://repo1.maven.org/maven2/com/ashokvarma/android/bottom-navigation-bar/1.2.2/bottom-navigation-bar-1.2.2.aar
[mavenAarDownload]: https://repo1.maven.org/maven2/com/ashokvarma/android/bottom-navigation-bar/1.3.0/bottom-navigation-bar-1.3.0.aar
[mavenLatestJarDownload]: https://search.maven.org/remote_content?g=com.ashokvarma.android&a=bottom-navigation-bar&v=LATEST
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*
* @author ashokvarma
* @version 1.0
* @see
* @since 06 Jun 2016
*/
public class BottomNavBarFabBehaviour extends CoordinatorLayout.Behavior<FloatingActionButton> {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ ANDROID_BUILD_TOOLS_VERSION=23.0.3
ANDROID_BUILD_TARGET_SDK_VERSION=23
ANDROID_BUILD_MIN_SDK_VERSION=14

APP_VERSION_NAME = 1.2.2
APP_VERSION_CODE = 5
APP_VERSION_NAME = 1.3.0
APP_VERSION_CODE = 6

ANDROID_SUPPORT_LIBRARY_VERSION = 23.4.0
ANDROID_PLAY_SERVICES_VERSION = 8.4.0
10 changes: 5 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {
versionCode Integer.parseInt(APP_VERSION_CODE)
versionName project.APP_VERSION_NAME

// testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
Expand Down Expand Up @@ -61,12 +61,12 @@ dependencies {
// Testing-only dependencies

// Android testing support library's runner and rules
// androidTestCompile 'com.android.support.test:runner:0.5'
// androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
// Force usage of support annotations in the test app, since it is internally used by the runner module.
// to avoid Conflict with dependency 'com.android.support:support-annotations'. Resolved versions for app (23.4.0) and test app (23.1.1) differ.
// androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"

// Espresso Ui Testing dependencies
// androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
}
Original file line number Diff line number Diff line change
@@ -1,49 +1,48 @@
//package com.ashokvarma.sample;
//
//import android.support.test.rule.ActivityTestRule;
//
//import com.ashokvarma.bottomnavigation.sample.HomeActivity;
//import com.ashokvarma.bottomnavigation.sample.R;
//
//import org.junit.Rule;
//import org.junit.Test;
//
//import static android.support.test.espresso.Espresso.onView;
//import static android.support.test.espresso.action.ViewActions.click;
//import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
//import static android.support.test.espresso.matcher.ViewMatchers.withId;
//
///**
// * Class description
// *
// * @author ashokvarma
// * @version 1.0
// * @see
// * @since 26 May 2016
// */
//public class HomeScreenTest {
//
// @Rule
// public ActivityTestRule<HomeActivity> mHomeActivityTestRule =
// new ActivityTestRule<HomeActivity>(HomeActivity.class);
//
//
// @Test
// public void scrollHome_test() throws Exception {
// onView(withId(R.id.nested_scroll_view))
// .perform(Utils.swipeUpSlow());
//
// onView(isRoot()).perform(Utils.waitId(R.id.nested_scroll_view, 150 * 1000));
//
// onView(withId(R.id.nested_scroll_view))
// .perform(Utils.swipeDownSlow());
//
// onView(withId(R.id.items_3))
// .perform(click());
//
// onView(isRoot()).perform(Utils.waitId(R.id.nested_scroll_view, 150 * 1000));
//
// }
//
//
//}
package com.ashokvarma.sample;

import android.support.test.rule.ActivityTestRule;

import com.ashokvarma.bottomnavigation.sample.HomeActivity;
import com.ashokvarma.bottomnavigation.sample.R;

import org.junit.Rule;
import org.junit.Test;

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
import static android.support.test.espresso.matcher.ViewMatchers.withId;

/**
* Class description
*
* @author ashokvarma
* @version 1.0
* @see
* @since 26 May 2016
*/
public class HomeScreenTest {

@Rule
public ActivityTestRule<HomeActivity> mHomeActivityTestRule =
new ActivityTestRule<HomeActivity>(HomeActivity.class);


@Test
public void scrollHome_test() throws Exception {
onView(withId(R.id.nested_scroll_view))
.perform(Utils.swipeUpSlow());

onView(isRoot()).perform(Utils.waitId(R.id.nested_scroll_view, 150 * 1000));

onView(withId(R.id.nested_scroll_view))
.perform(Utils.swipeDownSlow());

onView(withId(R.id.items_3))
.perform(click());

onView(isRoot()).perform(Utils.waitId(R.id.nested_scroll_view, 150 * 1000));
}


}
Loading

0 comments on commit 9e8ba60

Please sign in to comment.