From c4de096a002c9e8cfe11e50bf036e15ff6b6c671 Mon Sep 17 00:00:00 2001
From: Negue <eugen.bolz@gmail.com>
Date: Wed, 4 Jan 2017 20:18:50 +0100
Subject: [PATCH] `Show More`-Button / Leave in ChallengeDetails Activity /
 refactoring

---
 Habitica/res/drawable-hdpi/leave_light.png    | Bin 0 -> 580 bytes
 Habitica/res/drawable-mdpi/leave_light.png    | Bin 0 -> 436 bytes
 Habitica/res/drawable-xhdpi/leave_light.png   | Bin 0 -> 658 bytes
 Habitica/res/drawable-xxhdpi/leave_light.png  | Bin 0 -> 928 bytes
 .../res/layout/activity_challenge_detail.xml  | 142 ++++++++------
 Habitica/res/menu/menu_challenge_details.xml  |  13 ++
 Habitica/res/values/styles.habitica.xml       |   8 +
 .../ShowChallengeDetailActivityCommand.java   |   9 +
 ... => ShowChallengeDetailDialogCommand.java} |   6 +-
 .../activities/ChallengeDetailActivity.java   |  64 ++++++-
 .../social/ChallengesListViewAdapter.java     |  32 ++--
 .../ChallegeDetailDialogHolder.java           | 175 +++++++++++++++++
 .../challenges/ChallengeListFragment.java     |   7 +-
 .../ChallengesOverviewFragment.java           | 178 ++----------------
 14 files changed, 383 insertions(+), 251 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/leave_light.png
 create mode 100644 Habitica/res/drawable-mdpi/leave_light.png
 create mode 100644 Habitica/res/drawable-xhdpi/leave_light.png
 create mode 100644 Habitica/res/drawable-xxhdpi/leave_light.png
 create mode 100644 Habitica/res/menu/menu_challenge_details.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
 rename Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/{ShowChallengeTasksCommand.java => ShowChallengeDetailDialogCommand.java} (54%)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java

