From dc565b71e7b2ce689ed47e9b76e8505faad45348 Mon Sep 17 00:00:00 2001 From: aaronphilips Date: Thu, 15 Sep 2016 18:38:12 -0600 Subject: [PATCH 1/3] just work --- .idea/modules.xml | 8 ++++++++ .idea/runConfigurations.xml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ 3 files changed, 26 insertions(+) create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..c3c181cf5f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000000..7f68460d8b --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 7a778357973ff097a457cf65ce8e114feb735908 Mon Sep 17 00:00:00 2001 From: aaronphilips Date: Thu, 15 Sep 2016 18:45:26 -0600 Subject: [PATCH 2/3] just work --- .idea/.name | 1 + .idea/compiler.xml | 22 + .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 6 + .idea/gradle.xml | 23 + .idea/misc.xml | 19 + .idea/modules.xml | 1 + .idea/workspace.xml | 1918 ++++++++++++++++++++++ app/app.iml | 27 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 6 + lonelyTwitter.iml | 2 +- 12 files changed, 2024 insertions(+), 6 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/workspace.xml create mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000000..7084f5aced --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +lonelyTwitter \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000..96cc43efa6 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000000..e7bedf3377 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000000..97626ba454 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000000..508b3d9b88 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..12740ad14e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index c3c181cf5f..c15affbaa2 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000000..9fe55dea3d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1918 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1473986206297 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index ed7b4fca8b..aaaab9f346 100644 --- a/app/app.iml +++ b/app/app.iml @@ -12,10 +12,7 @@ + + + - + @@ -1888,7 +2103,7 @@ - + @@ -1915,4 +2130,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ca/ualberta/cs/lonelytwitter/Tweet.java b/app/src/main/java/ca/ualberta/cs/lonelytwitter/Tweet.java index 85312e68d5..df6d7a596e 100644 --- a/app/src/main/java/ca/ualberta/cs/lonelytwitter/Tweet.java +++ b/app/src/main/java/ca/ualberta/cs/lonelytwitter/Tweet.java @@ -1,5 +1,6 @@ package ca.ualberta.cs.lonelytwitter; +import java.util.ArrayList; import java.util.Date; /** @@ -8,7 +9,7 @@ public abstract class Tweet { private String message; private Date date; - + private ArrayList moods= new ArrayList(); public Tweet(String message){ this.message = message; } @@ -18,6 +19,13 @@ public Tweet(String message, Date date){ this.date = date; } + public ArrayList getMoods() { + return moods; + } + + public void setMoods(ArrayList moods) { + this.moods = moods; + } public abstract Boolean isImportant(); diff --git a/app/src/main/java/ca/ualberta/cs/lonelytwitter/badMood.java b/app/src/main/java/ca/ualberta/cs/lonelytwitter/badMood.java new file mode 100644 index 0000000000..ca75e55f61 --- /dev/null +++ b/app/src/main/java/ca/ualberta/cs/lonelytwitter/badMood.java @@ -0,0 +1,11 @@ +package ca.ualberta.cs.lonelytwitter; + +/** + * Created by aaron on 9/15/16. + */ +public class badMood extends mood { + @Override + public String getMood(){ + return "bad"; + } +} diff --git a/app/src/main/java/ca/ualberta/cs/lonelytwitter/goodMood.java b/app/src/main/java/ca/ualberta/cs/lonelytwitter/goodMood.java new file mode 100644 index 0000000000..6034c233be --- /dev/null +++ b/app/src/main/java/ca/ualberta/cs/lonelytwitter/goodMood.java @@ -0,0 +1,11 @@ +package ca.ualberta.cs.lonelytwitter; + +/** + * Created by aaron on 9/15/16. + */ +public class goodMood extends mood { + @Override + public String getMood(){ + return "good"; + } +} diff --git a/app/src/main/java/ca/ualberta/cs/lonelytwitter/mood.java b/app/src/main/java/ca/ualberta/cs/lonelytwitter/mood.java new file mode 100644 index 0000000000..1e2380e6d8 --- /dev/null +++ b/app/src/main/java/ca/ualberta/cs/lonelytwitter/mood.java @@ -0,0 +1,19 @@ +package ca.ualberta.cs.lonelytwitter; + +import java.util.Date; + +/** + * Created by aaron on 9/15/16. + */ +public abstract class mood { + private Date date; + public abstract String getMood(); + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } +}