From 120da990b010e6d1c505b8c8f2ea928aede2eca1 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 16 Oct 2017 13:58:18 +0200 Subject: [PATCH] improve fix character values design --- .../res/drawable/achievement_thermometer.png | Bin 0 -> 3264 bytes Habitica/res/layout/fixvalues_edittext.xml | 13 ++++++++++-- Habitica/res/values/attrs.xml | 2 +- .../LocalNotificationActionReceiver.java | 15 +++++++------ .../ui/views/settings/FixValuesEditText.kt | 20 +++++++----------- 5 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 Habitica/res/drawable/achievement_thermometer.png diff --git a/Habitica/res/drawable/achievement_thermometer.png b/Habitica/res/drawable/achievement_thermometer.png new file mode 100644 index 0000000000000000000000000000000000000000..34c160e7850ca8bde5f2aa81fb041ce4c695e512 GIT binary patch literal 3264 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 + android:background="@drawable/layout_rounded_bg_gray_700" + android:paddingTop="8dp" + android:paddingLeft="16dp"> + android:inputType="number" + android:background="@android:color/transparent"/> + \ No newline at end of file diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml index c4ab9508c..52f9438e9 100644 --- a/Habitica/res/values/attrs.xml +++ b/Habitica/res/values/attrs.xml @@ -46,6 +46,6 @@ - + diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java index b3cb0eb96..3e7d9fb03 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java @@ -10,6 +10,7 @@ import android.os.Bundle; import com.habitrpg.android.habitica.HabiticaBaseApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.data.ApiClient; +import com.habitrpg.android.habitica.data.SocialRepository; import com.habitrpg.android.habitica.data.UserRepository; import com.habitrpg.android.habitica.helpers.RxErrorHandler; import com.habitrpg.android.habitica.models.user.User; @@ -20,6 +21,8 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver { @Inject public UserRepository userRepository; @Inject + public SocialRepository socialRepository; + @Inject ApiClient apiClient; private User user; @@ -54,29 +57,29 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver { if (action.equals(this.resources.getString(R.string.accept_party_invite))) { if (this.user.getInvitations().getParty() == null) return; String partyId = this.user.getInvitations().getParty().getId(); - apiClient.joinGroup(partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); + socialRepository.joinGroup(partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); } else if (action.equals(this.resources.getString(R.string.reject_party_invite))) { if (this.user.getInvitations().getParty() == null) return; String partyId = this.user.getInvitations().getParty().getId(); - apiClient.rejectGroupInvite(partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); + socialRepository.rejectGroupInvite(partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); } else if (action.equals(this.resources.getString(R.string.accept_quest_invite))) { if (this.user.getParty() == null) return; String partyId = this.user.getParty().getId(); - apiClient.acceptQuest(partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); + socialRepository.acceptQuest(user, partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); } else if (action.equals(this.resources.getString(R.string.reject_quest_invite))) { if (this.user.getParty() == null) return; String partyId = this.user.getParty().getId(); - apiClient.rejectQuest(partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); + socialRepository.rejectQuest(user, partyId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); } else if (action.equals(this.resources.getString(R.string.accept_guild_invite))) { Bundle extras = this.intent.getExtras(); String guildId = extras.getString("groupID"); if (guildId == null) return; - apiClient.joinGroup(guildId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); + socialRepository.joinGroup(guildId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); } else if (action.equals(this.resources.getString(R.string.reject_guild_invite))) { Bundle extras = this.intent.getExtras(); String guildId = extras.getString("groupID"); if (guildId == null) return; - apiClient.rejectGroupInvite(guildId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); + socialRepository.rejectGroupInvite(guildId).subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()); } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt index 2b82510d2..a1b2fbed0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt @@ -37,7 +37,7 @@ class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(con editText.hint = attributes.getString(R.styleable.FixValuesEditText_title) editTextWrapper.hint = editText.hint - editTextWrapper.setHintTextAppearance(attributes.getInteger(R.styleable.FixValuesEditText_hintStyle, R.style.PurpleTextLabel)) + editTextWrapper.setHintTextAppearance(attributes.getResourceId(R.styleable.FixValuesEditText_hintStyle, R.style.PurpleTextLabel)) val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg) backgroundDrawable.setColorFilter(attributes.getColor(R.styleable.FixValuesEditText_iconBgColor, 0), PorterDuff.Mode.MULTIPLY) backgroundDrawable.alpha = 50 @@ -45,17 +45,13 @@ class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(con iconBackgroundView.background = backgroundDrawable val iconName = attributes.getString(R.styleable.FixValuesEditText_fixIconName) - if (iconName == "health") { - iconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartLightBg()) - } else if (iconName == "experience") { - iconView.setImageBitmap(HabiticaIconsHelper.imageOfExperience()) - } else if (iconName == "mana") { - iconView.setImageBitmap(HabiticaIconsHelper.imageOfMagic()) - } else if (iconName == "gold") { - iconView.setImageBitmap(HabiticaIconsHelper.imageOfGold()) - } else if (iconName == "level") { - iconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg()) - } else if (iconName == "streak") { + when (iconName) { + "health" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartLightBg()) + "experience" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfExperience()) + "mana" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfMagic()) + "gold" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfGold()) + "level" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg()) + "streak" -> iconView.setImageResource(R.drawable.achievement_thermometer) } } }