diff --git a/Habitica/res/drawable-hdpi/leave_light.png b/Habitica/res/drawable-hdpi/leave_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..236cd925f85f24e1db75f35b0e2e524e93fbc7b6
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px${z*hZR9Fe^mAy*?K@i37f+8q__*GaaqNSjPb`}vEQ`%Tq2!h}rVPk1$DcD$w
zm4bp0Az0a1Sc_;1#YQZ|C<c}ITfGfS*t`8mVwxLx?A+|kyO+0{BnZ+-9Y`H$fdiFF
zWdoFeOMKD1584|l8Nvw{6`J0)dIV)O!&yzur8MW#T-&P?)UPz{koQ<%Rhd!em9kyh
zW@syiVfbR`2{^X*q#pJ=*`I>zBB@X8=^Qf6IPFJbP8ceX=S;&UhfMQw|BPf3ltHbd
zyVT^pIz-eWPMuP-3kEiUjBUHA_%4XXz`Z17{Q$8}HT}qN;}*GD@DR!FU=>bjMR^H=
zEaL(M6u~@r1R`QZc?p8>34A-^n*JdmLo3QxkR+{l6`~GsyH66eTF@s#R=8)+QjqW0
zeguM0l31?8^yPs(HX&vSF-PjWmmo+=Dv2rQNQ9VUkSIp*H2ugTG3UH%RJ@STI`g;n
z4}y5n7O)Z{L^Z@AT*!f&2z!E9iFI=Er<&-D?Dx7ua#&fr$;YGTJEb0Q-(C^AKy8M+
zpzi7NMhVh!S8GBP4@NO!Kqu&}$`l04e7afXIWFy0Hq?2gY?tZ;T`8l3<N_|C&b!R%
zdvPQLdEgU8h6eP^c2(`KEu_M^Y0zay^V=o<Y%jSlbsd?*`_k6bfz$yn2YvukorJgl
Sz+3SE0000<MNUMnLSTYz@CBm)

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/leave_light.png b/Habitica/res/drawable-mdpi/leave_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7e15ee7ad2ab037919a7fe4a1241ef7dff86b36
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$Zb?KzR7ef&letO+K@f&_MDf@_K?Fg>fd${e$RiMZ2?bwZLn8%Ej7&_7O%061
z7cet3G*H$^FcdGm#;>$`wx*|hTsGQZ8~&-||Es#XXQo!`ub#SrEX$hU9aOC+$kna}
zr|`O}v*AuU-C)2I&TBk{tp~88ywhnIH~t1r`I00_36O6pNSu&UHNXW(T`p?P6^w;M
z@WWshOgbL_6v%3U)a8TrSN8V^ZV)O$J`OImwzNrpR4EpbHmS=MX>J<3sQH+gfH(m1
z-tNE>^(}01=@eq}6X36ze5dX$!V&2{Sll8QJ&-*MGR5RFp`73w>~aG4L9|t7y!-@h
zHttckqqSeyji|Dl4XD|!Y99L!f<w?K1&3hE2=4Je!6w&oZ1QDSClM38BJvBWxw6&d
z8aB4R|B_!JN5LLNA6BUTjM`_*G5L*+qdrZ~b;AG5ezb{4_&?el{5lx&bT*XfkC^(=
eCi{Nx-oOtDmyN=1!Vrr90000<MNUMnLSTY5HN&?6

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/leave_light.png b/Habitica/res/drawable-xhdpi/leave_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..3abe5f40193122f1e595116bbfa1b2e11c9fd58b
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%Oi4sRRA>e5mb*#>F%*V(MFh1_P%FVgYy?3BK`Xbg6dMJ706Vc#1O+b$mR7!j
zoiAYNLnwlcSPJTjh4%}rU(|tcHk;YZB#S}<he=LO{&W66$;=cAu|)-<0#SjeKvbZH
z0+mW-4ZFqiwi5tGYorO|CgE(}s>S*n#%;c<ZL$C^S?01#^{{9@%R<{48-XF)!i;m?
zF`F%gbc?w`#%1A48!i&CqXkJ!Z7N&WMnEE#i^ZZ70nYrR1o1t#9U<Sjtay;!!}Q&<
z#wU|5JCLmL{#3;Sx}t#T7uf0T+(`hE&H4NS(1%T6W7r7RD+|N7i^=A^6B1V`A)7OS
zDo}%iBqi)gCS#nBgaI%J0mX@2CCo30MiK}@qR|AhlJN2tg6skXOsOI~v@0+M1kM&Y
z+}=(uJ3#EdAwGnw>SF(y51CNB)^HV7`t`~GMBs(Or}@ZT>IA&p0RRuNGaWcbU;O|M
zi}gwI$HHHGXgI*Zz5_`W<lHdiea1JL#MJ#X00kxBwRpv{kp#RK-$()!zitq#?qlQY
z5*v>ug>^EaAH4_OBG)4Ll<_;(^6PiMumbRVXi!Bj#I&T!2gb6%Ij9Q4LCh5PhSjZn
zf)jKHk|b$QcIAlTXNY^HU;nF;1%HBoBB)5Hr)zT|(1A)HjtN>F<DJ881nxlV(hx7S
ze%7wS^xACyLT6qx{eXqQG?&S7nZtaxGGOiIY=OKa+{ErZus8=}JVcqrG*A+&7~5S*
sh2RbInHCi1qXJQZs6bR8Dv(8iFHVo>Qib>)R{#J207*qoM6N<$f=iVp<p2Nx

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/leave_light.png b/Habitica/res/drawable-xxhdpi/leave_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee6962e2c79ad3e67f5d42a2142cc6eac72f7e07
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px&T1iAfRCodHnlX!1F%ZXhRRmGA5)nZ?^gzMJ=0I#jMDQbsrKQ-YmBL{o*qxn?
zwIGPK*tpnfVI`cXaICl%+9-mkDC>WAFI+C0<mT<0yky@^U^dC@WM<y)<-M2e+fGM|
z5>Nt4KnW-TC7=Y9fD%vwN<aw|O<*`2UWa^!q%OY@;3?!l(Ln6vknCb=DjxsupxbBX
zQDhrQ&O!cq4xkCuy_`_CFoR!(-BzZpwAp2xh27Flx&F9-PH`P3u-gTnCldH&x#R*m
z!t$2RC|mq(%wyUcusaR?An@HZ>iZaU!80%v-(xDP;sOdq9dx_he(1}pdfaP%RvnYt
zo_mR<&ZAiWtpbD@cpUN)GABj6HGl{Xpge~xKzdS;S^>y{V^-Y<r66_TXv2a8h5@6)
z!Z+!2h(r6Y-;h66y^J`Y(4QzCIJV74bk1PximeoH6QDpjBp$4yL*#WkkegBW(Ga^Q
zdDAnIJau+JlrZvI^5kZ#(n7K$Iqf0<WryTIvAe|p$_mLQ;<Sqblns&t#qJgdNE%XO
zk9km~eIF|x9i%{6f{!Z^KddD{-OXww{=`?y&>Wr6=2Mu(WOSX>ij{N?#s*SwowV5j
z5!)yv1vH+1J5cQ$H`jkEpibv2ketPS?ag{L<KAWm6oo^GntY1U@7GPfI=Y2;vB&&|
za0n2q*egS)UFt&drjw`J{Q`yDt0dRE)h`YZa%&b2O)(3I+bjxD7C5s4C>xwv0F)I@
z>3{&|1|(K$-H_X`4tjx;_?=Fqr__FwvwnV{)8h$FD(SZxw05EOl3N~NrTfHHnm*E_
zcVW*UdyEcsZ8(;%cr!A8MW14b^EeReT0FzilXd}Pzpak1by?Z5+Hi@Djt4XB6&mLu
zA0WZK)yTNQN0VEP3TaJeN{}#vj-mcHorlR$t(igQ&?MoI&(;AlprmT<B}VVbw|j!#
z!Ib{t(NC*785l_MvlK3%KC+wlWO&J=OQE9pSqk?Od!Hq{wV>JJa{)bE%eC>=YutF>
zHXd~~AQ#Xh*so+t@@}TM)xzRtJP#Q_nk<XevXr-G?Zr%3kfHx8Uxe&8x<obo!>or(
ztCz^Xx>W*7KnW-TC7=Y9fD%vwN<axH0VOcI1pWiUGsY_@NV-@60000<MNUMnLSTY%
CgRdz7

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml
index 381bbc77f..1a5ca4f3f 100644
--- a/Habitica/res/layout/activity_challenge_detail.xml
+++ b/Habitica/res/layout/activity_challenge_detail.xml
@@ -49,10 +49,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerHorizontal="true"
                         android:layout_marginBottom="15dp"
-                        android:layout_marginLeft="26dp"
-                        android:layout_marginStart="26dp"
-                        android:layout_marginRight="23dp"
-                        android:layout_marginEnd="23dp"
+
                         android:layout_marginTop="?attr/actionBarSize"
                         android:adjustViewBounds="true"
                         android:fitsSystemWindows="true"
@@ -61,82 +58,115 @@
                         android:orientation="vertical"
                         app:layout_collapseMode="parallax">
 
-                        <net.pherth.android.emoji_library.EmojiTextView
-                            android:id="@+id/challenge_name"
-                            style="@style/Headline"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:maxLines="2"
-                            android:textColor="@color/textColorDark" />
+                            android:layout_marginEnd="23dp"
+                            android:layout_marginLeft="26dp"
+                            android:layout_marginRight="23dp"
+                            android:layout_marginStart="26dp"
+                            android:orientation="vertical">
 
-                        <net.pherth.android.emoji_library.EmojiTextView
-                            android:id="@+id/challenge_description"
-                            style="@style/Body2"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:maxLines="3"
-                            android:textColor="@color/textColorDark" />
+                            <net.pherth.android.emoji_library.EmojiTextView
+                                android:id="@+id/challenge_name"
+                                style="@style/Headline"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:maxLines="2"
+                                android:textColor="@color/textColorDark" />
+
+                            <net.pherth.android.emoji_library.EmojiTextView
+                                android:id="@+id/challenge_description"
+                                style="@style/Body2"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:maxLines="4"
+                                android:textColor="@color/textColorDark" />
+                        </LinearLayout>
 
                         <LinearLayout
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
-                            android:baselineAligned="false"
-                            android:weightSum="1.0">
-
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
                             android:layout_marginBottom="10dp"
-                            android:layout_gravity="right"
+
+                            android:layout_marginEnd="23dp"
+                            android:layout_marginRight="23dp"
+                            android:layout_marginStart="16dp"
+                            android:layout_marginLeft="16dp"
                             android:layout_marginTop="10dp"
-                            android:orientation="horizontal">
+                            android:orientation="horizontal"
+                            android:weightSum="2">
 
                             <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:id="@+id/gem_prize_layout">
+                                android:layout_width="0dp"
+                                android:layout_height="36dp"
+                                android:layout_weight="1">
 
-                                <ImageView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="36dp"
-                                    android:src="@drawable/ic_header_gem" />
-
-                                <TextView
-                                    android:id="@+id/gem_amount"
-                                    style="@style/Body1"
+                                <Button
+                                    android:id="@+id/btn_show_more"
+                                    style="@style/Body1_Button"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    tools:text="15"
-                                    android:textColor="@color/textColorDark" />
+                                    android:gravity="left|center"
+                                    android:paddingTop="3dp"
+                                    android:paddingBottom="3dp"
+                                    android:text="Show more"
+                                    android:textAllCaps="false"
+                                    android:textColor="#d0c1ff" />
+
                             </LinearLayout>
 
                             <LinearLayout
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="17dp"
-                                android:layout_marginStart="17dp"
-                                android:gravity="center">
+                                android:layout_weight="1"
+                                android:gravity="right"
+                                android:orientation="horizontal">
 
-                                <ImageView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="36dp"
-                                    android:src="@drawable/participants_light" />
-
-                                <TextView
-                                    android:id="@+id/challenge_member_count"
-                                    style="@style/Body1"
+                                <LinearLayout
+                                    android:id="@+id/gem_prize_layout"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    tools:text="15"
-                                    android:textColor="@color/textColorDark" />
+                                    android:gravity="center">
+
+                                    <ImageView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="36dp"
+                                        android:src="@drawable/ic_header_gem" />
+
+                                    <TextView
+                                        android:id="@+id/gem_amount"
+                                        style="@style/Body1"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textColor="@color/textColorDark"
+                                        tools:text="15" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="17dp"
+                                    android:layout_marginStart="17dp"
+                                    android:gravity="center">
+
+                                    <ImageView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="36dp"
+                                        android:src="@drawable/participants_light" />
+
+                                    <TextView
+                                        android:id="@+id/challenge_member_count"
+                                        style="@style/Body1"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textColor="@color/textColorDark"
+                                        tools:text="15" />
+                                </LinearLayout>
                             </LinearLayout>
+
                         </LinearLayout>
 
-
                     </LinearLayout>
 
                     <android.support.v7.widget.Toolbar
diff --git a/Habitica/res/menu/menu_challenge_details.xml b/Habitica/res/menu/menu_challenge_details.xml
new file mode 100644
index 000000000..44057f439
--- /dev/null
+++ b/Habitica/res/menu/menu_challenge_details.xml
@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.habitrpg.android.habitica.TaskActivity">
+
+    <item
+        android:id="@+id/action_leave"
+        android:icon="@drawable/leave_light"
+        android:title="@string/leave"
+        app:showAsAction="always"
+        android:actionViewClass="android.widget.ImageButton"/>
+
+</menu>
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index a5f386cd6..7ba2ee5da 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -38,6 +38,14 @@
         <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
     </style>
 
+    <style name="Body1_Button" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">
+            @string/font_family_medium
+        </item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+    </style>
+
     <style name="Title2">
         <item name="android:fontFamily" tools:targetApi="jelly_bean">
             @string/font_family_condensed
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
new file mode 100644
index 000000000..d751cd38d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
@@ -0,0 +1,9 @@
+package com.habitrpg.android.habitica.events.commands;
+
+public class ShowChallengeDetailActivityCommand {
+    public String challengeId;
+
+    public ShowChallengeDetailActivityCommand(String challengeId){
+        this.challengeId = challengeId;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeTasksCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
similarity index 54%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeTasksCommand.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
index 7786627c3..f1ddae5ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeTasksCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
@@ -1,9 +1,11 @@
 package com.habitrpg.android.habitica.events.commands;
 
-public class ShowChallengeTasksCommand {
+public class ShowChallengeDetailDialogCommand {
     public String challengeId;
 
-    public ShowChallengeTasksCommand(String challengeId){
+    public ShowChallengeDetailDialogCommand(String challengeId){
         this.challengeId = challengeId;
     }
 }
+
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
index 74e66d75f..031bf98e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
@@ -1,10 +1,14 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import android.app.AlertDialog;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -13,9 +17,12 @@ import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallegeDetailDialogHolder;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
 
 import net.pherth.android.emoji_library.EmojiParser;
 import net.pherth.android.emoji_library.EmojiTextView;
@@ -24,6 +31,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 public class ChallengeDetailActivity extends BaseActivity {
 
@@ -40,11 +48,20 @@ public class ChallengeDetailActivity extends BaseActivity {
 
     private ChallengeViewHolder challengeViewHolder;
 
+    private Challenge challenge;
+
     @Override
     protected int getLayoutResId() {
         return R.layout.activity_challenge_detail;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_challenge_details, menu);
+        return true;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -53,6 +70,7 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         getSupportActionBar().setTitle(R.string.challenge_details);
 
+
         Bundle extras = getIntent().getExtras();
 
         String challengeId = extras.getString(CHALLENGE_ID);
@@ -70,12 +88,10 @@ public class ChallengeDetailActivity extends BaseActivity {
             transaction.replace(R.id.fragment_container, fragment).addToBackStack(null).commitAllowingStateLoss();
         }
 
-        apiHelper.apiService.getChallenge(challengeId)
-                .compose(apiHelper.configureApiCallObserver())
-                .subscribe(challenge -> challengeViewHolder.bind(challenge), throwable -> {
-                });
+        challenge = new Select().from(Challenge.class).where(Condition.column("id").is(challengeId)).querySingle();
 
         challengeViewHolder = new ChallengeViewHolder(findViewById(R.id.challenge_header));
+        challengeViewHolder.bind(challenge);
     }
 
     @Override
@@ -83,7 +99,7 @@ public class ChallengeDetailActivity extends BaseActivity {
         component.inject(this);
     }
 
-    public static class ChallengeViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+    public class ChallengeViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.challenge_name)
         EmojiTextView challengeName;
 
@@ -123,9 +139,43 @@ public class ChallengeDetailActivity extends BaseActivity {
             }
         }
 
-        @Override
-        public void onClick(View view) {
+        @OnClick(R.id.btn_show_more)
+        public void onShowMore() {
 
+            ChallegeDetailDialogHolder.showDialog(ChallengeDetailActivity.this, ChallengeDetailActivity.this.apiHelper,
+                    HabiticaApplication.User, challenge,
+                    challenge1 -> {
+
+                    },
+                    challenge1 -> ChallengeDetailActivity.this.onBackPressed());
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_leave:
+                new AlertDialog.Builder(this)
+                        .setTitle(this.getString(R.string.challenge_leave_title))
+                        .setMessage(String.format(this.getString(R.string.challenge_leave_text), challenge.name))
+                        .setPositiveButton(this.getString(R.string.yes), (dialog, which) -> {
+                            this.apiHelper.apiService.leaveChallenge(challenge.id)
+                                    .compose(apiHelper.configureApiCallObserver())
+                                    .subscribe(aVoid -> {
+                                        challenge.user_id = null;
+                                        challenge.async().save();
+
+                                        HabiticaApplication.User.resetChallengeList();
+                                    }, throwable -> {
+                                    });
+                        })
+                        .setNegativeButton(this.getString(R.string.no), (dialog, which) -> {
+                            dialog.dismiss();
+                        }).show();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
index f39da20ea..981eb92db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
@@ -1,24 +1,18 @@
 package com.habitrpg.android.habitica.ui.adapter.social;
 
-import android.content.Context;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.JoinChallengeCommand;
-import com.habitrpg.android.habitica.events.commands.LeaveChallengeCommand;
-import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.events.commands.ShowChallengeTasksCommand;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
 
 import net.pherth.android.emoji_library.EmojiParser;
@@ -79,9 +73,9 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
     public void replaceChallenge(Challenge challenge) {
         int index = challenges.indexOf(challenge);
 
-        if(index == -1){
+        if (index == -1) {
             for (int i = 0; i < challenges.size(); i++) {
-                if(challenges.get(i).id.equals(challenge.id)){
+                if (challenges.get(i).id.equals(challenge.id)) {
                     index = i;
 
                     break;
@@ -89,7 +83,7 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
             }
         }
 
-        if(index != -1) {
+        if (index != -1) {
             challenges.set(index, challenge);
             notifyItemChanged(index);
         }
@@ -132,7 +126,7 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
 
             itemView.setOnClickListener(this);
 
-            if(!viewUserChallengesOnly){
+            if (!viewUserChallengesOnly) {
                 challengeName.setTextColor(ContextCompat.getColor(getContext(), R.color.brand_200));
             }
         }
@@ -189,16 +183,12 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
 
         @Override
         public void onClick(View view) {
-            /*if (view == leaderLayout) {
-                EventBus.getDefault().post(new OpenFullProfileCommand(challenge.leaderId));
-            } else if (view == joinButton) {
-                EventBus.getDefault().post(new JoinChallengeCommand(challenge.id));
-            } else if (view == leaveButton) {
-
-            } else*/
             if (challenge != null) {
-                // Card tapped
-                EventBus.getDefault().post(new ShowChallengeTasksCommand(challenge.id));
+                if (viewUserChallengesOnly) {
+                    EventBus.getDefault().post(new ShowChallengeDetailActivityCommand(challenge.id));
+                } else {
+                    EventBus.getDefault().post(new ShowChallengeDetailDialogCommand(challenge.id));
+                }
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
new file mode 100644
index 000000000..46a2a38cf
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
@@ -0,0 +1,175 @@
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+
+import net.pherth.android.emoji_library.EmojiParser;
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import rx.functions.Action1;
+
+public class ChallegeDetailDialogHolder {
+
+    @BindView(R.id.challenge_not_joined_header)
+    LinearLayout notJoinedHeader;
+
+    @BindView(R.id.challenge_joined_header)
+    LinearLayout joinedHeader;
+
+    @BindView(R.id.challenge_join_btn)
+    Button joinButton;
+
+    @BindView(R.id.challenge_leave_btn)
+    Button leaveButton;
+
+    @BindView(R.id.challenge_name)
+    EmojiTextView challengeName;
+
+    @BindView(R.id.challenge_description)
+    EmojiTextView challengeDescription;
+
+    @BindView(R.id.challenge_leader)
+    TextView challengeLeader;
+
+    @BindView(R.id.gem_amount)
+    TextView gem_amount;
+
+    @BindView(R.id.challenge_member_count)
+    TextView member_count;
+
+
+    private AlertDialog dialog;
+    private APIHelper apiHelper;
+    private HabitRPGUser user;
+    private Challenge challenge;
+    private Action1<Challenge> challengeJoinedAction;
+    private Action1<Challenge> challengeLeftAction;
+    private Activity context;
+
+
+    protected ChallegeDetailDialogHolder(View view, Activity context) {
+        this.context = context;
+        ButterKnife.bind(this, view);
+    }
+
+    public void bind(AlertDialog dialog, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
+                     Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
+        this.dialog = dialog;
+        this.apiHelper = apiHelper;
+        this.user = user;
+        this.challenge = challenge;
+        this.challengeJoinedAction = challengeJoinedAction;
+        this.challengeLeftAction = challengeLeftAction;
+
+        changeViewsByChallenge(challenge);
+    }
+
+    public void changeViewsByChallenge(Challenge challenge) {
+        setJoined(challenge.user_id != null && !challenge.user_id.isEmpty());
+
+        challengeName.setText(EmojiParser.parseEmojis(challenge.name));
+        challengeDescription.setText(MarkdownParser.parseMarkdown(challenge.description));
+        challengeLeader.setText(challenge.leaderName);
+
+        gem_amount.setText(challenge.prize + "");
+        member_count.setText(challenge.memberCount + "");
+    }
+
+    public void setJoined(boolean joined) {
+        joinedHeader.setVisibility(joined ? View.VISIBLE : View.GONE);
+        leaveButton.setVisibility(joined ? View.VISIBLE : View.GONE);
+
+        notJoinedHeader.setVisibility(joined ? View.GONE : View.VISIBLE);
+        joinButton.setVisibility(joined ? View.GONE : View.VISIBLE);
+    }
+
+    @OnClick(R.id.challenge_leader)
+    public void openLeaderProfile() {
+        EventBus.getDefault().post(new OpenFullProfileCommand(challenge.leaderId));
+    }
+
+    @OnClick(R.id.challenge_go_to_btn)
+    public void openChallengeActivity() {
+        Bundle bundle = new Bundle();
+        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, challenge.id);
+
+        Intent intent = new Intent(HabiticaApplication.currentActivity, ChallengeDetailActivity.class);
+        intent.putExtras(bundle);
+        //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        context.startActivity(intent);
+        this.dialog.dismiss();
+    }
+
+    @OnClick(R.id.challenge_join_btn)
+    public void joinChallenge() {
+        this.apiHelper.apiService.joinChallenge(challenge.id)
+                .compose(apiHelper.configureApiCallObserver())
+                .subscribe(challenge -> {
+                    challenge.user_id = this.user.getId();
+                    challenge.async().save();
+
+                    if (challengeJoinedAction != null) {
+                        challengeJoinedAction.call(challenge);
+                    }
+
+                    changeViewsByChallenge(challenge);
+                }, throwable -> {
+                });
+    }
+
+    @OnClick(R.id.challenge_leave_btn)
+    public void leaveChallenge() {
+        new AlertDialog.Builder(context)
+                .setTitle(context.getString(R.string.challenge_leave_title))
+                .setMessage(String.format(context.getString(R.string.challenge_leave_text), challenge.name))
+                .setPositiveButton(context.getString(R.string.yes), (dialog, which) -> {
+                    this.apiHelper.apiService.leaveChallenge(challenge.id)
+                            .compose(apiHelper.configureApiCallObserver())
+                            .subscribe(aVoid -> {
+                                challenge.user_id = null;
+                                challenge.async().save();
+
+                                this.user.resetChallengeList();
+
+
+                                this.dialog.dismiss();
+                            }, throwable -> {
+                            });
+                }).setNegativeButton(context.getString(R.string.no), (dialog, which) -> {
+            dialog.dismiss();
+        }).show();
+    }
+
+
+    public static void showDialog(Activity activity, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
+                                  Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
+        View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
+
+        ChallegeDetailDialogHolder challegeDetailDialogHolder = new ChallegeDetailDialogHolder(dialogLayout, activity);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                .setView(dialogLayout);
+
+        challegeDetailDialogHolder.bind(builder.show(), apiHelper, user, challenge, challengeJoinedAction, challengeLeftAction);
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
index dd284fc7a..508e88293 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
@@ -24,7 +24,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class ChallengeListFragment extends BaseMainFragment implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
+public class ChallengeListFragment extends BaseMainFragment implements SwipeRefreshLayout.OnRefreshListener {
 
     @BindView(R.id.challenges_refresh_layout)
     SwipeRefreshLayout swipeRefreshLayout;
@@ -143,11 +143,6 @@ public class ChallengeListFragment extends BaseMainFragment implements View.OnCl
         challengeAdapter.setChallenges(challenges);
     }
 
-    @Override
-    public void onClick(View v) {
-
-    }
-
     public void addItem(Challenge challenge) {
         challengeAdapter.addChallenge(challenge);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
index b520f8043..c2c237757 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
@@ -1,49 +1,29 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
-import android.app.AlertDialog;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.events.commands.ShowChallengeTasksCommand;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
 import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
-import net.pherth.android.emoji_library.EmojiParser;
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.Stack;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
 public class ChallengesOverviewFragment extends BaseMainFragment {
 
     public ViewPager viewPager;
@@ -146,18 +126,27 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
     }
 
     @Subscribe
-    public void onEvent(ShowChallengeTasksCommand cmd) {
-
-        View dialogLayout = HabiticaApplication.currentActivity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
-
+    public void onEvent(ShowChallengeDetailDialogCommand cmd) {
         Challenge challenge = new Select().from(Challenge.class).where(Condition.column("id").is(cmd.challengeId)).querySingle();
 
-        ChallegeDetailDialogHolder challegeDetailDialogHolder = new ChallegeDetailDialogHolder(dialogLayout, activity);
+        ChallegeDetailDialogHolder.showDialog(HabiticaApplication.currentActivity, apiHelper, user, challenge, challenge1 ->  {
+            userChallengesFragment.addItem(challenge1);
+            availableChallengesFragment.updateItem(challenge1);
+        }, challenge1 -> {
+            userChallengesFragment.onRefresh();
+            availableChallengesFragment.onRefresh();
+        });
+    }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity)
-                .setView(dialogLayout);
+    @Subscribe
+    public void onEvent(ShowChallengeDetailActivityCommand cmd) {
+        Bundle bundle = new Bundle();
+        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, cmd.challengeId);
 
-        challegeDetailDialogHolder.bind(builder.show(), apiHelper, user, challenge);
+        Intent intent = new Intent(HabiticaApplication.currentActivity, ChallengeDetailActivity.class);
+        intent.putExtras(bundle);
+        //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        HabiticaApplication.currentActivity.startActivity(intent);
     }
 
     public boolean onHandleBackPressed() {
@@ -172,135 +161,6 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
         return false;
     }
 
-    public class ChallegeDetailDialogHolder {
-
-        @BindView(R.id.challenge_not_joined_header)
-        LinearLayout notJoinedHeader;
-
-        @BindView(R.id.challenge_joined_header)
-        LinearLayout joinedHeader;
-
-        @BindView(R.id.challenge_join_btn)
-        Button joinButton;
-
-        @BindView(R.id.challenge_leave_btn)
-        Button leaveButton;
-
-        @BindView(R.id.challenge_name)
-        EmojiTextView challengeName;
-
-        @BindView(R.id.challenge_description)
-        EmojiTextView challengeDescription;
-
-        @BindView(R.id.challenge_leader)
-        TextView challengeLeader;
-
-        @BindView(R.id.gem_amount)
-        TextView gem_amount;
-
-        @BindView(R.id.challenge_member_count)
-        TextView member_count;
-
-
-        private AlertDialog dialog;
-        private APIHelper apiHelper;
-        private HabitRPGUser user;
-        private Challenge challenge;
-        private Context context;
-
-
-        protected ChallegeDetailDialogHolder(View view, Context context) {
-            this.context = context;
-            ButterKnife.bind(this, view);
-        }
-
-        public void bind(AlertDialog dialog, APIHelper apiHelper, HabitRPGUser user, Challenge challenge) {
-            this.dialog = dialog;
-            this.apiHelper = apiHelper;
-            this.user = user;
-            this.challenge = challenge;
-
-            changeViewsByChallenge(challenge);
-        }
-
-        public void changeViewsByChallenge(Challenge challenge){
-            setJoined(challenge.user_id != null && !challenge.user_id.isEmpty());
-
-            challengeName.setText(EmojiParser.parseEmojis(challenge.name));
-            challengeDescription.setText( MarkdownParser.parseMarkdown(challenge.description));
-            challengeLeader.setText(challenge.leaderName);
-
-            gem_amount.setText(challenge.prize + "");
-            member_count.setText(challenge.memberCount + "");
-        }
-
-        public void setJoined(boolean joined){
-            joinedHeader.setVisibility(joined ?  View.VISIBLE : View.GONE);
-            leaveButton.setVisibility(joined ?  View.VISIBLE : View.GONE);
-
-            notJoinedHeader.setVisibility(joined ?  View.GONE : View.VISIBLE);
-            joinButton.setVisibility(joined ?  View.GONE : View.VISIBLE);
-        }
-
-        @OnClick(R.id.challenge_leader)
-        public void openLeaderProfile() {
-            EventBus.getDefault().post(new OpenFullProfileCommand(challenge.leaderId));
-        }
-
-        @OnClick(R.id.challenge_go_to_btn)
-        public void openChallengeActivity() {
-            Bundle bundle = new Bundle();
-            bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, challenge.id);
-
-            Intent intent = new Intent(HabiticaApplication.currentActivity, ChallengeDetailActivity.class);
-            intent.putExtras(bundle);
-            //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-            startActivity(intent);
-            this.dialog.dismiss();
-        }
-
-        @OnClick(R.id.challenge_join_btn)
-        public void joinChallenge() {
-            this.apiHelper.apiService.joinChallenge(challenge.id)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(challenge -> {
-                        challenge.user_id = this.user.getId();
-                        challenge.async().save();
-
-                        userChallengesFragment.addItem(challenge);
-                        availableChallengesFragment.updateItem(challenge);
-
-                        changeViewsByChallenge(challenge);
-                    }, throwable -> {
-                    });
-        }
-
-        @OnClick(R.id.challenge_leave_btn)
-        public void leaveChallenge() {
-            new AlertDialog.Builder(context)
-                    .setTitle(context.getString(R.string.challenge_leave_title))
-                    .setMessage(String.format(context.getString(R.string.challenge_leave_text), challenge.name))
-                    .setPositiveButton(context.getString(R.string.yes), (dialog, which) -> {
-                        this.apiHelper.apiService.leaveChallenge(challenge.id)
-                                .compose(apiHelper.configureApiCallObserver())
-                                .subscribe(aVoid -> {
-                                    challenge.user_id = null;
-                                    challenge.async().save();
-
-                                    this.user.resetChallengeList();
-
-                                    userChallengesFragment.onRefresh();
-                                    availableChallengesFragment.onRefresh();
-                                    this.dialog.dismiss();
-                                }, throwable -> {
-                                });
-                    }).setNegativeButton(context.getString(R.string.no), (dialog, which) -> {
-                dialog.dismiss();
-            }).show();
-        }
-    }
-
-
     @Override
     public String customTitle() {
         return getString(R.string.challenges);