Skip to content

Commit c27e752

Browse files
committed
Merge pull request #29 from ogero/master
Drop minSdkVersion to 10, changed floating action button library.
2 parents c82d962 + d56cb53 commit c27e752

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55
buildToolsVersion "21.1.2"
66

77
defaultConfig {
8-
minSdkVersion 14
8+
minSdkVersion 10
99
targetSdkVersion 21
1010
versionCode 1
1111
versionName "1.0"

sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66

77
defaultConfig {
88
applicationId "github.chenupt.dragtoplayout.demo"
9-
minSdkVersion 14
9+
minSdkVersion 10
1010
targetSdkVersion 21
1111
versionCode 4
1212
versionName "1.1"
@@ -26,7 +26,7 @@ dependencies {
2626
compile 'de.greenrobot:eventbus:2.4.0'
2727
compile 'com.google.guava:guava:18.0'
2828
compile 'com.jpardogo.materialtabstrip:library:1.0.8'
29-
compile 'com.getbase:floatingactionbutton:1.7.0'
29+
compile 'com.github.shell-software:fab:1.0.5'
3030

3131
compile 'com.navercorp.pulltorefresh:library:3.2.0@aar'
3232

sample/src/main/res/layout/activity_main.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,17 @@
8181
</LinearLayout>
8282

8383

84-
<com.getbase.floatingactionbutton.FloatingActionButton
84+
<com.software.shell.fab.ActionButton
8585
xmlns:fab="http://schemas.android.com/apk/res-auto"
8686
android:id="@+id/actionButton"
8787
android:layout_width="wrap_content"
8888
android:layout_height="wrap_content"
89-
fab:fab_icon="@drawable/ic_fab_star"
90-
fab:fab_colorNormal="@color/colorAccent"
91-
fab:fab_colorPressed="@color/colorAccentPressed"
89+
android:layout_marginRight="@dimen/fab_margin"
90+
android:layout_marginBottom="@dimen/fab_margin"
9291
android:layout_gravity="bottom|right"
92+
fab:image="@drawable/ic_fab_star"
93+
fab:button_color="@color/colorAccent"
94+
fab:button_colorPressed="@color/colorAccentPressed"
9395
/>
9496

9597
</github.chenupt.dragtoplayout.DragTopLayout>

0 commit comments

Comments
 (0)