implemnted drug reminder notification

Created new layout for second analysis screen
Fixed badge screen layout
medicine store shifted to appbar
taptargetviewer added
rapid fire, myth fact activities added

Author: geekanamika

build.gradle

@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        mavenCentral()
         jcenter()
         google()
     }
@@ -12,8 +11,8 @@ buildscript {
 allprojects {
     repositories {
         maven { url "http://dl.bintray.com/populov/maven" }
-        mavenCentral()
         google()
+        jcenter()
     }
 }
 

malaria-app-android/build.gradle

@@ -31,7 +31,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:support-v4:$rootProject.ext.supportLibraryVersion" // v4
+    implementation "com.android.support:support-v4:$rootProject.ext.supportLibraryVersion"
+    // v4
     implementation "com.viewpagerindicator:library:$rootProject.ext.viewPagerIndicatorVersion"
     implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
     implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
@@ -40,6 +41,8 @@ dependencies {
     implementation files('libs/GraphView-3.1.2.jar')
     implementation 'com.android.support:support-v4:26.1.0'
     testImplementation 'junit:junit:4.12'
+    compile 'com.github.vipulasri:timelineview:1.0.6'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
     //Room
     implementation "android.arch.persistence.room:runtime:$room_version"
     annotationProcessor "android.arch.persistence.room:compiler:$room_version"

malaria-app-android/src/main/AndroidManifest.xml

@@ -13,21 +13,21 @@
 
     <application
 
-        android:name=".utils.VolleyApplication"
+        android:name=".ui.base.MyApp"
         android:allowBackup="true"
         android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <service android:name=".services.AlarmService" />
+        <service android:name=".notifications.service.AlarmService" />
 
-        <receiver android:name=".code.reciever.AlarmAutoStart">
+        <receiver android:name=".notifications.receiver.DeviceRebootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".code.reciever.AlarmHandlerClass"
+            android:name=".notifications.receiver.AlarmHandlerClass"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.peacecorps.malaria.START_ALARM" />
@@ -56,6 +56,7 @@
         </activity>
         <activity
             android:name=".ui.main.MainActivity"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:label="@string/app_name" />
         <activity android:name=".ui.user_profile.edit_profile.EditProfileActivity"
@@ -84,16 +85,19 @@
         <activity android:name=".code.activities.DayFragmentActivity" />
 
         <activity
-            android:name=".code.activities.RemainderToneActivity"
+            android:name=".ui.home_screen.ReminderToneActivity"
             android:theme="@android:style/Theme.Holo.Dialog.NoActionBar" />
 
         <activity
             android:name=".code.activities.TripAlarmActivity"
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.Holo.Dialog.NoActionBar" />
+        <activity android:name=".ui.medicine_store.MedicineStoreActivity" />
+        <activity android:name=".ui.play.myth_vs_fact.MythFactActivity" />
+        <activity android:name=".ui.play.rapid_fire.RapidFireActivity" />
 
         <service
-            android:name=".services.TripAlarmService"
+            android:name=".code.reciever.services.TripAlarmService"
             android:enabled="true" />
 
         <receiver android:name=".code.reciever.TripAlarmReceiver" />

malaria-app-android/src/main/java/com/peacecorps/malaria/code/activities/DayFragmentActivity.java

@@ -354,7 +354,6 @@ public  long checkDrugTakenTimeInterval(String time,long day_time) {
             calt.add(Calendar.MONTH, 2);
             Date start = calt.getTime();
             Date end = cal.getTime();
-            //Todo idk what key it is, check later
             SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
                     + time, takenDate).apply();
             if (SharedPreferenceStore.mPrefsStore.getBoolean("com.peacecorps.malaria.isWeekly", false)) {

malaria-app-android/src/main/java/com/peacecorps/malaria/code/reciever/AlarmAutoStart.java

@@ -4,11 +4,11 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.peacecorps.malaria.code.notification.DrugReminderNotification;
+import com.peacecorps.malaria.notifications.DrugNotificationUtils;
 
 public class DrugReminderCallerReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        new DrugReminderNotification(context);
+        DrugNotificationUtils.startNotificationCheckSnooze(context);
     }
 }

malaria-app-android/src/main/java/com/peacecorps/malaria/code/reciever/AlarmHandlerClass.java

@@ -14,7 +14,7 @@
 import com.peacecorps.malaria.R;
 import com.peacecorps.malaria.db.DatabaseSQLiteHelper;
 import com.peacecorps.malaria.code.model.SharedPreferenceStore;
-import com.peacecorps.malaria.services.AlarmService;
+import com.peacecorps.malaria.notifications.service.AlarmService;
 import com.peacecorps.malaria.utils.CalendarFunction;
 
 import java.util.Calendar;
@@ -23,14 +23,13 @@
 public class DrugReminderReceiver extends BroadcastReceiver {
     static SharedPreferenceStore mSharedPreferenceStore;
     private static int mDrugAcceptedCount;
-    private NotificationManager alarmNotificationManager;
     private static int mDrugRejectedCount;
     private int flag;
     String TAG = getClass().getName();
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        alarmNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager alarmNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         switch (intent.getAction()) {
             case "0":
                 //not taken
@@ -68,14 +67,18 @@ private void notTaken(Context context) {
                 saveUsersettings(context,true, false);
                 /**Marked as Not Taken. No reminders now,it ll be for next time now.**/
                 DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(context);
-                databaseSQLiteHelper.getUserMedicationSelection(context, "weekly", Calendar.getInstance().getTime(), "no", computeAdherenceRate(context));
+                databaseSQLiteHelper.getUserMedicationSelection(context, "weekly",
+                        Calendar.getInstance().getTime(),
+                        "no", computeAdherenceRate(context));
                 changeWeeklyAlarmTime(context);
 
             } else {
                 if (checkDrugTakenTimeInterval("dateDrugTaken",context) > 0) {
                     saveUsersettings(context,false, false);
                     DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(context);
-                    databaseSQLiteHelper.getUserMedicationSelection(context, "daily", Calendar.getInstance().getTime(), "no", computeAdherenceRate(context));
+                    databaseSQLiteHelper.getUserMedicationSelection(context, "daily",
+                            Calendar.getInstance().getTime(),
+                            "no", computeAdherenceRate(context));
 
                 }
             }
@@ -110,6 +113,7 @@ public void getSettings(Context context) {
         int d = c.get(Calendar.DATE);
         int m = c.get(Calendar.MONTH);
         int y = c.get(Calendar.YEAR);
+
         DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(context);
         if (sqLite.getStatus(d, m, y).equalsIgnoreCase("yes") == true) {
             flag = 1;
@@ -190,15 +194,17 @@ private void taken(Context context) {
                 /**Updates the date when weekly drug was taken and set the alarm for nex weekly Date**/
                 saveUsersettings(context,true, true);
                 DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(context);
-                databaseSQLiteHelper.getUserMedicationSelection(context, "weekly", Calendar.getInstance().getTime(), "yes", computeAdherenceRate(context));
+                databaseSQLiteHelper.getUserMedicationSelection(context, "weekly", Calendar.getInstance().getTime(),
+                        "yes", computeAdherenceRate(context));
                 changeWeeklyAlarmTime(context);
 
             } else {
                 /**Updating the Daily Alarm and Cancelling today's notification because Drug is already Taken**/
                 if (checkDrugTakenTimeInterval("dateDrugTaken", context) > 0) {
                     saveUsersettings(context,true, false);
                     DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(context);
-                    databaseSQLiteHelper.getUserMedicationSelection(context, "daily", Calendar.getInstance().getTime(), "yes", computeAdherenceRate(context));
+                    databaseSQLiteHelper.getUserMedicationSelection(context, "daily", Calendar.getInstance().getTime(),
+                            "yes", computeAdherenceRate(context));
 
                 }
             }

malaria-app-android/src/main/java/com/peacecorps/malaria/code/reciever/DrugReminderCallerReceiver.java

@@ -15,7 +15,7 @@
 import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 
-import com.peacecorps.malaria.services.TripAlarmService;
+import com.peacecorps.malaria.code.reciever.services.TripAlarmService;
 
 /**
  * On receiving the calarm call from Alarm Service,

malaria-app-android/src/main/java/com/peacecorps/malaria/code/reciever/DrugReminderReceiver.java

@@ -1,4 +1,4 @@
-package com.peacecorps.malaria.code.notification;
+package com.peacecorps.malaria.code.reciever.notification;
 
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -16,7 +16,7 @@
 import java.util.Calendar;
 
 public class DrugReminderNotification {
-    Context context;
+    private Context context;
 
     public DrugReminderNotification(Context context) {
         this.context = context;
@@ -35,7 +35,8 @@ private void buildNotification() {
         /*Action Not Taken*/
         Intent intentNotTaken = new Intent(context, DrugReminderReceiver.class);
         intentNotTaken.setAction(context.getString(R.string.notification_action_code_not_taken));
-        PendingIntent pendingIntentNotTaken = PendingIntent.getBroadcast(context, 0, intentNotTaken, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pendingIntentNotTaken = PendingIntent.getBroadcast(context, 0, intentNotTaken,
+                PendingIntent.FLAG_UPDATE_CURRENT);
         NotificationCompat.Action actionNotTaken;
         actionNotTaken = new NotificationCompat.Action(R.drawable.ic_cancel_black_18dp, context.getString(R.string.drug_reminder_notification_action_not_taken)
                 , pendingIntentNotTaken);
@@ -64,7 +65,8 @@ private void buildNotification() {
               /*Action Snooze*/
             Intent intentSnooze = new Intent(context, DrugReminderReceiver.class);
             intentSnooze.setAction(context.getString(R.string.notification_action_code_snooze));
-            PendingIntent pendingIntentSnooze = PendingIntent.getBroadcast(context, 0, intentSnooze, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent pendingIntentSnooze = PendingIntent.getBroadcast(context, 0, intentSnooze,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
             NotificationCompat.Action actionSnooze;
             actionSnooze = new NotificationCompat.Action(R.drawable.ic_snooze_black_18dp, context.getString(R.string.drug_reminder_notification_action_snooze)
                     , pendingIntentSnooze);