Skip to content

Patients List UI screen & button for old screen launch. #72

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jul 14, 2020
Merged

Patients List UI screen & button for old screen launch. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
85d72da
Patient List view, and a button to launch old load screen.
pankajkatoch Jun 29, 2020
7d2cc80
Spotless for Patient List activity related files.
pankajkatoch Jun 29, 2020
cc4c413
Handle review comments for Patient List UI PR.
pankajkatoch Jul 6, 2020
62983e7
Run spotless apply.
pankajkatoch Jul 6, 2020
ad30a45
Added missing license headers.
pankajkatoch Jul 7, 2020
14adbb4
Spotless Apply added licenses and missing newlines at the end of files.
pankajkatoch Jul 7, 2020
d415c33
Added DummyDetailsContent to fix the build failure after github push.
pankajkatoch Jul 7, 2020
ec2710f
Fix separation of concerens between Activity, Adapter and the View Ho…
pankajkatoch Jul 8, 2020
8842310
Handled final round of review comments, and spotless checked.
pankajkatoch Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ ext {
okhttpLoggingInterceptorVersion = '4.0.0'
lifecycleVersion = '2.2.0'
retrofitVersion = '2.7.2'
recyclerviewVersion = '1.1.0'
legacySupportVersion = '1.0.0'
}

dependencies {
Expand All @@ -67,6 +69,8 @@ dependencies {
implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
implementation "com.squareup.retrofit2:retrofit-mock:$retrofitVersion"
implementation "com.squareup.okhttp3:logging-interceptor:$okhttpLoggingInterceptorVersion"
implementation "androidx.recyclerview:recyclerview:$recyclerviewVersion"
implementation "androidx.legacy:legacy-support-v4:$legacySupportVersion"

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
Expand Down
33 changes: 24 additions & 9 deletions example/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,37 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.fhirengine.example">
<uses-permission android:name="android.permission.INTERNET"/>
package="com.google.fhirengine.example">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".SamplePatientListActivity"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Given that we decided we'll use real data, we shouldn't name these things as sample. Whether it is sample or not has nothing to do with this activity anyway, it's to do with the data layer. So let's remove the word sample from this activity class name, as well as the PatientDetailsActivity class name, and also the patient details xml file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All instances of word sample have already been removed in upcoming Details UI PR, which I'm waiting to send for review, as I soon as I merge this one to the master.
That also will take care of renaming the MainActivity to CqlEvaluationActivity.

android:label="@string/title_samplepatient_list"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
Copy link
Collaborator

Choose a reason for hiding this comment

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

doesn't this clash with the same intent filter for .MainActivity below? I would try to reduce duplication by removing the same intent filter in the other one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed the action.MAIN and category.LAUNCHER from the erstwhile MainActivity (will be called CqlEvaluationActivity), for now.

Please note that it's fine for multiple activities to be marked as MAIN/LAUNCHER, as it's supposed to create different icons by the Home Launcher App. For the demo purpose, we may subsequently add loading of CQL library and Fhir resources as a separate Main Activity.

Copy link
Collaborator

Choose a reason for hiding this comment

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

can you rename the main activity to cql evaluation?

<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".SamplePatientDetailActivity"
android:label="@string/title_samplepatient_detail"
android:parentActivityName=".SamplePatientListActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.google.fhirengine.example.SamplePatientListActivity" />
</activity>
<activity android:name=".MainActivity"></activity>
</application>

</manifest>
Loading