From 0734d17b1e3601fb467c433258c994de06dd9a92 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Fri, 27 Dec 2024 11:57:17 +0100 Subject: [PATCH 1/2] Add descriptions to actor conditions --- .../AndorsTrail/activity/ActorConditionInfoActivity.java | 4 ++++ .../rpg/AndorsTrail/model/ability/ActorConditionType.java | 3 +++ .../resource/parsers/ActorConditionsTypeParser.java | 1 + .../AndorsTrail/resource/parsers/json/JsonFieldNames.java | 1 + .../gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java | 1 + AndorsTrail/res/layout/actorconditioninfo.xml | 7 +++++++ 6 files changed, 17 insertions(+) diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java index 0073e70f4..6354edf6c 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java @@ -38,6 +38,10 @@ public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity { tv.setText(conditionType.name); world.tileManager.setImageViewTile(getResources(), tv, conditionType); + TextView descriptionTv = (TextView) findViewById(R.id.actorconditioninfo_description); + if(conditionType.description != null && !conditionType.description.isEmpty()) descriptionTv.setText(conditionType.description); + else descriptionTv.setVisibility(View.GONE); + Button b = (Button) findViewById(R.id.actorconditioninfo_close); b.setOnClickListener(new OnClickListener() { @Override diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java index f625a6101..bf8e278ca 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java @@ -10,6 +10,7 @@ public final class ActorConditionType { public final String conditionTypeID; public final String name; + public final String description; public final int iconID; public final ConditionCategory conditionCategory; public final boolean isStacking; @@ -21,6 +22,7 @@ public final class ActorConditionType { public ActorConditionType( String conditionTypeID , String name + , String description , int iconID , ConditionCategory conditionCategory , boolean isStacking @@ -31,6 +33,7 @@ public final class ActorConditionType { ) { this.conditionTypeID = conditionTypeID; this.name = name; + this.description = description; this.iconID = iconID; this.conditionCategory = conditionCategory; this.isStacking = isStacking; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java index 0efa4e057..3ed83d905 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java @@ -26,6 +26,7 @@ public final class ActorConditionsTypeParser extends JsonCollectionParserFor 0 diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java index 7f784b84a..04b1b8026 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java @@ -4,6 +4,7 @@ public final class JsonFieldNames { public static final class ActorCondition { public static final String conditionTypeID = "id"; public static final String name = "name"; + public static final String description = "description"; public static final String iconID = "iconID"; public static final String category = "category"; public static final String isStacking = "isStacking"; diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java index 7030a2caa..efa147672 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java @@ -66,6 +66,7 @@ public final class ActorConditionEffectList extends LinearLayout { sb.append(effect.magnitude); } } + if (ActorCondition.isTemporaryEffect(effect.duration)) { sb.append(' '); sb.append(res.getString(R.string.iteminfo_effect_duration, effect.duration)); diff --git a/AndorsTrail/res/layout/actorconditioninfo.xml b/AndorsTrail/res/layout/actorconditioninfo.xml index 55ec9a0af..9b8251afb 100644 --- a/AndorsTrail/res/layout/actorconditioninfo.xml +++ b/AndorsTrail/res/layout/actorconditioninfo.xml @@ -24,6 +24,13 @@ android:orientation="vertical" android:padding="@dimen/dialog_margin" > + + Date: Fri, 27 Dec 2024 12:56:37 +0100 Subject: [PATCH 2/2] cleanup --- .../com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java | 1 - AndorsTrail/res/layout/actorconditioninfo.xml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java index efa147672..7030a2caa 100644 --- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java +++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java @@ -66,7 +66,6 @@ public final class ActorConditionEffectList extends LinearLayout { sb.append(effect.magnitude); } } - if (ActorCondition.isTemporaryEffect(effect.duration)) { sb.append(' '); sb.append(res.getString(R.string.iteminfo_effect_duration, effect.duration)); diff --git a/AndorsTrail/res/layout/actorconditioninfo.xml b/AndorsTrail/res/layout/actorconditioninfo.xml index 9b8251afb..2c64bdfe5 100644 --- a/AndorsTrail/res/layout/actorconditioninfo.xml +++ b/AndorsTrail/res/layout/actorconditioninfo.xml @@ -28,8 +28,7 @@ android:id="@+id/actorconditioninfo_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/section_margin" - android:text="Hi" /> + android:layout_marginBottom="@dimen/section_margin" />