From a760c0052aead44814555842a3daefdc7cbe01f1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Sat, 24 Jun 2017 19:45:38 +0200
Subject: [PATCH] improve yesterdailies

---
 .../res/layout/dialog_login_incentive.xml     | 25 +++---
 Habitica/res/layout/dialog_yesterdaily.xml    |  1 -
 .../helpers/PopupNotificationsManager.java    | 90 ++++++++++---------
 .../android/habitica/ui/helpers/UiUtils.java  |  3 +-
 4 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml
index b6e86f72f..fc863c6b8 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -1,37 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal">
-
     <com.facebook.drawee.view.SimpleDraweeView
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:id="@+id/imageView" />
+        android:id="@+id/imageView"
+        android:layout_marginTop="16dp"/>
 
     <TextView
         android:text=""
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="20dp"
         android:layout_marginLeft="25dp"
         android:layout_marginRight="25dp"
-        android:id="@+id/you_earned_message" />
+        android:id="@+id/you_earned_message"
+        tools:text="You unlocked something"/>
 
     <TextView
-        android:text=""
+        tools:text="Next prize unlocks in 2 check-ins."
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:id="@+id/next_unlock_message" />
-
-    <Button
-        android:text="@string/see_you_tomorrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:id="@+id/confirm_button"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+        android:layout_marginTop="20dp"
+        android:id="@+id/next_unlock_message"
+        android:textColor="@color/best_10"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_yesterdaily.xml b/Habitica/res/layout/dialog_yesterdaily.xml
index 895b9f603..fe2efeb84 100644
--- a/Habitica/res/layout/dialog_yesterdaily.xml
+++ b/Habitica/res/layout/dialog_yesterdaily.xml
@@ -3,7 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
-
     <TextView
         android:id="@+id/titleTextView"
         android:layout_width="match_parent"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
index d2a1df68c..3ed0b9b94 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
@@ -1,21 +1,26 @@
 package com.habitrpg.android.habitica.helpers;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.widget.Space;
 import android.support.v7.app.AlertDialog;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.repacked.kotlin.Unit;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.models.Notification;
 import com.habitrpg.android.habitica.models.notifications.Reward;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -43,16 +48,16 @@ public class PopupNotificationsManager {
     }
 
     Boolean displayNotification(Notification notification) {
-        String title = notification.data.message;
-        String youEarnedMessage = "";
-
-        LayoutInflater factory = LayoutInflater.from(context);
-        final View view = factory.inflate(R.layout.dialog_login_incentive, null);
-
-        SimpleDraweeView imageView = (SimpleDraweeView) view.findViewById(R.id.imageView);
-        String imageKey = "inventory_present_11";
         if (notification.data.rewardKey != null) {
-            imageKey = notification.data.rewardKey.get(0);
+            String title = notification.data.message;
+            String youEarnedMessage = "";
+
+            LayoutInflater factory = LayoutInflater.from(context);
+            final View view = factory.inflate(R.layout.dialog_login_incentive, null);
+
+            SimpleDraweeView imageView = (SimpleDraweeView) view.findViewById(R.id.imageView);
+            String imageKey = "shop_" + notification.data.rewardKey.get(0);
+            DataBindingUtils.loadImage(imageView, imageKey);
 
             if (notification.data.reward != null && notification.data.reward.size() > 0) {
                 String earnedString = "";
@@ -66,39 +71,42 @@ public class PopupNotificationsManager {
                 }
                 youEarnedMessage = context.getString(R.string.checkInRewardEarned, earnedString);
             }
+
+            TextView titleTextView = new TextView(context);
+            titleTextView.setBackgroundResource(R.color.best_100);
+            titleTextView.setTextColor(ContextCompat.getColor(context, R.color.white));
+            float density = context.getResources().getDisplayMetrics().density;
+            int paddingDp = (int) (16 * density);
+            titleTextView.setPadding(paddingDp, paddingDp, paddingDp, paddingDp);
+            titleTextView.setTextSize(18);
+            titleTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+            titleTextView.setText(title);
+
+            TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
+            youEarnedTexView.setText(youEarnedMessage);
+
+            String message = context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt);
+            TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
+            nextUnlockTextView.setText(message);
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity, R.style.AlertDialogTheme)
+                    .setView(view)
+                    .setCustomTitle(titleTextView)
+                    .setPositiveButton(R.string.start_day, (dialog, which) -> {
+                        if (apiClient != null) {
+                            // @TODO: This should be handled somewhere else? MAybe we notifiy via event
+                            apiClient.readNotificaiton(notification.getId())
+                                    .subscribe(next -> {
+                                    }, RxErrorHandler.handleEmptyError());
+                        }
+                    })
+                    .setMessage("");
+
+            final AlertDialog dialog = builder.create();
+            dialog.show();
+        } else {
+            UiUtils.showSnackbar(context, null, context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt), UiUtils.SnackbarDisplayType.BLUE);
         }
-        DataBindingUtils.loadImage(imageView, imageKey);
-
-        TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
-        youEarnedTexView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
-        youEarnedTexView.setText(youEarnedMessage);
-
-        String message = context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt);
-        TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
-        nextUnlockTextView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
-        nextUnlockTextView.setText(message);
-
-        Button confirmButton = (Button) view.findViewById(R.id.confirm_button);
-        confirmButton.setTextColor(ContextCompat.getColor(context, R.color.brand_300));
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity, R.style.AlertDialogTheme)
-                .setTitle(title)
-                .setView(view)
-                .setMessage("");
-
-        final AlertDialog dialog = builder.create();
-        dialog.show();
-
-        confirmButton.setOnClickListener(view1 -> {
-            if (apiClient != null) {
-                // @TODO: This should be handled somewhere else? MAybe we notifiy via event
-                apiClient.readNotificaiton(notification.getId())
-                        .subscribe(next -> {}, RxErrorHandler.handleEmptyError());
-            }
-
-            dialog.hide();
-        });
-
         return true;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
index 5a60c0777..29d61130e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
@@ -59,6 +59,7 @@ public class UiUtils {
                 snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.worse_10));
                 break;
             case FAILURE_BLUE:
+            case BLUE:
                 snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.best_100));
                 break;
             case DROP:
@@ -72,7 +73,7 @@ public class UiUtils {
     }
 
     public enum SnackbarDisplayType {
-        NORMAL, FAILURE, FAILURE_BLUE, DROP
+        NORMAL, FAILURE, FAILURE_BLUE, DROP, BLUE
     }
 
 }