main activity
main view
Merge pull request #2 from 16900310259/dev

Dev