diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml index 557ae917d..05eb95145 100644 --- a/Habitica/Habitica.iml +++ b/Habitica/Habitica.iml @@ -79,7 +79,7 @@ - + @@ -105,8 +105,6 @@ - - @@ -120,10 +118,11 @@ - + + @@ -160,8 +159,8 @@ - + diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 67e5e500d..f301420d3 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.application' -apply plugin: 'aar-link-sources' apply plugin: 'com.android.databinding' +apply plugin: 'aar-link-sources' apply plugin: 'io.fabric' buildscript { @@ -47,7 +47,7 @@ dependencies { transitive = true } - compile('com.github.florent37:materialviewpager:1.0.6@aar') { + compile('com.github.florent37:materialviewpager:1.0.7@aar') { transitive = true } @@ -78,6 +78,8 @@ dependencies { provided 'com.raizlabs.android:DBFlow-Compiler:2.2.1' compile "com.raizlabs.android:DBFlow-Core:2.2.1" compile "com.raizlabs.android:DBFlow:2.2.1" + + compile 'de.greenrobot:eventbus:2.4.0' } android { diff --git a/Habitica/src/com/habitrpg/android/habitica/events/AddTaskTappedEvent.java b/Habitica/src/com/habitrpg/android/habitica/events/AddTaskTappedEvent.java new file mode 100644 index 000000000..2366ca70b --- /dev/null +++ b/Habitica/src/com/habitrpg/android/habitica/events/AddTaskTappedEvent.java @@ -0,0 +1,8 @@ +package com.habitrpg.android.habitica.events; + +/** + * Created by Negue on 11.07.2015. + */ +public class AddTaskTappedEvent { + public Class ClassType ; +} diff --git a/Habitica/src/com/habitrpg/android/habitica/events/HabitScoreEvent.java b/Habitica/src/com/habitrpg/android/habitica/events/HabitScoreEvent.java new file mode 100644 index 000000000..a18c8aa55 --- /dev/null +++ b/Habitica/src/com/habitrpg/android/habitica/events/HabitScoreEvent.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.events; + +import com.magicmicky.habitrpgwrapper.lib.models.tasks.Habit; + +/** + * Created by Negue on 10.07.2015. + */ +public class HabitScoreEvent { + public boolean Up = false; + + public Habit Habit; +} diff --git a/Habitica/src/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java b/Habitica/src/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java new file mode 100644 index 000000000..c6e56bfc7 --- /dev/null +++ b/Habitica/src/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java @@ -0,0 +1,10 @@ +package com.habitrpg.android.habitica.events; + +import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem; + +/** + * Created by Negue on 10.07.2015. + */ +public class TaskLongPressedEvent { + public HabitItem Task; +} diff --git a/Habitica/src/com/habitrpg/android/habitica/events/TaskTappedEvent.java b/Habitica/src/com/habitrpg/android/habitica/events/TaskTappedEvent.java new file mode 100644 index 000000000..a4a2eb2a9 --- /dev/null +++ b/Habitica/src/com/habitrpg/android/habitica/events/TaskTappedEvent.java @@ -0,0 +1,10 @@ +package com.habitrpg.android.habitica.events; + +import com.magicmicky.habitrpgwrapper.lib.models.tasks.HabitItem; + +/** + * Created by Negue on 10.07.2015. + */ +public class TaskTappedEvent { + public HabitItem Task; +}