Skip to content

Commit 91deedd

Browse files
committed
progress bar now uses primary color by default
1 parent 22583bf commit 91deedd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

library/src/main/java/com/github/sealstudios/fab/FloatingActionButton.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ private static int getThemeAccentColor(Context context) {
13711371
private static int getThemePrimaryColor(Context context) {
13721372
int colorAttr;
13731373
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
1374-
colorAttr = android.R.attr.colorAccent;
1374+
colorAttr = android.R.attr.colorPrimary;
13751375
} else {
13761376
//Get colorAccent defined for AppCompat
13771377
colorAttr = context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
android:layout_marginEnd="16dp"
2727
android:src="@drawable/ic_progress"
2828
fab:fab_keep_progress_size="true"
29-
fab:fab_showAnimation="@anim/show_from_bottom"
30-
fab:fab_hideAnimation="@anim/hide_to_bottom"
29+
fab:fab_showAnimation="@anim/fab_slide_in_from_right"
30+
fab:fab_hideAnimation="@anim/fab_slide_out_to_right"
3131
android:layout_marginRight="16dp"/>
3232

3333
</androidx.coordinatorlayout.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)