From 3e27fe90e306ea05690b07f4d808757d1f5e7968 Mon Sep 17 00:00:00 2001
From: Negue <eugen.bolz@gmail.com>
Date: Thu, 8 Sep 2016 19:19:32 +0200
Subject: [PATCH] Dialog with OK-Button, Count-Bubble on an Achievement-Icon

---
 .../res/layout/dialog_achievement_details.xml |  4 ++-
 .../res/layout/profile_achievement_item.xml   | 30 +++++++++++++++----
 Habitica/res/values/strings.profile.xml       |  1 +
 .../ui/adapter/social/AchievementAdapter.java | 11 +++++++
 .../lib/models/Achievement.java               |  2 +-
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/dialog_achievement_details.xml b/Habitica/res/layout/dialog_achievement_details.xml
index a10015933..1c76e4892 100644
--- a/Habitica/res/layout/dialog_achievement_details.xml
+++ b/Habitica/res/layout/dialog_achievement_details.xml
@@ -3,7 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="24dip">
+    android:paddingLeft="24dip"
+    android:paddingTop="24dip"
+    android:paddingRight="24dip">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index 41ea9860b..5f1caf270 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -1,25 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/achievement_item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="10dp"
-    android:id="@+id/achievement_item_layout"
     android:orientation="vertical">
 
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/achievement_drawee"
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal">
 
-        android:layout_width="30dp"
-        android:layout_height="33dp"
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/achievement_drawee"
 
-        android:layout_gravity="center_horizontal" />
+            android:layout_width="30dp"
+            android:layout_height="33dp"
+            android:layout_marginRight="3dp" />
+
+        <TextView
+            android:id="@+id/achievement_count_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|right"
+            android:text="2"
+            android:background="@drawable/layout_rounded_bg_brand"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
+            android:textSize="10dp"
+            android:textColor="#ffffff" />
+    </FrameLayout>
 
     <TextView
         android:id="@+id/achievement_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:layout_marginTop="2dp"
         android:gravity="center" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml
index e68f9307c..4b8fc94a1 100644
--- a/Habitica/res/values/strings.profile.xml
+++ b/Habitica/res/values/strings.profile.xml
@@ -12,5 +12,6 @@
     <string name="profile_boosts">Boosts:</string>
     <string name="profile_private_message">Private Message</string>
     <string name="profile_achievements">Achievements</string>
+    <string name="profile_achievement_ok">Ok</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
index fcc2f3055..79d80cd9e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
@@ -87,6 +87,9 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         @BindView(R.id.achievement_text)
         TextView titleView;
 
+        @BindView(R.id.achievement_count_label)
+        TextView countText;
+
         @BindView(R.id.achievement_item_layout)
         LinearLayout item_layout;
 
@@ -118,6 +121,13 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
             this.achievement = item;
             titleView.setText(item.title);
+
+            if(item.optionalCount == null) {
+                countText.setVisibility(View.GONE);
+            } else{
+                countText.setVisibility(View.VISIBLE);
+                countText.setText(item.optionalCount.toString());
+            }
         }
 
         @Override
@@ -137,6 +147,7 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             textView.setText(achievement.text);
 
             b.setView(customView);
+            b.setPositiveButton(R.string.profile_achievement_ok, (dialogInterface, i) -> {});
 
             b.show();
         }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java
index 48e1af8db..0cf22edd2 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Achievement.java
@@ -10,5 +10,5 @@ public class Achievement {
     public String value;
     public boolean earned;
     public int index;
-    public int optionalCount;
+    public Integer optionalCount;
 }