Skip to content

AC-739 Added showcase view to manage providers #720

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
f4ww4z merged 2 commits into from
Apr 18, 2020
Merged

AC-739 Added showcase view to manage providers #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f43c7d
Added showcase view
rishabh-997 Apr 11, 2020
2fb7eb5
refactored unnecessary code
rishabh-997 Apr 12, 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
164 changes: 45 additions & 119 deletions openmrs-client/src/main/java/org/openmrs/mobile/activities/dashboard/DashboardFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,12 @@
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.github.amlcurran.showcaseview.OnShowcaseEventListener;
import com.github.amlcurran.showcaseview.ShowcaseView;
import com.github.amlcurran.showcaseview.targets.Target;
import com.github.amlcurran.showcaseview.targets.ViewTarget;

import org.openmrs.mobile.R;
import org.openmrs.mobile.activities.ACBaseActivity;
import org.openmrs.mobile.activities.ACBaseFragment;
Expand All @@ -42,6 +39,7 @@
import org.openmrs.mobile.activities.formentrypatientlist.FormEntryPatientListActivity;
import org.openmrs.mobile.activities.providermanagerdashboard.ProviderManagerDashboardActivity;
import org.openmrs.mobile.activities.syncedpatients.SyncedPatientsActivity;
import org.openmrs.mobile.utilities.ApplicationConstants;
import org.openmrs.mobile.utilities.FontsUtil;
import org.openmrs.mobile.utilities.ImageUtils;
import org.openmrs.mobile.utilities.ThemeUtils;
Expand All @@ -62,6 +60,12 @@ public class DashboardFragment extends ACBaseFragment<DashboardContract.Presente

private SparseArray<Bitmap> mBitmapCache;

/**
* @return New instance of SyncedPatientsFragment
*/
public static DashboardFragment newInstance() {
return new DashboardFragment();
}

@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
Expand All @@ -72,91 +76,48 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
SharedPreferences settings2 = getActivity().getSharedPreferences(PREFS_NAME, 0);

if (settings2.getBoolean("my_first_time", true)) {
showOverlayTutorialOne();
showOverlayTutorial(R.id.findPatientView, getString(R.string.dashboard_search_icon_label),
getString(R.string.showcase_find_patients), R.style.CustomShowcaseTheme,
ApplicationConstants.ShowCaseViewConstants.SHOW_FIND_PATIENT, true);
settings2.edit().putBoolean("my_first_time", false).apply();
}

}

private void showOverlayTutorialOne() {
Target viewTarget = new ViewTarget(R.id.findPatientView, this.getActivity());
new ShowcaseView.Builder(this.getActivity())
.setTarget(viewTarget)
.setContentTitle("Find Patients")
.setContentText("Click here to search through all the patients")
.hideOnTouchOutside()
.setStyle(R.style.CustomShowcaseTheme)
.setShowcaseEventListener(new OnShowcaseEventListener() {
@Override
public void onShowcaseViewHide(ShowcaseView showcaseView) {
showOverlayTutorialTwo();
showcaseView.setVisibility(View.GONE);
}

@Override
public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
//This method is intentionally left blank
}

@Override
public void onShowcaseViewShow(ShowcaseView showcaseView) {
//This method is intentionally left blank
}

@Override
public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {
//This method is intentionally left blank

}
})
.build();
}

private void showOverlayTutorialTwo() {
Target viewTarget = new ViewTarget(R.id.activeVisitsView, this.getActivity());
new ShowcaseView.Builder(this.getActivity())
.setTarget(viewTarget)
.setContentTitle("Active Visits")
.setContentText("Click here to get the list of all the currently active visits")
.hideOnTouchOutside()
.setStyle(R.style.CustomShowcaseTheme)
.setShowcaseEventListener(new OnShowcaseEventListener() {
@Override
public void onShowcaseViewHide(ShowcaseView showcaseView) {
showOverlayTutorialThree();
showcaseView.setVisibility(View.GONE);
}

@Override
public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
//This method is intentionally left blank
}

@Override
public void onShowcaseViewShow(ShowcaseView showcaseView) {
//This method is intentionally left blank
}

@Override
public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {
//This method is intentionally left blank
}
})
.build();
}

