diff --git a/app/build.gradle b/app/build.gradle index 727a5ac..f36ccb7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,5 +27,5 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - api project(':penguinindicator') + api project(':lib') } diff --git a/app/src/androidTest/java/com/duck/penguinindicator/demo/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/zoopark/penguinindicator/demo/ExampleInstrumentedTest.java similarity index 94% rename from app/src/androidTest/java/com/duck/penguinindicator/demo/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/zoopark/penguinindicator/demo/ExampleInstrumentedTest.java index 58f43c2..da8c43f 100644 --- a/app/src/androidTest/java/com/duck/penguinindicator/demo/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/zoopark/penguinindicator/demo/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.duck.demo; +package com.zoopark.penguinindicator.demo; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 739c77f..c81cd13 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.zoopark.penguinindicator.demo"> - + diff --git a/app/src/main/java/com/duck/penguinindicator/demo/DemoPagerAdapter.java b/app/src/main/java/com/zoopark/penguinindicator/demo/DemoPagerAdapter.java similarity index 96% rename from app/src/main/java/com/duck/penguinindicator/demo/DemoPagerAdapter.java rename to app/src/main/java/com/zoopark/penguinindicator/demo/DemoPagerAdapter.java index 7ff8b88..6a22d18 100644 --- a/app/src/main/java/com/duck/penguinindicator/demo/DemoPagerAdapter.java +++ b/app/src/main/java/com/zoopark/penguinindicator/demo/DemoPagerAdapter.java @@ -1,4 +1,4 @@ -package com.duck.penguinindicator.demo; +package com.zoopark.penguinindicator.demo; import android.graphics.Color; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/duck/penguinindicator/demo/MainActivity.java b/app/src/main/java/com/zoopark/penguinindicator/demo/MainActivity.java similarity index 81% rename from app/src/main/java/com/duck/penguinindicator/demo/MainActivity.java rename to app/src/main/java/com/zoopark/penguinindicator/demo/MainActivity.java index a8ec19a..b986b23 100644 --- a/app/src/main/java/com/duck/penguinindicator/demo/MainActivity.java +++ b/app/src/main/java/com/zoopark/penguinindicator/demo/MainActivity.java @@ -1,10 +1,11 @@ -package com.duck.penguinindicator.demo; +package com.zoopark.penguinindicator.demo; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import com.duck.penguinindicator.indicator.RoundIndicator; +import com.zoopark.penguinindicator.demo.R; +import com.zoopark.indicator.indicator.RoundIndicator; public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 548c8f2..4abff10 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,14 +4,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.duck.penguinindicator.demo.MainActivity"> + tools:context=".MainActivity"> - + package="com.zoopark.penguinindicator" /> diff --git a/penguinindicator/src/main/java/com/duck/penguinindicator/base/BaseIndicator.java b/lib/src/main/java/com/zoopark/indicator/base/BaseIndicator.java similarity index 97% rename from penguinindicator/src/main/java/com/duck/penguinindicator/base/BaseIndicator.java rename to lib/src/main/java/com/zoopark/indicator/base/BaseIndicator.java index 2f5b993..a25a1f6 100644 --- a/penguinindicator/src/main/java/com/duck/penguinindicator/base/BaseIndicator.java +++ b/lib/src/main/java/com/zoopark/indicator/base/BaseIndicator.java @@ -1,4 +1,4 @@ -package com.duck.penguinindicator.base; +package com.zoopark.indicator.base; import android.animation.Animator; import android.animation.AnimatorInflater; @@ -14,9 +14,9 @@ import android.view.View; import android.widget.LinearLayout; -import com.duck.penguinindicator.config.IndicatorConfig; -import com.duck.penguinindicator.R; -import com.duck.penguinindicator.interpolator.ReverseInterpolator; +import com.zoopark.indicator.config.IndicatorConfig; +import com.zoopark.penguinindicator.R; +import com.zoopark.indicator.interpolator.ReverseInterpolator; public class BaseIndicator extends LinearLayout { diff --git a/penguinindicator/src/main/java/com/duck/penguinindicator/builder/IndicatorBuilder.java b/lib/src/main/java/com/zoopark/indicator/builder/IndicatorBuilder.java similarity index 63% rename from penguinindicator/src/main/java/com/duck/penguinindicator/builder/IndicatorBuilder.java rename to lib/src/main/java/com/zoopark/indicator/builder/IndicatorBuilder.java index 0ede781..be630f7 100644 --- a/penguinindicator/src/main/java/com/duck/penguinindicator/builder/IndicatorBuilder.java +++ b/lib/src/main/java/com/zoopark/indicator/builder/IndicatorBuilder.java @@ -1,6 +1,6 @@ -package com.duck.penguinindicator.builder; +package com.zoopark.indicator.builder; -import com.duck.penguinindicator.config.IndicatorConfig; +import com.zoopark.indicator.config.IndicatorConfig; public class IndicatorBuilder { diff --git a/penguinindicator/src/main/java/com/duck/penguinindicator/config/IndicatorConfig.java b/lib/src/main/java/com/zoopark/indicator/config/IndicatorConfig.java similarity index 97% rename from penguinindicator/src/main/java/com/duck/penguinindicator/config/IndicatorConfig.java rename to lib/src/main/java/com/zoopark/indicator/config/IndicatorConfig.java index b492386..44c90c2 100644 --- a/penguinindicator/src/main/java/com/duck/penguinindicator/config/IndicatorConfig.java +++ b/lib/src/main/java/com/zoopark/indicator/config/IndicatorConfig.java @@ -1,4 +1,4 @@ -package com.duck.penguinindicator.config; +package com.zoopark.indicator.config; import android.support.annotation.AnimatorRes; import android.support.annotation.DrawableRes; diff --git a/penguinindicator/src/main/java/com/duck/penguinindicator/indicator/RoundIndicator.java b/lib/src/main/java/com/zoopark/indicator/indicator/RoundIndicator.java similarity index 95% rename from penguinindicator/src/main/java/com/duck/penguinindicator/indicator/RoundIndicator.java rename to lib/src/main/java/com/zoopark/indicator/indicator/RoundIndicator.java index d8d96de..09f8a8e 100644 --- a/penguinindicator/src/main/java/com/duck/penguinindicator/indicator/RoundIndicator.java +++ b/lib/src/main/java/com/zoopark/indicator/indicator/RoundIndicator.java @@ -1,10 +1,10 @@ -package com.duck.penguinindicator.indicator; +package com.zoopark.indicator.indicator; import android.content.Context; import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import com.duck.penguinindicator.base.BaseIndicator; +import com.zoopark.indicator.base.BaseIndicator; public class RoundIndicator extends BaseIndicator implements ViewPager.OnPageChangeListener { diff --git a/penguinindicator/src/main/java/com/duck/penguinindicator/interpolator/ReverseInterpolator.java b/lib/src/main/java/com/zoopark/indicator/interpolator/ReverseInterpolator.java similarity index 81% rename from penguinindicator/src/main/java/com/duck/penguinindicator/interpolator/ReverseInterpolator.java rename to lib/src/main/java/com/zoopark/indicator/interpolator/ReverseInterpolator.java index 19e5c71..adc0ae1 100644 --- a/penguinindicator/src/main/java/com/duck/penguinindicator/interpolator/ReverseInterpolator.java +++ b/lib/src/main/java/com/zoopark/indicator/interpolator/ReverseInterpolator.java @@ -1,4 +1,4 @@ -package com.duck.penguinindicator.interpolator; +package com.zoopark.indicator.interpolator; import android.view.animation.Interpolator; diff --git a/penguinindicator/src/main/res/animator/scale_with_alpha.xml b/lib/src/main/res/animator/scale_with_alpha.xml similarity index 100% rename from penguinindicator/src/main/res/animator/scale_with_alpha.xml rename to lib/src/main/res/animator/scale_with_alpha.xml diff --git a/penguinindicator/src/main/res/drawable/round_white.xml b/lib/src/main/res/drawable/round_white.xml similarity index 100% rename from penguinindicator/src/main/res/drawable/round_white.xml rename to lib/src/main/res/drawable/round_white.xml diff --git a/penguinindicator/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml similarity index 100% rename from penguinindicator/src/main/res/values/attrs.xml rename to lib/src/main/res/values/attrs.xml diff --git a/penguinindicator/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml similarity index 100% rename from penguinindicator/src/main/res/values/strings.xml rename to lib/src/main/res/values/strings.xml diff --git a/penguinindicator/src/androidTest/java/com/duck/penguinindicator/ExampleInstrumentedTest.java b/penguinindicator/src/androidTest/java/com/duck/penguinindicator/ExampleInstrumentedTest.java deleted file mode 100644 index fc6c5b0..0000000 --- a/penguinindicator/src/androidTest/java/com/duck/penguinindicator/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.duck.penguinindicator; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("com.duck.penguinindicator.test", appContext.getPackageName()); - } -} diff --git a/penguinindicator/src/test/java/com/duck/penguinindicator/ExampleUnitTest.java b/penguinindicator/src/test/java/com/duck/penguinindicator/ExampleUnitTest.java deleted file mode 100644 index 4812218..0000000 --- a/penguinindicator/src/test/java/com/duck/penguinindicator/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.duck.penguinindicator; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0d85d05..3cbe249 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':penguinindicator' +include ':app', ':lib'