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..a04bdee5bd
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000..c15affbaa2
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ 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
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000000..fdde602a12
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,2185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1473986206297
+
+ 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 @@
-
-
- generateDebugAndroidTestSources
generateDebugSources
@@ -28,7 +25,7 @@
-
+
@@ -50,6 +47,15 @@
+
+
+
+
+
+
+
+
+
@@ -57,6 +63,15 @@
+
+
+
+
+
+
+
+
+
@@ -64,11 +79,15 @@
+
+
+
+
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;
+ }
+}
diff --git a/build.gradle b/build.gradle
index 6a5c233c5d..bbe9eb20f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.android.tools.build:gradle:2.1.3'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..37e8a762b2
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Sep 15 18:37:36 MDT 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/lonelyTwitter.iml b/lonelyTwitter.iml
index c8cb2a390b..32491d79ae 100644
--- a/lonelyTwitter.iml
+++ b/lonelyTwitter.iml
@@ -13,7 +13,7 @@
-
+
\ No newline at end of file