-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Materialized the App. Addressed #10. #14
Conversation
@betterclever Please provide a description. Link to the Issue. along with screenshots. It would be easy for reviewer to give code comments! |
I'll be sending a new PR with conflicts resolved. |
# Conflicts: # app/src/main/java/org/fossasia/susi/ai/MainActivity.java # app/src/main/res/layout/activity_main.xml # app/src/main/res/layout/item_mine_message.xml
# Conflicts: # app/src/main/java/org/fossasia/susi/ai/MainActivity.java
Final List of changes:
|
@betterclever Please squash your commits from next time, else PRs can't be merged. @the-dagger Please don't merge un-squashed PRs from now. Thanks. |
@shivenmian github allows commits to be squashed during merging. |
I know they do, I thought you didn't. Checked now, no problem @the-dagger |
Solved issue #10. Attached are the screenshots of the new design.
![screenshot_20160926-090319](https://cloud.githubusercontent.com/assets/16309034/18823334/9787baca-83d6-11e6-8ebc-b0a9df361475.png)
![screenshot_20160926-090338](https://cloud.githubusercontent.com/assets/16309034/18823335/97896b0e-83d6-11e6-8d04-1b295589124d.png)