private void showOverlayTutorialThree() {
Target viewTarget = new ViewTarget(R.id.registryPatientView, this.getActivity());
new ShowcaseView.Builder(this.getActivity())
private void showOverlayTutorial(int view, String title, String content, int styleTheme,
int currentViewCount, Boolean showTextBelow) {
Target viewTarget = new ViewTarget(view, this.getActivity());
ShowcaseView.Builder builder = new ShowcaseView.Builder(this.getActivity())
.setTarget(viewTarget)
.setContentTitle("Register Patient")
.setContentText("Click here to register a new patient")
.setContentTitle(title)
.setContentText(content)
.hideOnTouchOutside()
.setStyle(R.style.CustomShowcaseTheme)
.setStyle(styleTheme)
.setShowcaseEventListener(new OnShowcaseEventListener() {
@Override
public void onShowcaseViewHide(ShowcaseView showcaseView) {
showOverlayTutorialFour();
switch (currentViewCount) {
case ApplicationConstants.ShowCaseViewConstants.SHOW_FIND_PATIENT:
showOverlayTutorial(R.id.activeVisitsView, getString(R.string.dashboard_visits_icon_label),
getString(R.string.showcase_active_visits), R.style.CustomShowcaseTheme,
ApplicationConstants.ShowCaseViewConstants.SHOW_ACTIVE_VISITS, true);
break;
case ApplicationConstants.ShowCaseViewConstants.SHOW_ACTIVE_VISITS:
showOverlayTutorial(R.id.registryPatientView, getString(R.string.action_register_patient),
getString(R.string.showcase_register_patient), R.style.CustomShowcaseTheme,
ApplicationConstants.ShowCaseViewConstants.SHOW_REGISTER_PATIENT, false);
break;
case ApplicationConstants.ShowCaseViewConstants.SHOW_REGISTER_PATIENT:
showOverlayTutorial(R.id.captureVitalsView, getString(R.string.dashboard_forms_icon_label),
getString(R.string.showcase_form_entry), R.style.CustomShowcaseTheme,
ApplicationConstants.ShowCaseViewConstants.SHOW_FORM_ENTRY, false);
break;
case ApplicationConstants.ShowCaseViewConstants.SHOW_FORM_ENTRY:
showOverlayTutorial(R.id.dashboardProviderManagementView, getString(R.string.action_provider_management),
getString(R.string.showcase_manage_providers), R.style.CustomShowcaseThemeExit,
ApplicationConstants.ShowCaseViewConstants.SHOW_MANAGE_PROVIDERS, false);
break;
}
showcaseView.setVisibility(View.GONE);
}

Expand All @@ -174,40 +135,11 @@ public void onShowcaseViewShow(ShowcaseView showcaseView) {
public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {
//This method is intentionally left blank
}
})
.build().forceTextPosition(ShowcaseView.ABOVE_SHOWCASE);
}

private void showOverlayTutorialFour() {
Target viewTarget = new ViewTarget(R.id.captureVitalsView, this.getActivity());
new ShowcaseView.Builder(this.getActivity())
.setTarget(viewTarget)
.setContentTitle("Form Entry")
.setContentText("Click here to capture vitals for a patient on a visit")
.hideOnTouchOutside()
.setStyle(R.style.CustomShowcaseThemeExit)
.setShowcaseEventListener(new OnShowcaseEventListener() {
@Override
public void onShowcaseViewHide(ShowcaseView showcaseView) {
showcaseView.setVisibility(View.GONE);
}

@Override
public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
//This method is intentionally left blank
}

@Override
public void onShowcaseViewShow(ShowcaseView showcaseView) {
//This method is intentionally left blank
}

@Override
public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {
//This method is intentionally left blank
}
})
.build().forceTextPosition(ShowcaseView.ABOVE_SHOWCASE);
});
if (showTextBelow)
builder.build();
else
builder.build().forceTextPosition(ShowcaseView.ABOVE_SHOWCASE);
}

