Amend deprecated lines for fragments #5
Open
jeannie876 wants to merge 67 commits intohkust1516csefyp43:masterfrom
ckygel:master
Open
Amend deprecated lines for fragments #5jeannie876 wants to merge 67 commits intohkust1516csefyp43:masterfrom ckygel:master
jeannie876 wants to merge 67 commits intohkust1516csefyp43:masterfrom
ckygel:master
Conversation
Quick fixed MaterialDialog in InventoryFragment and updated .gitignore
Added jar and modified gitignore
[fixed] app:theme is now deprecated. Please move to using android:theme instead
Landing Page (still under development)
fixed consultation / pharmacy problem in DrawerActivity.java
Added Search button in Floating Button in Triage Add Manually button in Floating Button goes directly to New Patient Activity Added Search button in Consultation (doesn't work yet)
updated deprecated methods in pharmacy (PharmacyFragment.java)
…istFragment again
…r(getResources(),R.color.colorAccent,null))
…r(getResources(),R.color.colorAccent,null))
Robotpie updated deprecated methods #1
fixed conflict error
… raspberry pi static IP.
# Conflicts: # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/DividerItemDecoration.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/activity/PatientVisitEditActivity.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/activity/PatientVisitViewActivity.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/custom/TwoEditTextDialogCustomView.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/fragment/patient_visit_edit/PersonalDataFragment.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/fragment/patient_visit_edit/VitalSignFragment.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/fragment/station/AdminFragment.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/fragment/station/ConsultationFragment.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/fragment/station/ReportsFragment.java # app/src/main/java/io/github/hkust1516csefyp43/easymed/view/fragment/station/TriageFragment.java
fixed robotpie conflic issues. changed server ip for new raspberry pi.
commented out redundant Intent statements (buttons working properly a…
working on making delete button for pharmacy
Added home button Added Settings and Logout button in LandingPage Removed Search button in Consultation
Fixed local server shutdown feature Updated IP in SyncActivity
…stered Patient" MaterialDialog, PatientVisitEditActivity is started and name is automatically entered into "Given Name" EditText Fixed "Triage Button in LandingPage leads to Consultation" bug
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Amend deprecated lines for fragments
ehr-android-master.zip