diff --git a/build.gradle b/build.gradle index b3e8308..b2e3ad5 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c2e01ba..f702683 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 26 22:03:51 EEST 2017 +#Mon Apr 30 21:23:45 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/pageindicatorview/build.gradle b/pageindicatorview/build.gradle index 51d6a95..2de6b4d 100644 --- a/pageindicatorview/build.gradle +++ b/pageindicatorview/build.gradle @@ -13,7 +13,7 @@ ext { siteUrl = 'https://github.com/romandanylyk/PageIndicatorView' gitUrl = 'https://github.com/romandanylyk/PageIndicatorView.git' - libraryVersion = '1.0.0' + libraryVersion = '1.0.1' developerId = 'romandanylyk' developerName = 'Roman Danylyk' @@ -25,12 +25,12 @@ ext { } android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" @@ -49,9 +49,9 @@ dependencies { repositories { maven { url "https://maven.google.com" } } - compile 'com.android.support:support-annotations:27.0.2' - compile 'com.android.support:support-compat:26.1.0' - compile 'com.android.support:support-core-ui:26.1.0' + compile 'com.android.support:support-annotations:27.1.1' + compile 'com.android.support:support-compat:27.1.1' + compile 'com.android.support:support-core-ui:27.1.1' } allprojects { diff --git a/sample/build.gradle b/sample/build.gradle index f406c68..5e3b111 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.rd.pageindicatorview" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -21,6 +21,7 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:recyclerview-v7:27.1.1' compile project(':pageindicatorview') } diff --git a/sample/src/main/java/com/rd/pageindicatorview/home/HomeActivity.java b/sample/src/main/java/com/rd/pageindicatorview/home/HomeActivity.java index 80edbb3..ac48b37 100644 --- a/sample/src/main/java/com/rd/pageindicatorview/home/HomeActivity.java +++ b/sample/src/main/java/com/rd/pageindicatorview/home/HomeActivity.java @@ -1,7 +1,5 @@ package com.rd.pageindicatorview.home; -import android.app.FragmentManager; -import android.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; @@ -70,12 +68,6 @@ private void initViews() { pager.setAdapter(adapter); pageIndicatorView = findViewById(R.id.pageIndicatorView); - findViewById(R.id.btnOpenFragment).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - openFragment(); - } - }); } @NonNull @@ -108,12 +100,4 @@ private void updateIndicator() { pageIndicatorView.setInteractiveAnimation(customization.isInteractiveAnimation()); pageIndicatorView.setAutoVisibility(customization.isAutoVisibility()); } - - private void openFragment() { - FragmentManager manager = getFragmentManager(); - FragmentTransaction transaction = manager.beginTransaction(); - transaction.add(R.id.fragmentHolder, HomeFragment.getInstance(), "TAG"); - transaction.addToBackStack(null); - transaction.commit(); - } } diff --git a/sample/src/main/java/com/rd/pageindicatorview/home/HomeFragment.java b/sample/src/main/java/com/rd/pageindicatorview/home/HomeFragment.java deleted file mode 100644 index b2e49d5..0000000 --- a/sample/src/main/java/com/rd/pageindicatorview/home/HomeFragment.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.rd.pageindicatorview.home; - -import android.app.Fragment; -import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewPager; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import com.rd.pageindicatorview.sample.R; - -import java.util.ArrayList; -import java.util.List; - -public class HomeFragment extends Fragment { - - public static Fragment getInstance() { - return new HomeFragment(); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fr_home, container, false); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - HomeAdapter adapter = new HomeAdapter(); - adapter.setData(createPageList()); - - ViewPager pager = view.findViewById(R.id.viewPager); - pager.setAdapter(adapter); - } - - @NonNull - private List createPageList() { - List pageList = new ArrayList<>(); - pageList.add(createPageView(R.color.green_50)); - pageList.add(createPageView(R.color.green_100)); - pageList.add(createPageView(R.color.green_200)); - pageList.add(createPageView(R.color.green_300)); - - return pageList; - } - - @NonNull - private View createPageView(int color) { - View view = new View(getActivity()); - view.setBackgroundColor(getResources().getColor(color)); - - return view; - } -} diff --git a/sample/src/main/res/layout/ac_home.xml b/sample/src/main/res/layout/ac_home.xml index a92fe4c..0ba9f56 100644 --- a/sample/src/main/res/layout/ac_home.xml +++ b/sample/src/main/res/layout/ac_home.xml @@ -34,13 +34,6 @@ attrs:piv_padding="12dp" attrs:piv_radius="8dp" /> -