sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 03:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve fix character values design

Browse source
This commit is contained in:
Phillip Thelen 2017-10-16 13:58:18 +02:00
parent 6d9d6585df
commit 120da990b0
5 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Habitica/res/drawable/achievement_thermometer.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

13
Habitica/res/layout/fixvalues_edittext.xml
View file

@ -22,12 +22,15 @@
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@drawable/layout_rounded_bg_gray_700">
android:background="@drawable/layout_rounded_bg_gray_700"
android:paddingTop="8dp"
android:paddingLeft="16dp">
<EditText
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:inputType="number" />
android:inputType="number"
android:background="@android:color/transparent"/>
</android.support.design.widget.TextInputLayout>
<ImageView
android:id="@+id/iconView"
@ -35,4 +38,10 @@
android:layout_height="56dp"
android:scaleType="center"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_gravity="bottom"
android:background="@color/gray_500"
android:layout_marginRight="56dp"/>
</merge>

2
Habitica/res/values/attrs.xml
View file

@ -46,6 +46,6 @@
<attr name="fixIconName" format="string" />
<attr name="title" format="string" />
<attr name="iconBgColor" format="color" />
<attr name="hintStyle" format="integer" />
<attr name="hintStyle" format="reference" />
</declare-styleable>
</resources>

15
Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java
View file

@ -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());
}
}
}

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
View file

@ -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)
}
}
}