Skip to content
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

Master #1

Open
wants to merge 48 commits into
base: teambranch
Choose a base branch
from
Open

Master #1

wants to merge 48 commits into from

Conversation

MussieTD
Copy link
Collaborator

No description provided.

stvncruickshank and others added 30 commits October 17, 2017 20:07
…java to work with new UI.

Added some strings in strings.xml and text dimension in dimens.xml
…ragment.java to work with new UI."

This reverts commit 9408ccb.

# Conflicts:

#	app/src/main/java/com/bhcc/app/pharmtech/view/study/CardBackFragment.java
#	app/src/main/res/values/strings.xml
- Dialog window that display the "Drug of day" when the app starts.
Author: Soufiane R
- Dialog window that display the "Drug of day" when the app starts.
Author: Soufiane R
- Display Generic Name and Brand name instead of ID on RecyclerView
- Updated the Database
- Dialog window that display the "Drug of day" when the app starts.
Author: Soufiane R
- Display Generic Name and Brand name instead of ID on RecyclerView
- Updated the Database by adding wasDrugOfTheDay field
- Added DrugOfTheDay.java Class
- Dialog window that display the "Drug of day" when the app starts.
Author: Soufiane R
- Display Generic Name and Brand name instead of ID on RecyclerView
- Updated the Database by adding wasDrugOfTheDay field
- Added DrugOfTheDay.java Class
- Updated SplashScreen with a new flat icon.
- Dynamically display DOD on the Pop-Up Window & Menu.
- Changed the app name from green to blue.
# Conflicts:
#	app/src/main/assets/DRUGS.db
#	app/src/main/res/drawable/icn_play_solid.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants