From 243cfcc4dce79183bf6e2de3b67ff6e2e8a15db7 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Sat, 14 Nov 2015 19:35:14 +0100 Subject: [PATCH] Display snackbar on drop --- .../android/habitica/MainActivity.java | 5 ++++ .../lib/models/TaskDirectionData.java | 3 +++ .../lib/models/TaskDirectionDataDrop.java | 23 +++++++++++++++++++ .../lib/models/TaskDirectionDataTemp.java | 13 +++++++++++ 4 files changed, 44 insertions(+) create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index 2c33e29df..b6b82e2a8 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -546,6 +546,11 @@ public class MainActivity extends AvatarActivityBase implements HabitRPGUserCall @Override public void onTaskDataReceived(TaskDirectionData data) { notifyUser(data.getExp(), data.getHp(), data.getGp(), data.getLvl(), data.getDelta()); + if (data.get_tmp() != null) { + if (data.get_tmp().getDrop() != null) { + showSnackbar(data.get_tmp().getDrop().getDialog()); + } + } } @Override diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java index 85b500675..c53b9e7f2 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionData.java @@ -8,6 +8,7 @@ package com.magicmicky.habitrpgwrapper.lib.models; */ public class TaskDirectionData extends PlayerMinStats{ private float delta; + private TaskDirectionDataTemp _tmp; public float getDelta() { return delta; @@ -17,4 +18,6 @@ public class TaskDirectionData extends PlayerMinStats{ this.delta = delta; } + public TaskDirectionDataTemp get_tmp() { return _tmp; } + public void set_tmp(TaskDirectionDataTemp tmp) { this._tmp = tmp; } } diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java new file mode 100644 index 000000000..90e60b622 --- /dev/null +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataDrop.java @@ -0,0 +1,23 @@ +package com.magicmicky.habitrpgwrapper.lib.models; + +/** + * Created by viirus on 14/11/15. + */ +public class TaskDirectionDataDrop { + + private int value; + private String key; + private String type; + private String dialog; + + public int getValue() {return value; } + public String getKey() {return key; } + public String getType() {return type; } + public String getDialog() {return dialog; } + + public void setValue(int value) {this.value = value; } + public void setKey(String key) {this.key = key; } + public void setType(String type) {this.type = type; } + public void setDialog(String dialog) {this.dialog = dialog; } + +} diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java new file mode 100644 index 000000000..e1efc2da0 --- /dev/null +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirectionDataTemp.java @@ -0,0 +1,13 @@ +package com.magicmicky.habitrpgwrapper.lib.models; + +/** + * Created by viirus on 14/11/15. + */ +public class TaskDirectionDataTemp { + + private TaskDirectionDataDrop drop; + + public TaskDirectionDataDrop getDrop() { return this.drop; } + public void setDrop(TaskDirectionDataDrop drop) { this.drop = drop; } + +}