Skip to content

Commit

Permalink
Merge pull request #1 from nasduck/dev
Browse files Browse the repository at this point in the history
Update package name
  • Loading branch information
DONGChuan authored Jun 4, 2019
2 parents af0c4b2 + b64378d commit f176729
Show file tree
Hide file tree
Showing 23 changed files with 26 additions and 71 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.duck.demo;
package com.zoopark.penguinindicator.demo;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.duck.penguinindicator.demo">
package="com.zoopark.penguinindicator.demo">

<application
android:allowBackup="true"
Expand All @@ -9,7 +9,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.AppCompat.Light">
<activity android:name="com.duck.penguinindicator.demo.MainActivity">
<activity android:name="com.zoopark.penguinindicator.demo.com.zoopark.penguinindicator.demo.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.duck.penguinindicator.demo;
package com.zoopark.penguinindicator.demo;

import android.graphics.Color;
import android.support.annotation.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

<com.duck.penguinindicator.indicator.RoundIndicator
<com.zoopark.indicator.indicator.RoundIndicator
android:id="@+id/indicator"
android:layout_width="wrap_content"
android:layout_height="48dp"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.duck.demo;
package com.zoopark.penguinindicator.demo;

import org.junit.Test;

Expand Down
File renamed without changes.
9 changes: 3 additions & 6 deletions penguinindicator/build.gradle → lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group = 'com.github.nasduck'
ext.githubProjectName = 'pengui-indicator'
ext.githubProjectName = 'penguin-indicator'

android {
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
versionCode 1
versionName "1.0.0"
versionCode 2
versionName "1.0.1"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand All @@ -29,7 +29,4 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.android.support:appcompat-v7:28.0.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'
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.duck.penguinindicator" />
package="com.zoopark.penguinindicator" />
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.duck.penguinindicator.base;
package com.zoopark.indicator.base;

import android.animation.Animator;
import android.animation.AnimatorInflater;
Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.duck.penguinindicator.config;
package com.zoopark.indicator.config;

import android.support.annotation.AnimatorRes;
import android.support.annotation.DrawableRes;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.duck.penguinindicator.interpolator;
package com.zoopark.indicator.interpolator;

import android.view.animation.Interpolator;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':penguinindicator'
include ':app', ':lib'

0 comments on commit f176729

Please sign in to comment.