swap button impl
Merge branch 'dev' of https://github.com/abbadoh/AndroidApplication into dev