From 437288ab1cdae1fc05e58cc20440470fa85816ab Mon Sep 17 00:00:00 2001 From: Dinesh Thanigaivelu Date: Sun, 5 Mar 2017 18:34:25 +0530 Subject: [PATCH 1/7] Dialog popup working --- .../ui/fragments/social/party/PartyFragment.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java index 600c4bdf5..c4d2683a3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java @@ -12,6 +12,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.Group; import com.magicmicky.habitrpgwrapper.lib.models.UserParty; import android.app.Activity; +import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -159,11 +160,15 @@ public class PartyFragment extends BaseMainFragment { this.displayEditForm(); return true; case R.id.menu_guild_leave: - this.apiHelper.apiService.leaveGroup(this.group.id).compose(apiHelper.configureApiCallObserver()) - .subscribe(group -> { - getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit(); - }, throwable -> { - }); + new AlertDialog.Builder(viewPager.getContext()) + .setTitle("Leave Party") + .setMessage("Are you sure you want to leave the party?") + .show(); +// this.apiHelper.apiService.leaveGroup(this.group.id).compose(apiHelper.configureApiCallObserver()) +// .subscribe(group -> { +// getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit(); +// }, throwable -> { +// }); return true; } From 3c8664def842c2f7917e6601b8a9d3c1e78dfdfb Mon Sep 17 00:00:00 2001 From: Dinesh Thanigaivelu Date: Sun, 5 Mar 2017 19:04:22 +0530 Subject: [PATCH 2/7] Leave Party Dialog working --- .../ui/fragments/social/party/PartyFragment.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java index c4d2683a3..38fded86a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java @@ -163,12 +163,16 @@ public class PartyFragment extends BaseMainFragment { new AlertDialog.Builder(viewPager.getContext()) .setTitle("Leave Party") .setMessage("Are you sure you want to leave the party?") + .setPositiveButton(viewPager.getContext().getString(R.string.yes), (dialog, which) -> this.apiHelper.apiService.leaveGroup(this.group.id) + .compose(apiHelper.configureApiCallObserver()) + .subscribe(group -> { + getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit(); + }, throwable -> { + })) + .setNegativeButton(viewPager.getContext().getString(R.string.no), (dialog, which) -> { + dialog.dismiss(); + }) .show(); -// this.apiHelper.apiService.leaveGroup(this.group.id).compose(apiHelper.configureApiCallObserver()) -// .subscribe(group -> { -// getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit(); -// }, throwable -> { -// }); return true; } From 1e75eebf881871b4028ae95cf33749987e3f6795 Mon Sep 17 00:00:00 2001 From: Dinesh Date: Sun, 5 Mar 2017 19:11:52 +0530 Subject: [PATCH 3/7] Leave Party Dialog Working --- .../habitica/ui/fragments/social/party/PartyFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java index 38fded86a..7b24ec05e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java @@ -162,7 +162,7 @@ public class PartyFragment extends BaseMainFragment { case R.id.menu_guild_leave: new AlertDialog.Builder(viewPager.getContext()) .setTitle("Leave Party") - .setMessage("Are you sure you want to leave the party?") + .setMessage("Are you sure you want to leave the Party?") .setPositiveButton(viewPager.getContext().getString(R.string.yes), (dialog, which) -> this.apiHelper.apiService.leaveGroup(this.group.id) .compose(apiHelper.configureApiCallObserver()) .subscribe(group -> { From 01948f0d6d1f660031c211a2bac9f3c5993ab9f1 Mon Sep 17 00:00:00 2001 From: Dinesh Date: Sun, 5 Mar 2017 19:30:30 +0530 Subject: [PATCH 4/7] lave-party --- PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 16b1c784f..455bf76f5 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,3 @@ -my Habitica User-ID: +my Habitica User-ID: dinesh3434 From 8cf6cbd1b9754ceac9a94270f6d31af2a02b6787 Mon Sep 17 00:00:00 2001 From: Dinesh Date: Wed, 8 Mar 2017 12:24:42 +0530 Subject: [PATCH 5/7] leave-party (added strings) --- Habitica/res/values-en-rGB/strings.xml | 2 ++ .../habitica/ui/fragments/social/party/PartyFragment.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml index 95a0fec31..5bf58d4a7 100644 --- a/Habitica/res/values-en-rGB/strings.xml +++ b/Habitica/res/values-en-rGB/strings.xml @@ -494,4 +494,6 @@ To start, which parts of your life do you want to improve? pending approval Group tasks can not be edited. Can\'t edit this task + Leave Party + Are you sure you want to leave the Party? diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java index 7b24ec05e..0e27f8558 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java @@ -161,8 +161,8 @@ public class PartyFragment extends BaseMainFragment { return true; case R.id.menu_guild_leave: new AlertDialog.Builder(viewPager.getContext()) - .setTitle("Leave Party") - .setMessage("Are you sure you want to leave the Party?") + .setTitle(viewPager.getContext().getString(R.string.party_leave)) + .setMessage(viewPager.getContext().getString(R.string.party_leave_confirmation)) .setPositiveButton(viewPager.getContext().getString(R.string.yes), (dialog, which) -> this.apiHelper.apiService.leaveGroup(this.group.id) .compose(apiHelper.configureApiCallObserver()) .subscribe(group -> { From 8c5e31038c29400f8819ddd1fe460cb200d7dc22 Mon Sep 17 00:00:00 2001 From: Dinesh Date: Wed, 8 Mar 2017 12:56:59 +0530 Subject: [PATCH 6/7] leave-party-string --- Habitica/res/values-en-rGB/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml index 5bf58d4a7..cf4eed232 100644 --- a/Habitica/res/values-en-rGB/strings.xml +++ b/Habitica/res/values-en-rGB/strings.xml @@ -387,6 +387,8 @@ To start, which parts of your life do you want to improve? Scan QR Code Enter Recipient\'s User ID You were invited to join a party! + Leave Party + Are you sure you want to leave the Party? Habitica Stats Add Task Add Habit @@ -494,6 +496,4 @@ To start, which parts of your life do you want to improve? pending approval Group tasks can not be edited. Can\'t edit this task - Leave Party - Are you sure you want to leave the Party? From e8a9104ae3f60ccb01771bfb8a7ee721c855ced3 Mon Sep 17 00:00:00 2001 From: Dinesh Date: Wed, 8 Mar 2017 13:32:57 +0530 Subject: [PATCH 7/7] revert pull.md --- PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 455bf76f5..16b1c784f 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,3 @@ -my Habitica User-ID: dinesh3434 +my Habitica User-ID: