Rename Module name

.idea/gradle.xml

@@ -9,7 +9,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/viewpager" />
+            <option value="$PROJECT_DIR$/bannerview" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/misc.xml

@@ -35,7 +35,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/CircleViewPager.iml" filepath="$PROJECT_DIR$/CircleViewPager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/BannerViewPager.iml" filepath="$PROJECT_DIR$/BannerViewPager.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/viewpager/viewpager.iml" filepath="$PROJECT_DIR$/viewpager/viewpager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/bannerview/bannerview.iml" filepath="$PROJECT_DIR$/bannerview/bannerview.iml" />
     </modules>
   </component>
 </project>

app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.example.zhpan.circleviewpager"
-        minSdkVersion 17
+        minSdkVersion 19
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
@@ -31,7 +31,6 @@ repositories {
     }
 }
 
-
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
@@ -39,10 +38,11 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:26.1.0'
     testImplementation 'junit:junit:4.12'
-    implementation project(':viewpager')
+//    implementation project(':viewpager')
     // compile 'com.zhpan.library:viewpager:1.0.0'
     implementation 'com.github.bumptech.glide:glide:3.7.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.0'
+    implementation project(path: ':bannerview')
     // implementation files('libs/viewpager-1.0.0.jar')
     // compile(name: 'viewpager-1.0.0', ext: 'aar')
 }

app/src/main/java/com/example/zhpan/circleviewpager/MainActivity.java

@@ -8,8 +8,8 @@ import android.widget.Toast;
 import com.example.zhpan.circleviewpager.viewholder.DataViewHolder;
 import com.example.zhpan.circleviewpager.viewholder.LocalImageViewHolder;
 import com.example.zhpan.circleviewpager.viewholder.PhotoViewHolder;
-import com.zhpan.viewpager.holder.HolderCreator;
-import com.zhpan.viewpager.view.BannerViewPager;
+import com.zhpan.bannerview.holder.HolderCreator;
+import com.zhpan.bannerview.view.BannerViewPager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,33 +71,29 @@ public class MainActivity extends AppCompatActivity {
     private void initViewPager2() {
         mViewPager2.setAutoPlay(false);
         mViewPager2.setCanLoop(true);
-        mViewPager2.setData(mPicResList, new HolderCreator<LocalImageViewHolder>() {
-            @Override
-            public LocalImageViewHolder createViewHolder() {
-                return new LocalImageViewHolder();
-            }
-        });
         //  设置指示器资源图片
         mViewPager2.setIndicatorColor(Color.parseColor("#6C6D72"),
                 Color.parseColor("#FFFFFF"));
+
+        mViewPager2.setCurrentItem(2, false);
         mViewPager2.setOnPageClickListener(new BannerViewPager.OnPageClickListener() {
             @Override
             public void onPageClick(int position) {
                 Toast.makeText(MainActivity.this, "图片" + (position + 1), Toast.LENGTH_SHORT).show();
             }
         });
-        mViewPager2.setCurrentItem(2, false);
+        mViewPager2.setData(mPicResList, new HolderCreator<LocalImageViewHolder>() {
+            @Override
+            public LocalImageViewHolder createViewHolder() {
+                return new LocalImageViewHolder();
+            }
+        });
+
     }
 
     private void initViewPager3() {
         mViewPager3.setAutoPlay(false);
         mViewPager3.setCanLoop(false);
-        mViewPager3.setData(mDrawableList, new HolderCreator<PhotoViewHolder>() {
-            @Override
-            public PhotoViewHolder createViewHolder() {
-                return new PhotoViewHolder();
-            }
-        });
         //  设置指示器资源图片
         mViewPager3.setIndicatorColor(Color.parseColor("#6C6D72"),
                 Color.parseColor("#18171C"));
@@ -108,6 +104,12 @@ public class MainActivity extends AppCompatActivity {
             }
         });
         mViewPager3.setCurrentItem(3, false);
+        mViewPager3.setData(mDrawableList, new HolderCreator<PhotoViewHolder>() {
+            @Override
+            public PhotoViewHolder createViewHolder() {
+                return new PhotoViewHolder();
+            }
+        });
     }
 
     private void initView() {

app/src/main/java/com/example/zhpan/circleviewpager/viewholder/DataViewHolder.java

@@ -10,7 +10,7 @@ import android.widget.Toast;
 
 import com.example.zhpan.circleviewpager.DataBean;
 import com.example.zhpan.circleviewpager.R;
-import com.zhpan.viewpager.holder.ViewHolder;
+import com.zhpan.bannerview.holder.ViewHolder;
 import com.example.zhpan.circleviewpager.utils.ImageLoaderUtil;
 
 /**

app/src/main/java/com/example/zhpan/circleviewpager/viewholder/LocalImageViewHolder.java

@@ -5,10 +5,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.example.zhpan.circleviewpager.R;
-import com.zhpan.viewpager.holder.ViewHolder;
+import com.zhpan.bannerview.holder.ViewHolder;
 
 public class LocalImageViewHolder implements ViewHolder<Integer> {
     private ImageView mImageView;

app/src/main/java/com/example/zhpan/circleviewpager/viewholder/PhotoViewHolder.java

@@ -8,7 +8,7 @@ import android.widget.Toast;
 
 import com.example.zhpan.circleviewpager.R;
 import com.github.chrisbanes.photoview.PhotoView;
-import com.zhpan.viewpager.holder.ViewHolder;
+import com.zhpan.bannerview.holder.ViewHolder;
 
 /**
  * Created by zhpan on 2017/10/30.

app/src/main/res/layout/activity_main.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.zhpan.viewpager.view.BannerViewPager
+    <com.zhpan.bannerview.view.BannerViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="150dp"
@@ -15,13 +15,13 @@
         app:indicator_radius="6dp"
         app:interval="5000" />
 
-    <com.zhpan.viewpager.view.BannerViewPager
+    <com.zhpan.bannerview.view.BannerViewPager
         android:id="@+id/viewpager2"
         android:layout_width="match_parent"
         android:layout_height="150dp"
         android:layout_margin="10dp" />
 
-    <com.zhpan.viewpager.view.BannerViewPager
+    <com.zhpan.bannerview.view.BannerViewPager
         android:id="@+id/viewpager3"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

viewpager/build.gradle → bannerview/build.gradle

@@ -1,14 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
-// 这个version是区分library版本的，因此当我们需要更新library时记得修改这个version
-version = "1.0.6"
 android {
     compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+
 
     defaultConfig {
-        minSdkVersion 17
+        minSdkVersion 19
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
@@ -16,23 +14,26 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+
     testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
 }
 
+
 def siteUrl = 'https://github.com/zhpanvip/CircleViewPager'      // 项目的主页
 def gitUrl = 'https://github.com/zhpanvip/CircleViewPager.git'   // Git仓库的url
 group = "com.zhpan.library" // Maven Group ID for the artifact，一般填你唯一的包名

viewpager/proguard-rules.pro → bannerview/proguard-rules.pro

@@ -1,14 +1,10 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\zhpan\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:

viewpager/src/androidTest/java/com/example/viewpager/ExampleInstrumentedTest.java → bannerview/src/androidTest/java/com/zhpan/bannerview/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.example.viewpager;
+package com.zhpan.bannerview;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -10,17 +10,17 @@ import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
 /**
- * Instrumentation test, which will execute on an Android device.
+ * Instrumented test, which will execute on an Android device.
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
     @Test
-    public void useAppContext() throws Exception {
+    public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.example.viewpager.test", appContext.getPackageName());
+        assertEquals("com.zhpan.bannerview.test", appContext.getPackageName());
     }
 }

bannerview/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.zhpan.bannerview" />

viewpager/src/main/java/com/zhpan/viewpager/adapter/BannerPagerAdapter.java → bannerview/src/main/java/com/zhpan/bannerview/adapter/BannerPagerAdapter.java

@@ -1,13 +1,13 @@
-package com.zhpan.viewpager.adapter;
+package com.zhpan.bannerview.adapter;
 
 import android.support.annotation.NonNull;
 import android.support.v4.view.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.zhpan.viewpager.holder.HolderCreator;
-import com.zhpan.viewpager.holder.ViewHolder;
-import com.zhpan.viewpager.view.BannerViewPager;
+import com.zhpan.bannerview.holder.HolderCreator;
+import com.zhpan.bannerview.holder.ViewHolder;
+import com.zhpan.bannerview.view.BannerViewPager;
 
 import java.util.List;
 

viewpager/src/main/java/com/zhpan/viewpager/holder/HolderCreator.java → bannerview/src/main/java/com/zhpan/bannerview/holder/HolderCreator.java

@@ -1,4 +1,4 @@
-package com.zhpan.viewpager.holder;
+package com.zhpan.bannerview.holder;
 
 /**
  * Created by zhpan on 2017/10/30.

viewpager/src/main/java/com/zhpan/viewpager/holder/ViewHolder.java → bannerview/src/main/java/com/zhpan/bannerview/holder/ViewHolder.java

@@ -1,4 +1,4 @@
-package com.zhpan.viewpager.holder;
+package com.zhpan.bannerview.holder;
 
 import android.content.Context;
 import android.view.View;

viewpager/src/main/java/com/zhpan/viewpager/provider/BannerScroller.java → bannerview/src/main/java/com/zhpan/bannerview/provider/BannerScroller.java

@@ -1,4 +1,4 @@
-package com.zhpan.viewpager.provider;
+package com.zhpan.bannerview.provider;
 
 import android.content.Context;
 import android.view.animation.Interpolator;

viewpager/src/main/java/com/zhpan/viewpager/provider/OvalViewOutlineProvider.java → bannerview/src/main/java/com/zhpan/bannerview/provider/OvalViewOutlineProvider.java

@@ -1,5 +1,5 @@
 
-package com.zhpan.viewpager.provider;
+package com.zhpan.bannerview.provider;
 
 import android.annotation.TargetApi;
 import android.graphics.Outline;

viewpager/src/main/java/com/zhpan/viewpager/provider/RoundViewOutlineProvider.java → bannerview/src/main/java/com/zhpan/bannerview/provider/RoundViewOutlineProvider.java

@@ -1,6 +1,6 @@
 
 
-package com.zhpan.viewpager.provider;
+package com.zhpan.bannerview.provider;
 
 import android.annotation.TargetApi;
 import android.graphics.Outline;

viewpager/src/main/java/com/zhpan/viewpager/provider/ViewStyleSetter.java → bannerview/src/main/java/com/zhpan/bannerview/provider/ViewStyleSetter.java

@@ -1,6 +1,6 @@
 
 
-package com.zhpan.viewpager.provider;
+package com.zhpan.bannerview.provider;
 
 import android.os.Build;
 import android.support.annotation.RequiresApi;

viewpager/src/main/java/com/zhpan/viewpager/view/BannerViewPager.java → bannerview/src/main/java/com/zhpan/bannerview/view/BannerViewPager.java

@@ -1,4 +1,4 @@
-package com.zhpan.viewpager.view;
+package com.zhpan.bannerview.view;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -19,12 +19,12 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.example.viewpager.R;
-import com.zhpan.viewpager.adapter.BannerPagerAdapter;
-import com.zhpan.viewpager.holder.HolderCreator;
-import com.zhpan.viewpager.holder.ViewHolder;
-import com.zhpan.viewpager.provider.BannerScroller;
-import com.zhpan.viewpager.provider.ViewStyleSetter;
+import com.zhpan.bannerview.R;
+import com.zhpan.bannerview.adapter.BannerPagerAdapter;
+import com.zhpan.bannerview.holder.HolderCreator;
+import com.zhpan.bannerview.holder.ViewHolder;
+import com.zhpan.bannerview.provider.BannerScroller;
+import com.zhpan.bannerview.provider.ViewStyleSetter;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

viewpager/src/main/java/com/zhpan/viewpager/view/CustomBViewPager.java → bannerview/src/main/java/com/zhpan/bannerview/view/CustomBViewPager.java

@@ -1,4 +1,4 @@
-package com.zhpan.viewpager.view;
+package com.zhpan.bannerview.view;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;

viewpager/src/main/java/com/zhpan/viewpager/view/IndicatorView.java → bannerview/src/main/java/com/zhpan/bannerview/view/IndicatorView.java

@@ -1,4 +1,4 @@
-package com.zhpan.viewpager.view;
+package com.zhpan.bannerview.view;
 
 import android.content.Context;
 import android.graphics.Canvas;

viewpager/src/main/res/layout/view_pager_layout.xml → bannerview/src/main/res/layout/view_pager_layout.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.zhpan.viewpager.view.CustomBViewPager
+    <com.zhpan.bannerview.view.CustomBViewPager
         android:id="@+id/vp_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

viewpager/src/test/java/com/example/viewpager/ExampleUnitTest.java → bannerview/src/test/java/com/zhpan/bannerview/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.example.viewpager;
+package com.zhpan.bannerview;
 
 import org.junit.Test;
 
@@ -11,7 +11,7 @@ import static org.junit.Assert.*;
  */
 public class ExampleUnitTest {
     @Test
-    public void addition_isCorrect() throws Exception {
+    public void addition_isCorrect() {
         assertEquals(4, 2 + 2);
     }
 }

settings.gradle

@@ -1 +1 @@
-include ':app', ':viewpager'
+include ':app', ':bannerview'

viewpager/src/main/AndroidManifest.xml

@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-    package="com.example.viewpager">
-
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>