Skip to content

Commit a55df5f

Browse files
committed
1. Changed sample app package name
2. Fixed default TEXT SIZE for btn
1 parent f964c0c commit a55df5f

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ dependencies {
2626
})
2727
compile 'com.android.support:appcompat-v7:26.0.2'
2828
compile 'com.android.support.constraint:constraint-layout:1.0.2'
29+
compile project(":proswipebutton")
2930
testCompile 'junit:junit:4.12'
3031
}

app/src/androidTest/java/in/shadowfax/proswipebutton/ExampleInstrumentedTest.java renamed to app/src/androidTest/java/in/shadowfax/proswipebutton_app/ExampleInstrumentedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package in.shadowfax.proswipebutton;
1+
package in.shadowfax.proswipebutton_app;
22

33
import android.content.Context;
44
import android.support.test.InstrumentationRegistry;

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="in.shadowfax.proswipebutton">
3+
package="in.shadowfax.proswipebutton_app">
44

55
<application
66
android:allowBackup="true"
@@ -9,7 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12-
<activity android:name=".MainActivity">
12+
<activity android:name="in.shadowfax.proswipebutton_app.MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515

app/src/main/java/in/shadowfax/proswipebutton/MainActivity.java renamed to app/src/main/java/in/shadowfax/proswipebutton_app/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package in.shadowfax.proswipebutton;
1+
package in.shadowfax.proswipebutton_app;
22

33
import android.support.v7.app.AppCompatActivity;
44
import android.os.Bundle;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
tools:context="in.shadowfax.proswipebutton.MainActivity">
6+
tools:context="in.shadowfax.proswipebutton_app.MainActivity">
77

88
<in.shadowfax.proswipebutton.ProSwipeButton
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content" />
1111

12-
</android.support.constraint.ConstraintLayout>
12+
</RelativeLayout>

app/src/test/java/in/shadowfax/proswipebutton/ExampleUnitTest.java renamed to app/src/test/java/in/shadowfax/proswipebutton_app/ExampleUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package in.shadowfax.proswipebutton;
1+
package in.shadowfax.proswipebutton_app;
22

33
import org.junit.Test;
44

proswipebutton/src/main/java/in/shadowfax/proswipebutton/ProSwipeButton.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class ProSwipeButton extends RelativeLayout {
4848
private ImageView arrow2;
4949
private LinearLayout arrowHintContainer;
5050
private ProgressBar progressBar;
51-
private static final float DEFAULT_TEXT_SIZE = 14;
51+
private static final float DEFAULT_TEXT_SIZE = dpToPx(14);
5252
private static final int BTN_INIT_RADIUS = dpToPx(2);
5353
private static final int BTN_MORPHED_RADIUS = dpToPx(100);
5454
private static final int MORPH_ANIM_DURATION = 500;

0 commit comments

Comments
 (0)