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

GSoC 2014 code for Malaria Android #4

Merged
merged 12 commits into from
May 26, 2015
Merged

Conversation

rosariorobinson
Copy link
Contributor

No description provided.

chimdi2000 and others added 12 commits July 8, 2014 13:50
This is an update made to the first analytic screen of the Peace Corps
Malaria App
…ia-setup-screen

Conflicts:
	src/com/peacecorps/malaria/MainActivity.java
	src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java
Updated app crashing when you swipe to the analytics screen and
settings button icon now working.
… into malaria-setup-screen

Conflicts:
	src/com/peacecorps/malaria/AlarmAutoStart.java
	src/com/peacecorps/malaria/AlarmHandlerClass.java
	src/com/peacecorps/malaria/AlarmService.java
	src/com/peacecorps/malaria/AlertCallerFragmentActivity.java
	src/com/peacecorps/malaria/AlertDialogFragment.java
	src/com/peacecorps/malaria/DatabaseSQLiteHelper.java
	src/com/peacecorps/malaria/FirstAnalyticFragment.java
	src/com/peacecorps/malaria/FragmentAdapter.java
	src/com/peacecorps/malaria/HomeScreenFragment.java
	src/com/peacecorps/malaria/InfoHubFragmentActivity.java
	src/com/peacecorps/malaria/MainActivity.java
	src/com/peacecorps/malaria/PeaceCorpsPolicyFragmentActivity.java
	src/com/peacecorps/malaria/SecondAnalyticFragment.java
	src/com/peacecorps/malaria/SharedPreferenceStore.java
	src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java
choquette33 added a commit that referenced this pull request May 26, 2015
GSoC 2014 code for Malaria Android
@choquette33 choquette33 merged commit 6bda6a3 into peacecorps:master May 26, 2015
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