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

AC-620: Make UI more consistent #607

Merged
merged 1 commit into from
Jun 16, 2019
Merged

Conversation

deepak140596
Copy link
Contributor

@deepak140596 deepak140596 commented Jun 14, 2019

Description of what I changed

  • Changed activity_patient_dashboard to CoordinatorLayout with a Nested Scroll view.
  • Changed Patient Details Fragment layout to be more consistent and follow Material Guidelines
  • Used @dimens as much as possible
  • Added some margin dimens and text view sizes for a consistent layout
  • Changed naming style for rows, now for every row layout, the name starts with row_*

Issue I worked on

JIRA Issue: https://issues.openmrs.org/browse/AC-620

Checklist: I completed these to help reviewers :)

  • My pull request only contains ONE single commit
    (the number above, next to the 'Commits' tab is 1).
  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)
  • All new and existing tests passed.
  • My pull request is based on the latest changes of the master branch.

@@ -48,7 +48,7 @@ public ActiveVisitsRecyclerViewAdapter(Context context, List<Visit> items) {
@NonNull
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and Formatted using AS

@@ -39,9 +39,10 @@

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

@@ -32,6 +32,7 @@

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

@@ -43,6 +43,7 @@

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

@@ -38,7 +38,7 @@
import androidx.core.content.ContextCompat;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

}
}

public void setBackdropImage(Bitmap backdropImage, String patientName) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting backdrop image and its click action

@@ -44,7 +44,7 @@ public PatientVisitsRecyclerViewAdapter(PatientVisitsFragment context, List<Visi
@NonNull
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

@@ -76,7 +76,7 @@ public SyncedPatientsRecyclerViewAdapter(SyncedPatientsFragment context, List<Pa
@NonNull
@Override
public SyncedPatientsRecyclerViewAdapter.PatientViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.find_synced_patients_row, parent, false);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

@@ -32,7 +32,7 @@ public OpenMRSInflater(LayoutInflater inflater) {
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored name and formatted using AS

@deepak140596 deepak140596 changed the title AC-602: Make UI more consistent AC-620: Make UI more consistent Jun 14, 2019
@codecov-io
Copy link

codecov-io commented Jun 14, 2019

Codecov Report

Merging #607 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #607      +/-   ##
==========================================
- Coverage   14.39%   14.38%   -0.02%     
==========================================
  Files         184      184              
  Lines        8558     8565       +7     
  Branches      746      746              
==========================================
  Hits         1232     1232              
- Misses       7249     7256       +7     
  Partials       77       77
Impacted Files Coverage Δ
.../activevisits/ActiveVisitsRecyclerViewAdapter.java 0% <0%> (ø) ⬆️
...cedpatients/SyncedPatientsRecyclerViewAdapter.java 0% <0%> (ø) ⬆️
...mentrypatientlist/FormEntryPatientListAdapter.java 0% <0%> (ø) ⬆️
...rg/openmrs/mobile/application/OpenMRSInflater.java 0% <0%> (ø) ⬆️
...board/visits/PatientVisitsRecyclerViewAdapter.java 0% <0%> (ø) ⬆️
...ditpatient/SimilarPatientsRecyclerViewAdapter.java 0% <0%> (ø) ⬆️
...tientdashboard/details/PatientDetailsFragment.java 0% <0%> (ø) ⬆️
...ies/patientdashboard/PatientDashboardActivity.java 0% <0%> (ø) ⬆️
.../java/org/openmrs/mobile/utilities/ImageUtils.java 0% <0%> (ø) ⬆️
...chingpatients/MergePatientsRecycleViewAdapter.java 0% <0%> (ø) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b8f5f4a...483802e. Read the comment docs.

@deepak140596
Copy link
Contributor Author

20190614_231041

@f4ww4z
Copy link
Collaborator

f4ww4z commented Jun 16, 2019

Looks good @deepak140596 ! Tested locally.

@f4ww4z f4ww4z merged commit 3a94d55 into openmrs:master Jun 16, 2019
@deepak140596 deepak140596 deleted the MaterialDesign branch June 17, 2019 15:20
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.

3 participants