diff --git a/.idea/modules.xml b/.idea/modules.xml index 90c36db..5125288 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,7 @@ - - + diff --git a/example/build.gradle b/example/build.gradle index f17154d..3f56261 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -12,7 +12,7 @@ android { dataBinding.enabled = true defaultConfig { - applicationId "co.kyash.androidspotinstructions" + applicationId "co.kyash.targetinstructions" minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch diff --git a/example/src/androidTest/java/co/kyash/androidspotinstructions/ExampleInstrumentedTest.java b/example/src/androidTest/java/co/kyash/androidspotinstructions/ExampleInstrumentedTest.java index 65fca46..8d39a6f 100644 --- a/example/src/androidTest/java/co/kyash/androidspotinstructions/ExampleInstrumentedTest.java +++ b/example/src/androidTest/java/co/kyash/androidspotinstructions/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package co.kyash.androidspotinstructions; +package co.kyash.targetinstructions; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public void useAppContext() throws Exception { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("co.kyash.androidspotinstructions", appContext.getPackageName()); + assertEquals("co.kyash.targetinstructions", appContext.getPackageName()); } } diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml index 9e41c9a..cf4b5f2 100644 --- a/example/src/main/AndroidManifest.xml +++ b/example/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="co.kyash.androidtargetinstructions.example"> @@ -20,10 +20,6 @@ - \ No newline at end of file diff --git a/example/src/main/java/co/kyash/androidspotinstructions/example/App.kt b/example/src/main/java/co/kyash/androidtargetinstructions/example/App.kt similarity index 71% rename from example/src/main/java/co/kyash/androidspotinstructions/example/App.kt rename to example/src/main/java/co/kyash/androidtargetinstructions/example/App.kt index bc5508b..cca4955 100644 --- a/example/src/main/java/co/kyash/androidspotinstructions/example/App.kt +++ b/example/src/main/java/co/kyash/androidtargetinstructions/example/App.kt @@ -1,4 +1,4 @@ -package co.kyash.androidspotinstructions.example +package co.kyash.androidtargetinstructions.example import android.app.Application diff --git a/example/src/main/java/co/kyash/androidspotinstructions/example/MainActivity.kt b/example/src/main/java/co/kyash/androidtargetinstructions/example/MainActivity.kt similarity index 91% rename from example/src/main/java/co/kyash/androidspotinstructions/example/MainActivity.kt rename to example/src/main/java/co/kyash/androidtargetinstructions/example/MainActivity.kt index 1253491..f66d666 100644 --- a/example/src/main/java/co/kyash/androidspotinstructions/example/MainActivity.kt +++ b/example/src/main/java/co/kyash/androidtargetinstructions/example/MainActivity.kt @@ -1,10 +1,10 @@ -package co.kyash.androidspotinstructions.example +package co.kyash.androidtargetinstructions.example import android.databinding.DataBindingUtil import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.ViewTreeObserver -import co.kyash.androidspotinstructions.example.databinding.ActivityMainBinding +import co.kyash.androidtargetinstructions.example.databinding.ActivityMainBinding import co.kyash.spotinstructions.SimpleSpot import co.kyash.spotinstructions.SpotInstructions diff --git a/example/src/main/res/values/strings.xml b/example/src/main/res/values/strings.xml index dd9d1f7..dfc4b38 100644 --- a/example/src/main/res/values/strings.xml +++ b/example/src/main/res/values/strings.xml @@ -1,4 +1,3 @@ - AndroidSpotInstructions - Main2Activity + androidtargetinstructions diff --git a/example/src/test/java/co/kyash/androidspotinstructions/ExampleUnitTest.java b/example/src/test/java/co/kyash/androidspotinstructions/ExampleUnitTest.java index a3d37c0..a1e9357 100644 --- a/example/src/test/java/co/kyash/androidspotinstructions/ExampleUnitTest.java +++ b/example/src/test/java/co/kyash/androidspotinstructions/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package co.kyash.androidspotinstructions; +package co.kyash.targetinstructions; import org.junit.Test; diff --git a/library/src/main/java/co/kyash/spotinstructions/AbstractSpotBuilder.kt b/library/src/main/java/co/kyash/targetinstructions/AbstractSpotBuilder.kt similarity index 94% rename from library/src/main/java/co/kyash/spotinstructions/AbstractSpotBuilder.kt rename to library/src/main/java/co/kyash/targetinstructions/AbstractSpotBuilder.kt index 07350b0..5973cfe 100644 --- a/library/src/main/java/co/kyash/spotinstructions/AbstractSpotBuilder.kt +++ b/library/src/main/java/co/kyash/targetinstructions/AbstractSpotBuilder.kt @@ -1,8 +1,10 @@ -package co.kyash.spotinstructions +package co.kyash.targetinstructions import android.app.Activity import android.support.annotation.DimenRes import android.view.View +import co.kyash.spotinstructions.R +import co.kyash.spotinstructions.Spot import java.lang.ref.WeakReference abstract class AbstractSpotBuilder, S : Spot>( diff --git a/library/src/main/java/co/kyash/spotinstructions/InstructionsView.kt b/library/src/main/java/co/kyash/targetinstructions/InstructionsView.kt similarity index 97% rename from library/src/main/java/co/kyash/spotinstructions/InstructionsView.kt rename to library/src/main/java/co/kyash/targetinstructions/InstructionsView.kt index aff5208..944a57f 100644 --- a/library/src/main/java/co/kyash/spotinstructions/InstructionsView.kt +++ b/library/src/main/java/co/kyash/targetinstructions/InstructionsView.kt @@ -1,4 +1,4 @@ -package co.kyash.spotinstructions +package co.kyash.targetinstructions import android.animation.Animator import android.animation.TimeInterpolator @@ -13,6 +13,8 @@ import android.support.v4.content.ContextCompat import android.util.AttributeSet import android.view.View import android.widget.FrameLayout +import co.kyash.spotinstructions.R +import co.kyash.spotinstructions.Spot class InstructionsView @JvmOverloads constructor( context: Context, diff --git a/library/src/main/java/co/kyash/spotinstructions/SimpleSpot.kt b/library/src/main/java/co/kyash/targetinstructions/SimpleSpot.kt similarity index 98% rename from library/src/main/java/co/kyash/spotinstructions/SimpleSpot.kt rename to library/src/main/java/co/kyash/targetinstructions/SimpleSpot.kt index 743c968..0b430fd 100644 --- a/library/src/main/java/co/kyash/spotinstructions/SimpleSpot.kt +++ b/library/src/main/java/co/kyash/targetinstructions/SimpleSpot.kt @@ -8,6 +8,7 @@ import android.view.View import android.view.WindowManager import android.widget.LinearLayout import android.widget.TextView +import co.kyash.targetinstructions.AbstractSpotBuilder class SimpleSpot( private val left: Float, diff --git a/library/src/main/java/co/kyash/spotinstructions/Spot.kt b/library/src/main/java/co/kyash/targetinstructions/Spot.kt similarity index 100% rename from library/src/main/java/co/kyash/spotinstructions/Spot.kt rename to library/src/main/java/co/kyash/targetinstructions/Spot.kt diff --git a/library/src/main/java/co/kyash/spotinstructions/SpotInstructions.kt b/library/src/main/java/co/kyash/targetinstructions/SpotInstructions.kt similarity index 96% rename from library/src/main/java/co/kyash/spotinstructions/SpotInstructions.kt rename to library/src/main/java/co/kyash/targetinstructions/SpotInstructions.kt index be607c8..2bbffbf 100644 --- a/library/src/main/java/co/kyash/spotinstructions/SpotInstructions.kt +++ b/library/src/main/java/co/kyash/targetinstructions/SpotInstructions.kt @@ -8,16 +8,17 @@ import android.support.annotation.ColorInt import android.view.ViewGroup import android.view.animation.DecelerateInterpolator import android.widget.FrameLayout +import co.kyash.targetinstructions.InstructionsView import java.lang.ref.WeakReference class SpotInstructions private constructor(activity: Activity) { companion object { - private val INSTRUCTIONS_DURATION = 500L + private val INSTRUCTIONS_DURATION = 300L @ColorInt private val DEFAULT_OVERLAY_COLOR = R.color.default_cover - private val DEFAULT_DURATION = 1000L + private val DEFAULT_DURATION = 500L private val DEFAULT_ANIMATION: TimeInterpolator = DecelerateInterpolator() fun with(activity: Activity) = SpotInstructions(activity)