Skip to content

Commit

Permalink
Refactored code
Browse files Browse the repository at this point in the history
  • Loading branch information
konifar committed Mar 12, 2018
1 parent 39d699f commit eb797f1
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 20 deletions.
3 changes: 1 addition & 2 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.kyash.androidspotinstructions;
package co.kyash.targetinstructions;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand All @@ -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());
}
}
6 changes: 1 addition & 5 deletions example/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="co.kyash.androidspotinstructions.example">
package="co.kyash.androidtargetinstructions.example">

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -20,10 +20,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".Main2Activity"
android:label="@string/title_activity_main2"
android:theme="@style/AppTheme"></activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.kyash.androidspotinstructions.example
package co.kyash.androidtargetinstructions.example

import android.app.Application

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

Expand Down
3 changes: 1 addition & 2 deletions example/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<resources>
<string name="app_name">AndroidSpotInstructions</string>
<string name="title_activity_main2">Main2Activity</string>
<string name="app_name">androidtargetinstructions</string>
</resources>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.kyash.androidspotinstructions;
package co.kyash.targetinstructions;

import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
@@ -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<T : AbstractSpotBuilder<T, S>, S : Spot>(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.kyash.spotinstructions
package co.kyash.targetinstructions

import android.animation.Animator
import android.animation.TimeInterpolator
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit eb797f1

Please sign in to comment.