Add setter to currentButtonType and animate