diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 9ef4871cb..9e986723e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -38,9 +38,8 @@ repositories {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'io.reactivex:rxjava:1.0.10'
- compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
- compile 'com.squareup.okhttp:okhttp:2.3.0'
+ compile 'com.squareup.okhttp3:okhttp-urlconnection:3.2.0'
+ compile 'com.squareup.okhttp3:okhttp:3.2.0'
compile 'com.squareup.retrofit:retrofit:1.9.0'
compile('com.crashlytics.sdk.android:crashlytics:2.3.0@aar') {
@@ -50,23 +49,19 @@ dependencies {
// View Elements Binding :)
compile 'com.jakewharton:butterknife:7.0.1'
- compile('com.mikepenz:materialdrawer:4.3.8@aar') {
+ compile('com.mikepenz:materialdrawer:5.0.9@aar') {
transitive = true
}
- compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar'
- compile 'com.android.support:appcompat-v7:23.1.1'
- compile 'com.android.support:design:23.1.1'
- compile 'com.android.support:gridlayout-v7:23.1.1'
- compile 'com.android.support:recyclerview-v7:23.1.1'
- compile 'com.android.support:preference-v14:23.1.1'
+ compile 'com.android.support:appcompat-v7:23.2.0'
+ compile 'com.android.support:design:23.2.0'
+ compile 'com.android.support:gridlayout-v7:23.2.0'
+ compile 'com.android.support:recyclerview-v7:23.2.0'
+ compile 'com.android.support:preference-v14:23.2.0'
// Image Loading/Caching
compile 'com.squareup.picasso:picasso:2.5.2'
- // Icons
- compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
-
// Emojis
compile 'com.github.data5tream:emoji-lib:0.0.2.1'
@@ -82,24 +77,29 @@ dependencies {
}
// a better fab alternative
- compile 'com.github.clans:fab:1.6.1'
+ compile 'com.github.clans:fab:1.6.2'
// ORM
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'
+ compile 'org.greenrobot:eventbus:3.0.0'
// IAP Handling / Verification
compile 'org.solovyev.android:checkout:0.7.5@aar'
- compile 'com.facebook.android:facebook-android-sdk:4.7.0'
+ compile('com.facebook.android:facebook-android-sdk:4.10.0') {
+ transitive = true
+ }
+
//Material Dialogs
compile('com.github.afollestad.material-dialogs:core:0.8.5.6@aar')
compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
+ compile 'com.github.traex.rippleeffect:library:1.3'
+
compile 'com.amplitude:android-sdk:2.5.0'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
diff --git a/Habitica/res/layout/edit_text_drawer_item.xml b/Habitica/res/layout/edit_text_drawer_item.xml
index abec349ac..39df77b86 100644
--- a/Habitica/res/layout/edit_text_drawer_item.xml
+++ b/Habitica/res/layout/edit_text_drawer_item.xml
@@ -1,37 +1,19 @@
-
-
-
-
-
-
-
-
-
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 4a16e8959..8b4a2d156 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -147,7 +147,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp"
- android:visibility="@{party.quest.active? View.VISIBLE : View.GONE}">
+ android:visibility="@{group.quest.active? View.VISIBLE : View.GONE}">
+ android:visibility="@{(group.quest != null && user.getId().equals(group.quest.leader))? View.VISIBLE : View.GONE}" />
+ android:visibility="@{(!user.getId().equals(group.quest.leader) && group.quest.members.containsKey(user.getId()))? View.VISIBLE : View.GONE}" />
@@ -174,7 +174,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp"
- android:visibility="@{!party.quest.active? View.VISIBLE : View.GONE}">
+ android:visibility="@{!group.quest.active? View.VISIBLE : View.GONE}">
+ android:visibility="@{user.getId().equals(group.quest.leader) ? View.VISIBLE : View.GONE}" />
+ android:visibility="@{user.getId().equals(group.quest.leader) ? View.VISIBLE : View.GONE}" />
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 4d78753c3..b8f4126bd 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -232,4 +232,5 @@ To start, which parts of your life do you want to improve?
Delete
Name
Description
+ Add Tag
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java
index 2864cc466..774fc185e 100644
--- a/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/SkillCallback.java
@@ -5,7 +5,7 @@ import com.habitrpg.android.habitica.events.SkillUsedEvent;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.magicmicky.habitrpgwrapper.lib.models.Skill;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
index c3295bc71..2e57bb1fa 100644
--- a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskCreationCallback.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.callbacks;
import android.util.Log;
import com.habitrpg.android.habitica.events.TaskCreatedEvent;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
index 4338db77d..cbc122b90 100644
--- a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.callbacks;
import android.util.Log;
import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 4031a5236..ed002422b 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -19,7 +19,8 @@ import com.habitrpg.android.habitica.userpicture.UserPicture;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
/**
* Created by Negue on 14.06.2015.
@@ -180,6 +181,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
valueBar.icHeader.setImageResource(icon);
}
+ @Subscribe
public void onEvent(BoughtGemsEvent gemsEvent){
Double gems = userObject.getBalance() * 4;
gems += gemsEvent.NewGemsToAdd;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/EditTextDrawer.java b/Habitica/src/com/habitrpg/android/habitica/ui/EditTextDrawer.java
index 277a67c8e..821f65b48 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/EditTextDrawer.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/EditTextDrawer.java
@@ -3,25 +3,24 @@ package com.habitrpg.android.habitica.ui;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.Button;
+import android.widget.EditText;
import com.github.data5tream.emojilib.EmojiEditText;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.commands.CreateTagCommand;
import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
import com.mikepenz.materialdrawer.model.BasePrimaryDrawerItem;
-import com.mikepenz.materialdrawer.model.utils.ViewHolderFactory;
+import com.mikepenz.materialdrawer.model.BaseViewHolder;
+import com.mikepenz.fastadapter.utils.ViewHolderFactory;
import butterknife.Bind;
import butterknife.ButterKnife;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
-/**
- * Created by Negue on 18.06.2015.
- */
-public class EditTextDrawer extends BasePrimaryDrawerItem {
+public class EditTextDrawer extends BasePrimaryDrawerItem {
@Override
- public String getType() {
- return "EDIT_TEXT_DRAWER";
+ public int getType() {
+ return R.id.material_drawer_item_primary;
}
@Override
@@ -30,33 +29,27 @@ public class EditTextDrawer extends BasePrimaryDrawerItem {
}
@Override
- public void bindView(RecyclerView.ViewHolder viewHolder) {
- final ViewHolder holder = (ViewHolder) viewHolder;
-// ((ViewHolder) viewHolder).btnAdd
-
+ public void bindView(ViewHolder holder) {
onPostBindView(this, holder.itemView);
-
}
-
@Override
public ViewHolderFactory getFactory() {
return new ItemFactory();
}
- public static class ItemFactory implements ViewHolderFactory {
- public ViewHolder factory(View v) {
+ public static class ItemFactory implements ViewHolderFactory {
+ public ViewHolder create(View v) {
return new ViewHolder(v);
}
}
-
public static class ViewHolder extends BaseViewHolder implements View.OnClickListener {
View view;
@Bind(R.id.editText)
- EmojiEditText editText;
+ EditText editText;
@Bind(R.id.btnAdd)
Button btnAdd;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java b/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
index bacafb772..caaa92efe 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
@@ -104,7 +104,8 @@ public class MainDrawerBuilder {
BaseMainFragment fragment = null;
Class newActivityClass = null;
- switch (drawerItem.getIdentifier()) {
+ int identifier = (int) drawerItem.getIdentifier();
+ switch (identifier) {
case SIDEBAR_TASKS: {
fragment = new TasksFragment();
break;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index acf0fcb5c..222241627 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -75,6 +75,7 @@ import com.raizlabs.android.dbflow.sql.language.From;
import com.raizlabs.android.dbflow.sql.language.Select;
import com.raizlabs.android.dbflow.sql.language.Where;
+import org.greenrobot.eventbus.Subscribe;
import org.json.JSONException;
import org.json.JSONObject;
import org.solovyev.android.checkout.ActivityCheckout;
@@ -91,7 +92,7 @@ import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import butterknife.Bind;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
@@ -504,23 +505,28 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
// region Events
+ @Subscribe
public void onEvent(ToggledInnStateEvent evt) {
avatarInHeader.updateData(user);
}
+ @Subscribe
public void onEvent(UpdateUserCommand event) {
mAPIHelper.apiService.updateUser(event.updateData, new HabitRPGUserCallback(this));
}
+ @Subscribe
public void onEvent(UnlockPathCommand event) {
this.user.setBalance(this.user.getBalance() - event.balanceDiff);
mAPIHelper.apiService.unlockPath(event.path, new UnlockCallback(this, this.user));
}
+ @Subscribe
public void onEvent(OpenMenuItemCommand event) {
drawer.setSelection(event.identifier);
}
+ @Subscribe
public void onEvent(final BuyRewardCommand event) {
final String rewardKey = event.Reward.getId();
@@ -588,6 +594,7 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
user.async().save();
}
+ @Subscribe
public void onEvent(final DeleteTaskCommand cmd) {
mAPIHelper.apiService.deleteTask(cmd.TaskIdToDelete, new Callback() {
@Override
@@ -602,14 +609,17 @@ public class MainActivity extends BaseActivity implements HabitRPGUserCallback.O
});
}
+ @Subscribe
public void onEvent(OpenGemPurchaseFragmentCommand cmd) {
drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
}
+ @Subscribe
public void onEvent(DisplayTutorialEvent tutorialEvent) {
this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialText);
}
+ @Subscribe
public void onEvent(DisplayFragmentEvent event) {
this.displayFragment(event.fragment);
}
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 96a3b4f3d..71352e7db 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -24,6 +24,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.raizlabs.android.dbflow.sql.builder.Condition;
import com.raizlabs.android.dbflow.sql.language.Select;
+import org.greenrobot.eventbus.Subscribe;
import org.json.JSONException;
import org.json.JSONObject;
@@ -31,7 +32,7 @@ import java.util.List;
import java.util.Map;
import butterknife.Bind;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
@@ -146,6 +147,7 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
pager.addOnPageChangeListener(this);
}
+ @Subscribe
public void onEvent(UpdateUserCommand event) {
this.apiHelper.apiService.updateUser(event.updateData, new HabitRPGUserCallback(this));
}
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 42c5ac37c..8cfc93425 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -56,7 +56,7 @@ import java.util.GregorianCalendar;
import java.util.List;
import butterknife.Bind;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
index e60f74451..cdf609427 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
@@ -31,7 +31,7 @@ import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
/**
* Created by viirus on 13/01/16.
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
index c1e87e763..f99f3f1ff 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
@@ -16,7 +16,7 @@ import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
/**
* Created by viirus on 25/11/15.
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
index 34b45dbb7..8dba5fc66 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
@@ -25,7 +25,7 @@ import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
public class CustomizationSetupAdapter extends RecyclerView.Adapter {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
index 49d8c3e73..0ff4fa90b 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
@@ -30,8 +30,7 @@ import com.habitrpg.android.habitica.ui.helpers.EmojiKeyboard;
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
-import com.mikepenz.fontawesome_typeface_library.FontAwesome;
-import com.mikepenz.iconics.Iconics;
+
import java.lang.reflect.Field;
import java.util.List;
@@ -39,7 +38,7 @@ import java.util.Map;
import butterknife.Bind;
import butterknife.ButterKnife;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
/**
* Created by Negue on 20.08.2015.
@@ -207,10 +206,6 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter
@@ -103,10 +104,12 @@ public class HabitItemRecyclerViewAdapter
EventBus.getDefault().register(this);
}
+ @Subscribe
public void onEvent(FilterTasksByTagsCommand cmd) {
filter();
}
+ @Subscribe
public void onEvent(TaskCheckedCommand evnt){
if (!taskType.equals(evnt.Task.getType()))
return;
@@ -119,6 +122,7 @@ public class HabitItemRecyclerViewAdapter
filter();
}
+ @Subscribe
public void onEvent(TaskUpdatedEvent evnt) {
if (!taskType.equals(evnt.task.getType()))
return;
@@ -126,6 +130,7 @@ public class HabitItemRecyclerViewAdapter
filter();
}
+ @Subscribe
public void onEvent(TaskCreatedEvent evnt) {
if (!taskType.equals(evnt.task.getType()))
return;
@@ -134,6 +139,7 @@ public class HabitItemRecyclerViewAdapter
filter();
}
+ @Subscribe
public void onEvent(TaskRemovedEvent evnt) {
Task taskToDelete = null;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
index 1f04ef066..2d99b35a7 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
@@ -16,7 +16,7 @@ import org.json.JSONObject;
import java.util.Date;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
public class BaseFragment extends Fragment {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
index 4f8164e0f..bc03a5a49 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
@@ -17,8 +17,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.raizlabs.android.dbflow.sql.builder.Condition;
import com.raizlabs.android.dbflow.sql.language.Select;
-import de.greenrobot.event.EventBus;
-import de.greenrobot.event.EventBusException;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.EventBusException;
public abstract class BaseMainFragment extends BaseFragment {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
index 2f0ae2295..2451f8d7f 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.BoughtGemsEvent;
import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
import io.fabric.sdk.android.Fabric;
import org.solovyev.android.checkout.*;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java
index 8e925c32e..e8ffc0451 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
/**
* Created by viirus on 28/11/15.
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
index e81bd81be..e3d403b18 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
@@ -24,6 +24,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.Skill;
import com.raizlabs.android.dbflow.sql.builder.Condition;
import com.raizlabs.android.dbflow.sql.language.Select;
+import org.greenrobot.eventbus.Subscribe;
+
import java.util.List;
import butterknife.Bind;
@@ -94,6 +96,7 @@ public class SkillsFragment extends BaseMainFragment {
checkUserLoadSkills();
}
+ @Subscribe
public void onEvent(UseSkillCommand command) {
Skill skill = command.skill;
if (skill.target.equals("task")) {
@@ -106,6 +109,7 @@ public class SkillsFragment extends BaseMainFragment {
}
}
+ @Subscribe
public void onEvent(SkillUsedEvent event) {
removeProgressDialog();
Skill skill = event.usedSkill;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
index dd0a0379a..e98774dbb 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
@@ -40,8 +40,10 @@ import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
-import de.greenrobot.event.EventBus;
-import de.greenrobot.event.EventBusException;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.EventBusException;
+import org.greenrobot.eventbus.Subscribe;
+
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
@@ -213,6 +215,7 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
}
+ @Subscribe
public void onEvent(final FlagChatMessageCommand cmd) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.chat_flag_confirmation)
@@ -236,6 +239,7 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
builder.show();
}
+ @Subscribe
public void onEvent(final ToggleLikeMessageCommand cmd) {
apiHelper.apiService.likeMessage(cmd.groupId, cmd.chatMessage.id, new Callback>() {
@Override
@@ -250,6 +254,7 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
});
}
+ @Subscribe
public void onEvent(final DeleteChatMessageCommand cmd) {
apiHelper.apiService.deleteMessage(cmd.groupId, cmd.chatMessage.id, new Callback() {
@Override
@@ -268,6 +273,7 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
});
}
+ @Subscribe
public void onEvent(SendNewGroupMessageCommand cmd) {
apiHelper.apiService.postGroupChat(cmd.TargetGroupId, cmd.Message, new Callback() {
@@ -290,6 +296,7 @@ public class ChatListFragment extends Fragment implements SwipeRefreshLayout.OnR
}
// If the ChatList is Tavern, we're able to toggle the sleep-mode
+ @Subscribe
public void onEvent(ToggleInnCommand event) {
apiHelper.toggleSleep(new Callback() {
@Override
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 18aa6d8bf..084bbd075 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -24,8 +24,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.QuestContent;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;
-import de.greenrobot.event.EventBus;
-import de.greenrobot.event.EventBusException;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.EventBusException;
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
index f9b7217c2..a9509c470 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
@@ -136,7 +136,7 @@ public class GuildFragment extends BaseMainFragment implements Callback {
switch (position) {
case 0: {
- fragment = guildInformationFragment = GroupInformationFragment.newInstance(GuildFragment.this.guild);
+ fragment = guildInformationFragment = GroupInformationFragment.newInstance(GuildFragment.this.guild, user, mAPIHelper);
break;
}
case 1: {
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
index 803a4cce0..e39e22c9e 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.HabitItemRecyclerViewAdapt
import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
/**
* TaskRecyclerViewFragment
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
index d36d09a1e..1d65b8bde 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
@@ -66,7 +66,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import de.greenrobot.event.EventBus;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
import retrofit.Callback;
import retrofit.RetrofitError;
import retrofit.client.Response;
@@ -373,6 +375,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
//region Events
+ @Subscribe
public void onEvent(final CreateTagCommand event) {
final Tag t = new Tag();
t.setName(event.tagName);
@@ -398,6 +401,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
}
}
+ @Subscribe
public void onEvent(TaskTappedEvent event) {
if (this.displayingTaskForm) {
return;
@@ -414,21 +418,22 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
}
}
- public void onEvent(TaskLongPressedEvent event) {
- }
-
+ @Subscribe
public void onEvent(TaskCheckedCommand event) {
mAPIHelper.updateTaskDirection(event.Task.getId(), event.Task.getCompleted() ? TaskDirection.down : TaskDirection.up, new TaskScoringCallback(activity, event.Task.getId()));
}
+ @Subscribe
public void onEvent(HabitScoreEvent event) {
mAPIHelper.updateTaskDirection(event.Habit.getId(), event.Up ? TaskDirection.up : TaskDirection.down, new TaskScoringCallback(activity, event.Habit.getId()));
}
+ @Subscribe
public void onEvent(AddNewTaskCommand event) {
openNewTaskActivity(event.ClassType.toLowerCase());
}
+ @Subscribe
public void onEvent(final TaskSaveEvent event) {
Task task = (Task) event.task;
if (event.created) {
@@ -440,6 +445,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
}
}
+ @Subscribe
public void onEvent(ToggledInnStateEvent event) {
user.getPreferences().setSleep(event.Inn);
}