@Override
Expand All @@ -231,6 +163,7 @@ private void initFragmentFields(View root) {
mActiveVisitsButton = root.findViewById(R.id.activeVisitsButton);
mCaptureVitalsButton = root.findViewById(R.id.captureVitalsButton);
mProviderManagementButton = root.findViewById(R.id.dashboardProviderManagementButton);

mFindPatientView = root.findViewById(R.id.findPatientView);
mRegistryPatientView = root.findViewById(R.id.registryPatientView);
mCaptureVitalsView = root.findViewById(R.id.captureVitalsView);
Expand Down Expand Up @@ -310,13 +243,6 @@ private void startNewActivity(Class<? extends ACBaseActivity> clazz) {
startActivity(intent);
}

/**
* @return New instance of SyncedPatientsFragment
*/
public static DashboardFragment newInstance() {
return new DashboardFragment();
}

@Override
public void onClick(View v) {
switch (v.getId()) {
Expand Down
7 changes: 7 additions & 0 deletions openmrs-client/src/main/java/org/openmrs/mobile/utilities/ApplicationConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,11 @@ public abstract static class OpenMRSlanguage{
public static final String[] LANGUAGE_LIST = {"en", "hi"};
}

public abstract static class ShowCaseViewConstants {
public static final int SHOW_FIND_PATIENT = 1;
public static final int SHOW_ACTIVE_VISITS = 2;
public static final int SHOW_REGISTER_PATIENT = 3;
public static final int SHOW_FORM_ENTRY = 4;
public static final int SHOW_MANAGE_PROVIDERS = 5;
}
}
7 changes: 7 additions & 0 deletions openmrs-client/src/main/res/values-hi/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,4 +372,11 @@
<string name="help_message">हमारी टीम हमेशा किसी भी सवाल का जवाब देने के लिए होती है। हमें एक ईमेल ड्रॉप करें या फ़ोरम पर पहुंचें और हम जल्द से जल्द जवाब देने की पूरी कोशिश करेंगे।</string>
<string name="contact_us">संपर्क करें</string>
<string name="no_mailing_client_found">कोई ईमेल क्लाइंट स्थापित नहीं हैं।</string>

<!-- ShowCaseView -->
<string name="showcase_find_patients">सभी मरीजों को खोजने के लिए यहां क्लिक करें</string>
<string name="showcase_active_visits">वर्तमान में सक्रिय दौरा की सूची प्राप्त करने के लिए यहां क्लिक करें</string>
<string name="showcase_register_patient">नया मरीज पंजीकृत करने के लिए यहां क्लिक करें</string>
<string name="showcase_form_entry">एक मरीज के वाइटल कलेक्ट करने के लिए यहां क्लिक करें</string>
<string name="showcase_manage_providers">एक मरीज के लिए पोषणकर्ता का प्रबंधन करने के लिए यहां क्लिक करें</string>
</resources>
7 changes: 7 additions & 0 deletions openmrs-client/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,11 @@
<string name="contact_irc_url" translatable="false">https://wiki.openmrs.org/display/IRC/Home</string>
<string name="contact_us">Contact Us</string>
<string name="no_mailing_client_found">There are no email clients installed.</string>

<!-- ShowCaseView -->
<string name="showcase_find_patients">Click here to search through all the patients</string>
<string name="showcase_active_visits">Click here to get the list of all the currently active visits</string>
<string name="showcase_register_patient">Click here to register a new patient</string>
<string name="showcase_form_entry">Click here to capture vitals for a patient on a visit</string>
<string name="showcase_manage_providers">Click here to manage providers for a patient on a visit</string>
</resources>