modify badgeview
modify gallery choice adapter
fix conflict