diff --git a/app/build.gradle b/app/build.gradle index 88f7ef1..d6d4c05 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,8 +36,10 @@ dependencies { compile 'com.android.support.constraint:constraint-layout:1.0.2' testCompile 'junit:junit:4.12' - compile project(':timelineview') compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + + compile project(':timelineview') +// compile 'com.github.po10cio:TimeLineView:1.0.0' } repositories { mavenCentral() diff --git a/app/src/main/java/me/jerryhanks/stepviewapp/MainActivity.kt b/app/src/main/java/me/jerryhanks/stepviewapp/MainActivity.kt index d1e5c09..182d0a0 100644 --- a/app/src/main/java/me/jerryhanks/stepviewapp/MainActivity.kt +++ b/app/src/main/java/me/jerryhanks/stepviewapp/MainActivity.kt @@ -6,9 +6,9 @@ import android.view.View import android.widget.FrameLayout import android.widget.TextView import kotlinx.android.synthetic.main.activity_main.* -import me.jerryhanks.stepview.IndicatorAdapter -import me.jerryhanks.stepview.interfaces.TimeLineViewCallback -import me.jerryhanks.stepview.model.Status +import me.jerryhanks.timelineview.IndicatorAdapter +import me.jerryhanks.timelineview.interfaces.TimeLineViewCallback +import me.jerryhanks.timelineview.model.Status class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/me/jerryhanks/stepviewapp/MyTimeLine.kt b/app/src/main/java/me/jerryhanks/stepviewapp/MyTimeLine.kt index db7314a..8a148bc 100644 --- a/app/src/main/java/me/jerryhanks/stepviewapp/MyTimeLine.kt +++ b/app/src/main/java/me/jerryhanks/stepviewapp/MyTimeLine.kt @@ -1,7 +1,7 @@ package me.jerryhanks.stepviewapp -import me.jerryhanks.stepview.model.Status -import me.jerryhanks.stepview.model.TimeLine +import me.jerryhanks.timelineview.model.Status +import me.jerryhanks.timelineview.model.TimeLine /** * @author <@Po10cio> on 10/18/17 for StepViewApp diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cb520a4..61b711e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -22,7 +22,7 @@ app:layout_constraintTop_toTopOf="parent" tools:text="@string/delivery_status" /> - + package="me.jerryhanks.timelineview"> diff --git a/timelineview/src/main/java/me/jerryhanks/stepview/IndicatorAdapter.kt b/timelineview/src/main/java/me/jerryhanks/timelineview/IndicatorAdapter.kt similarity index 94% rename from timelineview/src/main/java/me/jerryhanks/stepview/IndicatorAdapter.kt rename to timelineview/src/main/java/me/jerryhanks/timelineview/IndicatorAdapter.kt index 030aef1..f4fe3a4 100644 --- a/timelineview/src/main/java/me/jerryhanks/stepview/IndicatorAdapter.kt +++ b/timelineview/src/main/java/me/jerryhanks/timelineview/IndicatorAdapter.kt @@ -1,4 +1,4 @@ -package me.jerryhanks.stepview +package me.jerryhanks.timelineview import android.content.Context import android.support.v4.content.ContextCompat @@ -9,11 +9,9 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout -import java.util.ArrayList - -import me.jerryhanks.stepview.interfaces.TimeLineViewCallback -import me.jerryhanks.stepview.model.Status -import me.jerryhanks.stepview.model.TimeLine +import me.jerryhanks.timelineview.interfaces.TimeLineViewCallback +import me.jerryhanks.timelineview.model.Status +import me.jerryhanks.timelineview.model.TimeLine class IndicatorAdapter(private val timeLines: MutableList, private val context: Context, private val _callback: TimeLineViewCallback?) : RecyclerView.Adapter() { diff --git a/timelineview/src/main/java/me/jerryhanks/stepview/IndicatorHolder.kt b/timelineview/src/main/java/me/jerryhanks/timelineview/IndicatorHolder.kt similarity index 93% rename from timelineview/src/main/java/me/jerryhanks/stepview/IndicatorHolder.kt rename to timelineview/src/main/java/me/jerryhanks/timelineview/IndicatorHolder.kt index 1912771..85b2f50 100644 --- a/timelineview/src/main/java/me/jerryhanks/stepview/IndicatorHolder.kt +++ b/timelineview/src/main/java/me/jerryhanks/timelineview/IndicatorHolder.kt @@ -1,4 +1,4 @@ -package me.jerryhanks.stepview +package me.jerryhanks.timelineview import android.support.v7.widget.RecyclerView import android.view.View diff --git a/timelineview/src/main/java/me/jerryhanks/stepview/TimeLineView.kt b/timelineview/src/main/java/me/jerryhanks/timelineview/TimeLineView.kt similarity index 97% rename from timelineview/src/main/java/me/jerryhanks/stepview/TimeLineView.kt rename to timelineview/src/main/java/me/jerryhanks/timelineview/TimeLineView.kt index 12db140..5d80436 100644 --- a/timelineview/src/main/java/me/jerryhanks/stepview/TimeLineView.kt +++ b/timelineview/src/main/java/me/jerryhanks/timelineview/TimeLineView.kt @@ -1,4 +1,4 @@ -package me.jerryhanks.stepview +package me.jerryhanks.timelineview import android.content.Context import android.support.v7.widget.LinearLayoutManager diff --git a/timelineview/src/main/java/me/jerryhanks/stepview/interfaces/TimeLineViewCallback.kt b/timelineview/src/main/java/me/jerryhanks/timelineview/interfaces/TimeLineViewCallback.kt similarity index 72% rename from timelineview/src/main/java/me/jerryhanks/stepview/interfaces/TimeLineViewCallback.kt rename to timelineview/src/main/java/me/jerryhanks/timelineview/interfaces/TimeLineViewCallback.kt index 7c4e0ed..1e63695 100644 --- a/timelineview/src/main/java/me/jerryhanks/stepview/interfaces/TimeLineViewCallback.kt +++ b/timelineview/src/main/java/me/jerryhanks/timelineview/interfaces/TimeLineViewCallback.kt @@ -1,9 +1,9 @@ -package me.jerryhanks.stepview.interfaces +package me.jerryhanks.timelineview.interfaces import android.view.View import android.widget.FrameLayout -import me.jerryhanks.stepview.model.TimeLine +import me.jerryhanks.timelineview.model.TimeLine /** * @author <@Po10cio> on 10/18/17 for StepViewApp diff --git a/timelineview/src/main/java/me/jerryhanks/stepview/model/Status.kt b/timelineview/src/main/java/me/jerryhanks/timelineview/model/Status.kt similarity index 74% rename from timelineview/src/main/java/me/jerryhanks/stepview/model/Status.kt rename to timelineview/src/main/java/me/jerryhanks/timelineview/model/Status.kt index 0320036..0073d8a 100644 --- a/timelineview/src/main/java/me/jerryhanks/stepview/model/Status.kt +++ b/timelineview/src/main/java/me/jerryhanks/timelineview/model/Status.kt @@ -1,4 +1,4 @@ -package me.jerryhanks.stepview.model +package me.jerryhanks.timelineview.model /** * @author <@Po10cio> on 10/18/17 for StepViewApp diff --git a/timelineview/src/main/java/me/jerryhanks/stepview/model/TimeLine.kt b/timelineview/src/main/java/me/jerryhanks/timelineview/model/TimeLine.kt similarity index 78% rename from timelineview/src/main/java/me/jerryhanks/stepview/model/TimeLine.kt rename to timelineview/src/main/java/me/jerryhanks/timelineview/model/TimeLine.kt index 5ff600f..ca37963 100644 --- a/timelineview/src/main/java/me/jerryhanks/stepview/model/TimeLine.kt +++ b/timelineview/src/main/java/me/jerryhanks/timelineview/model/TimeLine.kt @@ -1,4 +1,4 @@ -package me.jerryhanks.stepview.model +package me.jerryhanks.timelineview.model /** * @author <@Po10cio> on 10/18/17 for StepViewApp diff --git a/timelineview/src/test/java/me/jerryhanks/stepview/ExampleUnitTest.kt b/timelineview/src/test/java/me/jerryhanks/timelineview/ExampleUnitTest.kt similarity index 91% rename from timelineview/src/test/java/me/jerryhanks/stepview/ExampleUnitTest.kt rename to timelineview/src/test/java/me/jerryhanks/timelineview/ExampleUnitTest.kt index e3ca8f0..52d6561 100644 --- a/timelineview/src/test/java/me/jerryhanks/stepview/ExampleUnitTest.kt +++ b/timelineview/src/test/java/me/jerryhanks/timelineview/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package me.jerryhanks.stepview +package me.jerryhanks.timelineview import org.junit.Test