-
Notifications
You must be signed in to change notification settings - Fork 2
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
MussieTD
wants to merge
48
commits into
teambranch
Choose a base branch
from
master
base: teambranch
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Master #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
made comments and very slight changes
… for recyclerView.
…java to work with new UI. Added some strings in strings.xml and text dimension in dimens.xml
…, MTD" This reverts commit 830921a.
This reverts commit 1b61f4c.
This reverts commit 556a4f8.
…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
…ment start QuizMixAndMatchFragment from selectQuizFragment
I am adding the new audio files, Losartan + HCTZ is missing
…le or special is empty, it clearly says doesn't have instead of showing either a '-' or ''.
… and About sections! let me know how it goes!
… and About sections! let me know how it goes!
…o, and it also has the javadocs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.