From ad40db1467a693e0b476071554033062cbcc0072 Mon Sep 17 00:00:00 2001
From: viviantnguyen <09vnguyen02@gmail.com>
Date: Fri, 30 Apr 2021 21:19:26 -0700
Subject: [PATCH 01/12] stretch_detail_actvity.xml ->
activity_stretchdetail.xml
---
.../com/example/myapplication/StretchDetailActvity.java | 2 +-
...tretch_detail_actvity.xml => activity_stretchdetail.xml} | 6 ++++++
app/src/main/res/layout/activity_stretchlist.xml | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
rename app/src/main/res/layout/{stretch_detail_actvity.xml => activity_stretchdetail.xml} (85%)
diff --git a/app/src/main/java/com/example/myapplication/StretchDetailActvity.java b/app/src/main/java/com/example/myapplication/StretchDetailActvity.java
index 1286a3c..0407be4 100644
--- a/app/src/main/java/com/example/myapplication/StretchDetailActvity.java
+++ b/app/src/main/java/com/example/myapplication/StretchDetailActvity.java
@@ -27,7 +27,7 @@ public class StretchDetailActvity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.stretch_detail_actvity);
+ setContentView(R.layout.activity_stretchdetail);
tvDetailName = findViewById(R.id.tvDetailName);
tvDescription = findViewById(R.id.tvDescription);
diff --git a/app/src/main/res/layout/stretch_detail_actvity.xml b/app/src/main/res/layout/activity_stretchdetail.xml
similarity index 85%
rename from app/src/main/res/layout/stretch_detail_actvity.xml
rename to app/src/main/res/layout/activity_stretchdetail.xml
index 331b861..00c1888 100644
--- a/app/src/main/res/layout/stretch_detail_actvity.xml
+++ b/app/src/main/res/layout/activity_stretchdetail.xml
@@ -11,7 +11,12 @@
android:id="@+id/tvDetailName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
+ android:fontFamily="sans-serif-light"
+ android:textAlignment="center"
android:textSize="25dp"
+ android:textStyle="bold"
tools:text="Name" />
\ No newline at end of file
From 5cb75cb757193e24f7fc12a67b6b7bb7359c8695 Mon Sep 17 00:00:00 2001
From: viviantnguyen <09vnguyen02@gmail.com>
Date: Fri, 30 Apr 2021 21:19:54 -0700
Subject: [PATCH 02/12] updated stretch layout
---
app/src/main/res/layout/item_stretch.xml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/item_stretch.xml b/app/src/main/res/layout/item_stretch.xml
index e5b72a4..b5360b8 100644
--- a/app/src/main/res/layout/item_stretch.xml
+++ b/app/src/main/res/layout/item_stretch.xml
@@ -9,9 +9,19 @@
android:id="@+id/tvName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="2dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="0dp"
- android:textSize="40dp"
+ android:fontFamily="sans-serif-light"
+ android:textAlignment="center"
+ android:textSize="25dp"
+ android:textStyle="bold"
tools:text="Stretch Here" />
+
+
\ No newline at end of file
From 7dc88137e8d16de3d4fc30d58473eb4d5398347c Mon Sep 17 00:00:00 2001
From: viviantnguyen <09vnguyen02@gmail.com>
Date: Fri, 30 Apr 2021 21:25:23 -0700
Subject: [PATCH 03/12] updated mood layout
---
app/src/main/res/layout/activity_mood.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/activity_mood.xml b/app/src/main/res/layout/activity_mood.xml
index 808fc1a..5dd7f9b 100644
--- a/app/src/main/res/layout/activity_mood.xml
+++ b/app/src/main/res/layout/activity_mood.xml
@@ -20,5 +20,16 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="239dp"
- android:text="submit" />
+ android:text="submit"
+ android:textSize="18sp" />
+
+
\ No newline at end of file
From f78ac7b39e07b8d1735816c243ee3b87424fbfc8 Mon Sep 17 00:00:00 2001
From: viviantnguyen <09vnguyen02@gmail.com>
Date: Fri, 30 Apr 2021 21:33:06 -0700
Subject: [PATCH 04/12] fixed menu (logout -> stretches)
---
.../main/java/com/example/myapplication/MainActivity.java | 2 +-
app/src/main/res/drawable/ic_baseline_face_24.xml | 5 +++++
app/src/main/res/menu/menu_bottom_navigation.xml | 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
create mode 100644 app/src/main/res/drawable/ic_baseline_face_24.xml
diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/example/myapplication/MainActivity.java
index 67558e7..0817397 100644
--- a/app/src/main/java/com/example/myapplication/MainActivity.java
+++ b/app/src/main/java/com/example/myapplication/MainActivity.java
@@ -64,7 +64,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
case R.id.action_compose:
fragment = new ComposeFragment();
break;
- case R.id.action_logout:
+ case R.id.action_stretches:
fragment = new StretchlistActivity();
break;
default: return true;
diff --git a/app/src/main/res/drawable/ic_baseline_face_24.xml b/app/src/main/res/drawable/ic_baseline_face_24.xml
new file mode 100644
index 0000000..e5ad8f1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_face_24.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/menu/menu_bottom_navigation.xml b/app/src/main/res/menu/menu_bottom_navigation.xml
index 0f2db7f..7c9081e 100644
--- a/app/src/main/res/menu/menu_bottom_navigation.xml
+++ b/app/src/main/res/menu/menu_bottom_navigation.xml
@@ -13,8 +13,8 @@
android:title="Compose"
app:showAsAction="always" />
-
Date: Thu, 6 May 2021 13:54:30 -0700
Subject: [PATCH 06/12] added parceler, renamed StretchlistActivity -> fragment
---
.../example/myapplication/ItemViewModel.java | 17 ++++++
.../example/myapplication/MainActivity.java | 15 ++++-
.../com/example/myapplication/Reminder.java | 38 +++++++++++-
.../myapplication/ReminderAdapter.java | 1 -
.../myapplication/ReminderListFragment.java | 61 +++++++++++++++++++
.../fragments/ComposeFragment.java | 26 ++++++--
.../main/res/layout/activity_reminderlist.xml | 19 ++++++
7 files changed, 168 insertions(+), 9 deletions(-)
create mode 100644 app/src/main/java/com/example/myapplication/ItemViewModel.java
create mode 100644 app/src/main/java/com/example/myapplication/ReminderListFragment.java
create mode 100644 app/src/main/res/layout/activity_reminderlist.xml
diff --git a/app/src/main/java/com/example/myapplication/ItemViewModel.java b/app/src/main/java/com/example/myapplication/ItemViewModel.java
new file mode 100644
index 0000000..95c9cd4
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/ItemViewModel.java
@@ -0,0 +1,17 @@
+package com.example.myapplication;
+
+import android.content.ClipData;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+public class ItemViewModel extends ViewModel {
+ private final MutableLiveData selectedItem = new MutableLiveData();
+ public void selectItem(ClipData.Item item) {
+ selectedItem.setValue(item);
+ }
+ public LiveData getSelectedItem() {
+ return selectedItem;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/example/myapplication/MainActivity.java
index 9f63e1a..9de79d5 100644
--- a/app/src/main/java/com/example/myapplication/MainActivity.java
+++ b/app/src/main/java/com/example/myapplication/MainActivity.java
@@ -15,7 +15,9 @@
import com.example.myapplication.fragments.ComposeFragment;
import com.google.android.material.bottomnavigation.BottomNavigationView;
-public class MainActivity extends AppCompatActivity {
+import org.parceler.Parcels;
+
+public class MainActivity extends AppCompatActivity implements ComposeFragment.OnDataPass {
final FragmentManager fragmentManager = getSupportFragmentManager();
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -65,7 +67,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
fragment = new ComposeFragment();
break;
case R.id.action_stretches:
- fragment = new StretchlistActivity();
+ fragment = new StretchListFragment();
break;
default: return true;
}
@@ -79,4 +81,13 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
}
+
+ @Override
+ public void onDataPass(Reminder r) { //todo: pass properly
+ Bundle bundle = new Bundle();
+ bundle.putParcelable("reminder",Parcels.wrap(r)); //todo: figure out why time binds to notes
+ ReminderListFragment frag = new ReminderListFragment();
+ frag.setArguments(bundle);
+ fragmentManager.beginTransaction().replace(R.id.flContainer,frag).commit();
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/Reminder.java b/app/src/main/java/com/example/myapplication/Reminder.java
index bfd5c46..80c8b00 100644
--- a/app/src/main/java/com/example/myapplication/Reminder.java
+++ b/app/src/main/java/com/example/myapplication/Reminder.java
@@ -1,6 +1,12 @@
package com.example.myapplication;
-public class Reminder {
+import android.os.Parcelable;
+
+import android.os.Parcel;
+
+import static java.lang.Integer.valueOf;
+
+public class Reminder implements Parcelable {
private String name;
private String date;
@@ -36,4 +42,34 @@ public int getMin(){
public String getNotes(){
return notes;
}
+
+ //parcel
+ public Reminder(Parcel in){
+ String[] data = new String[5];
+ in.readStringArray(data);
+ this.name = data[0];
+ this.date = data[1];
+ this.hour = Integer.parseInt(data[2]);
+ this.min = Integer.parseInt(data[3]);
+ this.notes = data[4];
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(android.os.Parcel dest, int flags) {
+ dest.writeStringArray(new String[] {this.name, this.date, Integer.toString(this.hour),Integer.toString(this.min),this.notes});
+ }
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator(){
+ public Reminder createFromParcel(Parcel in){
+ return new Reminder(in);
+ }
+
+ public Reminder[] newArray(int size) {
+ return new Reminder[size];
+ }
+ };
}
diff --git a/app/src/main/java/com/example/myapplication/ReminderAdapter.java b/app/src/main/java/com/example/myapplication/ReminderAdapter.java
index 1125c90..d6ac885 100644
--- a/app/src/main/java/com/example/myapplication/ReminderAdapter.java
+++ b/app/src/main/java/com/example/myapplication/ReminderAdapter.java
@@ -16,7 +16,6 @@ public class ReminderAdapter extends RecyclerView.Adapter reminders;
- //pass context & reminders TODO: load in based on date?
public ReminderAdapter(Context context, List reminders) {
this.context = context;
diff --git a/app/src/main/java/com/example/myapplication/ReminderListFragment.java b/app/src/main/java/com/example/myapplication/ReminderListFragment.java
new file mode 100644
index 0000000..ff9629a
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/ReminderListFragment.java
@@ -0,0 +1,61 @@
+package com.example.myapplication;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ReminderListFragment extends Fragment {
+ List reminders;
+ RecyclerView rvReminders;
+ ReminderAdapter reminderAdapter;
+ Reminder newly;
+ Bundle bundle;
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.activity_reminderlist, container, false);
+ Log.d("PAIN","Checking if getarguments null:"); //TODO: persist reminders added
+ if ((getArguments())!= null) {
+ newly = Parcels.unwrap(this.getArguments().getParcelable("reminder"));
+ }
+ else {
+ Log.d("PAIN","was null");
+ }
+ return view;
+
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+
+ super.onViewCreated(view, savedInstanceState);
+ MainActivity activity = (MainActivity) getActivity();
+ rvReminders = view.findViewById(R.id.rvReminders);
+ reminders = new ArrayList<>(); //TODO: prevent reminders being replaced
+ if (newly !=null) {
+ reminders.add(newly);
+ }
+ reminderAdapter = new ReminderAdapter(view.getContext(), reminders);
+ rvReminders.setAdapter(reminderAdapter);
+ rvReminders.setLayoutManager(new LinearLayoutManager(view.getContext()));
+
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/fragments/ComposeFragment.java b/app/src/main/java/com/example/myapplication/fragments/ComposeFragment.java
index 601b10d..85aa54b 100644
--- a/app/src/main/java/com/example/myapplication/fragments/ComposeFragment.java
+++ b/app/src/main/java/com/example/myapplication/fragments/ComposeFragment.java
@@ -1,7 +1,9 @@
package com.example.myapplication.fragments;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -22,9 +24,26 @@
import com.example.myapplication.R;
import com.example.myapplication.Reminder;
+import org.parceler.Parcels;
+
import java.util.Calendar;
public class ComposeFragment extends Fragment {
+ public interface OnDataPass {
+ public void onDataPass(Reminder reminder);
+ }
+
+ OnDataPass dataPasser;
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ dataPasser = (OnDataPass) context;
+ }
+
+ public void passData(Reminder reminder) {
+ dataPasser.onDataPass(reminder);
+ }
public static final String TAG = "ComposeFragment";
private EditText etName;
@@ -44,6 +63,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
+
Spinner spinner = (Spinner) getView().findViewById(R.id.spinnerTask);
// Create an ArrayAdapter using the string array and a default spinner layout
ArrayAdapter adapter = ArrayAdapter.createFromResource(this.getActivity(),
@@ -101,13 +121,9 @@ public void onClick(View v) {
.build();
Toast.makeText(getContext(), "Reminder created!", Toast.LENGTH_SHORT).show();
- goMainActivity();
+ passData(created);
}
});
}
- private void goMainActivity() {
- Intent i = new Intent(getContext(), MainActivity.class);
- startActivity(i);
- }
}
diff --git a/app/src/main/res/layout/activity_reminderlist.xml b/app/src/main/res/layout/activity_reminderlist.xml
new file mode 100644
index 0000000..6c86e10
--- /dev/null
+++ b/app/src/main/res/layout/activity_reminderlist.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
\ No newline at end of file
From bc42c5b52704fdafb27d315ecc5b390b3f546783 Mon Sep 17 00:00:00 2001
From: viviantnguyen <09vnguyen02@gmail.com>
Date: Thu, 6 May 2021 13:55:28 -0700
Subject: [PATCH 07/12] added parceler, renamed StretchlistActivity -> fragment
---
.../{StretchlistActivity.java => StretchListFragment.java} | 6 +-----
app/src/main/res/layout/activity_stretchlist.xml | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
rename app/src/main/java/com/example/myapplication/{StretchlistActivity.java => StretchListFragment.java} (86%)
diff --git a/app/src/main/java/com/example/myapplication/StretchlistActivity.java b/app/src/main/java/com/example/myapplication/StretchListFragment.java
similarity index 86%
rename from app/src/main/java/com/example/myapplication/StretchlistActivity.java
rename to app/src/main/java/com/example/myapplication/StretchListFragment.java
index 27ac1d7..c4ad6fa 100644
--- a/app/src/main/java/com/example/myapplication/StretchlistActivity.java
+++ b/app/src/main/java/com/example/myapplication/StretchListFragment.java
@@ -8,18 +8,14 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.example.myapplication.Stretch;
-import com.example.myapplication.StretchAdapter;
-
import java.util.ArrayList;
import java.util.List;
-public class StretchlistActivity extends Fragment {
+public class StretchListFragment extends Fragment {
List stretches;
diff --git a/app/src/main/res/layout/activity_stretchlist.xml b/app/src/main/res/layout/activity_stretchlist.xml
index 35f2bf7..9321bb4 100644
--- a/app/src/main/res/layout/activity_stretchlist.xml
+++ b/app/src/main/res/layout/activity_stretchlist.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".StretchlistActivity">
+ tools:context=".StretchListFragment">
Date: Thu, 6 May 2021 13:57:52 -0700
Subject: [PATCH 08/12] adjusted visual layout
---
app/src/main/res/layout/activity_stretchdetail.xml | 5 ++++-
app/src/main/res/layout/item_reminder.xml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_stretchdetail.xml b/app/src/main/res/layout/activity_stretchdetail.xml
index 00c1888..3bc150a 100644
--- a/app/src/main/res/layout/activity_stretchdetail.xml
+++ b/app/src/main/res/layout/activity_stretchdetail.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_margin="5dp"
android:orientation="vertical"
tools:context=".StretchDetailActvity">
@@ -30,7 +31,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0:00"
- android:textAlignment="center" />
+ android:textAlignment="center"
+ android:textSize="20sp"
+ android:textStyle="bold" />
\ No newline at end of file
From 6ab73eb83ae240366a6873aeaa5f3c6145c01d71 Mon Sep 17 00:00:00 2001
From: viviantnguyen <09vnguyen02@gmail.com>
Date: Thu, 6 May 2021 13:58:29 -0700
Subject: [PATCH 09/12] updated gradle/dependencies
---
.idea/compiler.xml | 2 +-
.idea/misc.xml | 2 +-
.idea/runConfigurations.xml | 10 ++++++++++
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
5 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 .idea/runConfigurations.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..860da66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 323cfb8..73c1c45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath "com.android.tools.build:gradle:4.1.2"
+ classpath 'com.android.tools.build:gradle:4.2.0'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5d52397..5244e18 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
From 2c34b8187734b7c235b000c9b8b87752aa4ffb6c Mon Sep 17 00:00:00 2001
From: otterice
Date: Thu, 6 May 2021 22:02:10 -0700
Subject: [PATCH 10/12] remindar with json
---
.idea/compiler.xml | 2 +-
.idea/misc.xml | 2 +-
.idea/runConfigurations.xml | 10 ---
.../com/example/myapplication/Remindar.java | 59 ++++++++++++++
.../myapplication/RemindarAdapter.java | 79 ++++++++++++++++++
.../myapplication/ReminderAdapter.java | 2 +-
.../myapplication/ReminderListFragment.java | 81 +++++++++++++++++--
.../fragments/ComposeFragment.java | 4 -
.../main/res/layout/activity_reminderlist.xml | 13 ++-
app/src/main/res/raw/remindar.json | 13 +++
build.gradle | 2 +-
11 files changed, 236 insertions(+), 31 deletions(-)
delete mode 100644 .idea/runConfigurations.xml
create mode 100644 app/src/main/java/com/example/myapplication/Remindar.java
create mode 100644 app/src/main/java/com/example/myapplication/RemindarAdapter.java
create mode 100644 app/src/main/res/raw/remindar.json
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..61a9130 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66..d5d35ec 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/Remindar.java b/app/src/main/java/com/example/myapplication/Remindar.java
new file mode 100644
index 0000000..5d9c36b
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/Remindar.java
@@ -0,0 +1,59 @@
+package com.example.myapplication;
+
+public class Remindar {
+
+ private String name;
+ private String date;
+ private int hour;
+ private int min;
+ private String notes;
+
+
+ public Remindar(String name, String date, int hour, int min, String notes){
+ this.name = name;
+ this.date = date;
+ this.hour = hour;
+ this.min = min;
+ this.notes = notes;
+ }
+
+ public String getName(){
+ return name;
+ }
+
+ public String getDate(){
+ return date;
+ }
+
+ public int getHour(){
+ return hour;
+ }
+
+ public int getMin(){
+ return min;
+ }
+
+ public String getNotes(){
+ return notes;
+ }
+
+ public void setName(String nName){
+ name = nName;
+ }
+
+ public void setDate(String nDate){
+ date = nDate;
+ }
+
+ public void setHour(int nHour){
+ hour = nHour;
+ }
+
+ public void setMin(int nMin){
+ min = nMin;
+ }
+
+ public void setNotes(String nNotes){
+ notes = nNotes;
+ }
+}
diff --git a/app/src/main/java/com/example/myapplication/RemindarAdapter.java b/app/src/main/java/com/example/myapplication/RemindarAdapter.java
new file mode 100644
index 0000000..70903f3
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/RemindarAdapter.java
@@ -0,0 +1,79 @@
+package com.example.myapplication;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+public class RemindarAdapter extends RecyclerView.Adapter{
+ private static final int TYPE = 1;
+ private final Context context;
+ private final List