From eff3208a72546460196618c0852c833d7d9ca78e Mon Sep 17 00:00:00 2001 From: Negue Date: Wed, 9 Dec 2015 23:45:35 +0100 Subject: [PATCH] fixes #169 --- .../android/habitica/MainActivity.java | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index d900ea164..d71e230da 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -28,6 +28,7 @@ import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback; import com.habitrpg.android.habitica.callbacks.TaskScoringCallback; import com.habitrpg.android.habitica.databinding.ValueBarBinding; import com.habitrpg.android.habitica.events.TaskRemovedEvent; +import com.habitrpg.android.habitica.events.ToggledInnStateEvent; import com.habitrpg.android.habitica.events.commands.BuyRewardCommand; import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand; import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand; @@ -185,23 +186,6 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb } } - public void onEvent(final DeleteTaskCommand cmd){ - mAPIHelper.apiService.deleteTask(cmd.TaskIdToDelete, new Callback() { - @Override - public void success(Void aVoid, Response response) { - EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete)); - } - - @Override - public void failure(RetrofitError error) { - - } - }); - } - - public void onEvent(OpenGemPurchaseFragmentCommand cmd) { - drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE); - } @Override public boolean onCreateOptionsMenu(Menu menu) { @@ -501,6 +485,12 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb snackbar.show(); } + // region Events + + public void onEvent(ToggledInnStateEvent evt) { + avatarInHeader.updateData(user); + } + public void onEvent(final BuyRewardCommand event) { final String rewardKey = event.Reward.getId(); @@ -570,6 +560,27 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb user.async().save(); } + + public void onEvent(final DeleteTaskCommand cmd){ + mAPIHelper.apiService.deleteTask(cmd.TaskIdToDelete, new Callback() { + @Override + public void success(Void aVoid, Response response) { + EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete)); + } + + @Override + public void failure(RetrofitError error) { + + } + }); + } + + public void onEvent(OpenGemPurchaseFragmentCommand cmd) { + drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE); + } + + // endregion + @Override public void onTaskDataReceived(TaskDirectionData data, Task task) { if (task.type.equals("reward")) {