diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml index c0d3c4bf1..11cbd48cd 100644 --- a/Habitica/res/layout/dialog_login_incentive.xml +++ b/Habitica/res/layout/dialog_login_incentive.xml @@ -1,24 +1,19 @@ - + android:gravity="center_horizontal"> - @@ -37,10 +30,8 @@ android:text="@string/see_you_tomorrow" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/next_unlock_message" - android:layout_centerHorizontal="true" android:layout_marginTop="50dp" android:id="@+id/confirm_button" style="@style/Widget.AppCompat.Button.Borderless.Colored" /> - \ No newline at end of file + \ No newline at end of file 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 22ebd93fd..82f3810cb 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,6 +1,7 @@ package com.habitrpg.android.habitica.helpers; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; @@ -70,15 +71,18 @@ public class PopupNotificationsManager { 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) + AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity, R.style.AlertDialogTheme) .setTitle(title) .setView(view) .setMessage("");