Hi Fandy, yes, you simple need to refactor your code, one Activity at a time! Let me know if you need help refactoring your code.

I think it’s a better investment of your resources compared to rewriting your app from scratch. TDD is a different topics and while it sounds nice, I’m doubtful whether it’s practical.