temp commit

app/src/main/java/com/sudogeeks/talking_reminder/MainActivity.java

@@ -63,7 +63,7 @@ public class MainActivity extends AppCompatActivity {
     private ChildEventListener dbChildEventListener;     //No notify the app whenever data changes in firebase database
     private FirebaseAuth firebaseAuth;     //For User authentication
     private FirebaseAuth.AuthStateListener authStateListener;      //Listener which invokes whenever auth state changes
-    private ArrayList<ReminderDO> reminderDOArrayList = new ArrayList<>();
+    private List<ReminderDO> reminderDOList;
     private static final int RC_SIGN_IN = 123; // Choose an arbitrary request code value
 
     // Multi select items in recycler view
@@ -113,9 +113,9 @@ public class MainActivity extends AppCompatActivity {
 
                     // To check is there are saved reminders
                     // If there are no reminders display a message asking the user to create reminders
-                    List<ReminderDO> mTest = rb.getAllReminders();
+                    reminderDOList = rb.getAllReminders();
 
-                    if (mTest.isEmpty()) {
+                    if (reminderDOList.isEmpty()) {
                         mNoReminderView.setVisibility(View.VISIBLE);
                     } else {
                         mNoReminderView.setVisibility(View.GONE);
@@ -182,7 +182,7 @@ public class MainActivity extends AppCompatActivity {
 
         // To check is there are saved reminders
         // If there are no reminders display a message asking the user to create reminders
-        List<ReminderDO> mTest = rb.getAllReminders();
+        List<ReminderDO> mTest = reminderDOList;
 
         if (mTest.isEmpty()) {
             mNoReminderView.setVisibility(View.VISIBLE);
@@ -220,7 +220,8 @@ public class MainActivity extends AppCompatActivity {
                 @Override
                 public void onChildAdded(@NonNull DataSnapshot dataSnapshot, @Nullable String s) {
                     ReminderDO reminderObject = dataSnapshot.getValue(ReminderDO.class);
-                    reminderDOArrayList.add(reminderObject);
+                    mAdapter.addItem(reminderObject);
+//                    reminderDOList.add(reminderObject);
                 }
                 @Override
                 public void onChildChanged(@NonNull DataSnapshot dataSnapshot, @Nullable String s) {
@@ -299,9 +300,9 @@ public class MainActivity extends AppCompatActivity {
         firebaseAuth.addAuthStateListener(authStateListener);
         // To check is there are saved reminders
         // If there are no reminders display a message asking the user to create reminders
-        List<ReminderDO> mTest = rb.getAllReminders();
+        reminderDOList = rb.getAllReminders();
 
-        if (mTest.isEmpty()) {
+        if (reminderDOList.isEmpty()) {
             mNoReminderView.setVisibility(View.VISIBLE);
         } else {
             mNoReminderView.setVisibility(View.GONE);
@@ -349,6 +350,17 @@ public class MainActivity extends AppCompatActivity {
         public SimpleAdapter() {
             mItems = new ArrayList<>();
         }
+        public SimpleAdapter(ArrayList<ReminderItem> reminderDOList) {
+            mItems = reminderDOList;
+        }
+        public void addItem(ReminderDO reminderDO){
+            mItems.add(new ReminderItem(reminderDO.getTitle(),
+                    reminderDO.getDate() + " " + reminderDO.getTime(),
+                    reminderDO.getRepeat(),
+                    reminderDO.getRepeatType(),
+                    reminderDO.getRepeatNo(),
+                    reminderDO.getActive()));
+        }
 
         public void onDeleteItem(int count) {
             mItems.clear();
@@ -390,17 +402,12 @@ public class MainActivity extends AppCompatActivity {
             notifyDataSetChanged();
         }
 
-        // Generate random test data
-        public ReminderItem generateDummyData() {
-            return new ReminderItem("1", "2", "3", "4", "5", "6");
-        }
-
         // Generate real data for each item
         public List<ReminderItem> generateData(int count) {
             ArrayList<SimpleAdapter.ReminderItem> items = new ArrayList<>();
 
             // Get all reminderDOS from the database
-            List<ReminderDO> reminderDOS = rb.getAllReminders();
+            reminderDOList = rb.getAllReminders();
 
             // Initialize lists
             List<String> Titles = new ArrayList<>();
@@ -413,7 +420,7 @@ public class MainActivity extends AppCompatActivity {
             List<DateTimeSorter> DateTimeSortList = new ArrayList<>();
 
             // Add details of all reminderDOS in their respective lists
-            for (ReminderDO reminderDO : reminderDOS) {
+            for (ReminderDO reminderDO : reminderDOList) {
                 Titles.add(reminderDO.getTitle());
                 DateAndTime.add(reminderDO.getDate() + " " + reminderDO.getTime());
                 Repeats.add(reminderDO.getRepeat());

app/src/main/java/com/sudogeeks/talking_reminder/ReminderAddActivity.java

@@ -30,6 +30,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
+import com.google.android.gms.tasks.Task;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
@@ -41,6 +42,7 @@ import com.google.gson.GsonBuilder;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Calendar;
+import java.util.Random;
 
 public class ReminderAddActivity extends AppCompatActivity {
 
@@ -412,16 +414,19 @@ public class ReminderAddActivity extends AppCompatActivity {
         ReminderDatabase rb = new ReminderDatabase(this);
 
         // Creating ReminderDO
-        int ID = rb.addReminder(new ReminderDO(mTitle, mDate, mTime, mRepeat, mRepeatNo, mRepeatType, mActive));
+        //int ID = rb.addReminder(new ReminderDO(mTitle, mDate, mTime, mRepeat, mRepeatNo, mRepeatType, mActive));
 
+
+        Random random = new Random(9999);
+        int ID = random.nextInt();
         //Storing Reminders in firebase database
         ReminderDO reminderDO = new ReminderDO(mTitle, mDate, mTime, mRepeat, mRepeatNo, mRepeatType, mActive);
         FirebaseUser user = firebaseAuth.getCurrentUser();
         reminderDO.setOwnerID(user.getEmail());
         reminderDO.setReceiverID("null");
+        reminderDO.setID(ID);
         dbReference.child(user.getUid()).push().setValue(reminderDO);
 
-
         // Set up calender for creating the notification
         mCalendar.set(Calendar.MONTH, --mMonth);
         mCalendar.set(Calendar.YEAR, mYear);

app/src/main/java/com/sudogeeks/talking_reminder/ReminderDO.java

@@ -6,7 +6,6 @@ import lombok.ToString;
 
 // ReminderDO class
 //@Data
-@Data
 public class ReminderDO {
     private int mID;
     private String mTitle;