diff --git a/AndorsTrail/res/drawable/ui_gold_buttonbar.xml b/AndorsTrail/res/drawable/ui_gold_buttonbar.xml
new file mode 100644
index 000000000..ba80c9ef0
--- /dev/null
+++ b/AndorsTrail/res/drawable/ui_gold_buttonbar.xml
@@ -0,0 +1,5 @@
+
+
+ - @style/AndorsTrail_Style_StdFrame
- @style/AndorsTrailDialogTheme_Blue
+
+
+
+
+
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index 5fe53475d..582abb1b8 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -100,7 +100,7 @@
- @string/preferences_display_theme_blue
- - @string/preferences_display_theme_red
+ - @string/preferences_display_theme_gold
- 0
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index c9ca92ced..8a178ed69 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -693,10 +693,14 @@ Every skill level increases the attack chance of weapons with %1$d %% of their o
Unlocked
+
+
Theme
- Choose the UI theme (requires restart).
+ Choose the UI theme. (requires restart)
Blue
- Red
+ Gold
+ Changing UI theme requires restart. Andor\'s Trail has been closed.
+
diff --git a/AndorsTrail/res/values/ui_styles.xml b/AndorsTrail/res/values/ui_styles.xml
index a77a5c8da..45cf31f6b 100644
--- a/AndorsTrail/res/values/ui_styles.xml
+++ b/AndorsTrail/res/values/ui_styles.xml
@@ -127,7 +127,6 @@
diff --git a/AndorsTrail/res/values/ui_theme.xml b/AndorsTrail/res/values/ui_theme.xml
index 1a6a98158..5c96e35e6 100644
--- a/AndorsTrail/res/values/ui_theme.xml
+++ b/AndorsTrail/res/values/ui_theme.xml
@@ -200,110 +200,136 @@
- @null
-
-
-
+
+
+
+ #362109
+ #5e441e
+ #866933
+
+
+
+
+
+
+
+
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
index 1c9acbdbf..d90d5ec01 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
@@ -98,6 +98,5 @@ public final class AndorsTrailPreferences {
dest.useLocalizedResources = true;
dest.selectedTheme = 0;
}
- ThemeHelper.changeTheme(ThemeHelper.Theme.values()[dest.selectedTheme]);
}
}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index eb359b57e..cfee5d906 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -248,7 +248,7 @@ public final class Dialogs {
Intent intent = new Intent(ctx, ItemInfoActivity.class);
intent.putExtra("buttonText", buttonText);
intent.putExtra("buttonEnabled", buttonEnabled);
- intent.putExtra("moreActions", (actionType == ItemInfoActivity.ItemInfoAction.equip || actionType == ItemInfoActivity.ItemInfoAction.use));
+ intent.putExtra("moreActions", (actionType == ItemInfoActivity.ItemInfoAction.equip || actionType == ItemInfoActivity.ItemInfoAction.use || actionType == ItemInfoActivity.ItemInfoAction.none));
intent.putExtra("itemTypeID", itemTypeID);
intent.putExtra("actionType", actionType.name());
if (inventorySlot != null) intent.putExtra("inventorySlot", inventorySlot.name());
@@ -262,19 +262,6 @@ public final class Dialogs {
}
public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
- // Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
- // .setTitle(R.string.dialog_rest_title)
- // .setMessage(R.string.dialog_rest_confirm_message)
- // .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
- // @Override
- // public void onClick(DialogInterface dialog, int which) {
- // controllerContext.mapController.rest(area);
- // }
- // })
-
- //
- // .setNegativeButton(android.R.string.no, null)
- // .create();
final Dialog d = CustomDialogFactory.createDialog(currentActivity,
currentActivity.getResources().getString(R.string.dialog_rest_title),
null,
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 57e50b26e..c38814586 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -472,7 +472,7 @@ public final class ConversationActivity
rb.setFocusableInTouchMode(false);
if (replyGroup.getChildCount() == 0) { //Add a separator before first item
ImageView iv = new ImageView(this);
- iv.setBackgroundResource(R.drawable.ui_blue_listseparator);
+ iv.setBackgroundResource(ThemeHelper.getThemeResource(this, R.attr.ui_theme_listseparator_drawable));
RadioGroup.LayoutParams ivLayoutParams = new RadioGroup.LayoutParams(RadioGroup.LayoutParams.MATCH_PARENT, RadioGroup.LayoutParams.WRAP_CONTENT);
ivLayoutParams.setMargins(0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_margintop), 0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_marginbottom));
iv.setLayoutParams(ivLayoutParams);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
index 634830de5..6a95ee8fa 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
@@ -2,25 +2,7 @@ package com.gpl.rpg.AndorsTrail.activity.fragment;
import java.util.Arrays;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.Dialogs;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.ItemController;
-import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail.view.CustomMenuInflater;
-import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
-
import android.app.Activity;
-import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -39,6 +21,23 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.CustomMenuInflater;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
+
public final class HeroinfoActivity_Inventory extends Fragment implements CustomMenuInflater.MenuItemSelectedListener {
private static final int INTENTREQUEST_ITEMINFO = 3;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
index 36a89b7fe..d0f5dec29 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
@@ -28,6 +28,7 @@ import com.gpl.rpg.AndorsTrail.controller.Constants;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.savegames.Savegames;
import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
public class StartScreenActivity_MainMenu extends Fragment {
@@ -262,6 +263,12 @@ public class StartScreenActivity_MainMenu extends Fragment {
return;
}
}
+ if (ThemeHelper.changeTheme(ThemeHelper.Theme.values()[preferences.selectedTheme])) {
+ // Changing the theme requires a restart to re-create all activities.
+ Toast.makeText(getActivity(), R.string.change_theme_requires_restart, Toast.LENGTH_LONG).show();
+ getActivity().finish();
+ return;
+ }
app.getWorld().tileManager.updatePreferences(preferences);
}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
index 117558618..72eada303 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ThemeHelper.java
@@ -8,14 +8,13 @@ import com.gpl.rpg.AndorsTrail.R;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
+import android.graphics.drawable.Drawable;
public class ThemeHelper {
private static final class ThemeSet {
- String name;
int baseThemeRes, noBackgroundThemeRes, dialogThemeRes;
- public ThemeSet(String name, int baseThemeRes, int noBackgroundThemeRes, int dialogThemeRes) {
- this.name = name;
+ public ThemeSet(int baseThemeRes, int noBackgroundThemeRes, int dialogThemeRes) {
this.baseThemeRes = baseThemeRes;
this.noBackgroundThemeRes = noBackgroundThemeRes;
this.dialogThemeRes = dialogThemeRes;
@@ -24,15 +23,16 @@ public class ThemeHelper {
public static enum Theme {
blue,
- red
+ gold
}
private static final Map THEME_SETS = new HashMap();
private static Theme SELECTED_THEME = Theme.blue;
+ private static boolean first = true;
static {
- THEME_SETS.put(Theme.blue, new ThemeSet("Blue", R.style.AndorsTrailTheme_Blue, R.style.AndorsTrailTheme_Blue_NoBackground, R.style.AndorsTrailDialogTheme_Blue));
- THEME_SETS.put(Theme.red, new ThemeSet("Red", R.style.AndorsTrailTheme_Red, R.style.AndorsTrailTheme_Red_NoBackground, R.style.AndorsTrailDialogTheme_Red));
+ THEME_SETS.put(Theme.blue, new ThemeSet(R.style.AndorsTrailTheme_Blue, R.style.AndorsTrailTheme_Blue_NoBackground, R.style.AndorsTrailDialogTheme_Blue));
+ THEME_SETS.put(Theme.gold, new ThemeSet(R.style.AndorsTrailTheme_Gold, R.style.AndorsTrailTheme_Gold_NoBackground, R.style.AndorsTrailDialogTheme_Gold));
}
public static int getThemeColor(Context context, int attrResId) {
@@ -42,8 +42,18 @@ public class ThemeHelper {
return c;
}
- public static String getThemeName(Theme t) {
- return THEME_SETS.get(t).name;
+ public static int getThemeResource(Context context, int attrResId) {
+ TypedArray ta = context.getTheme().obtainStyledAttributes(new int[] {attrResId});
+ int resId = ta.getResourceId(0, 0);
+ ta.recycle();
+ return resId;
+ }
+
+ public static Drawable getThemeDrawable(Context context, int attrResId) {
+ TypedArray ta = context.getTheme().obtainStyledAttributes(new int[] {attrResId});
+ Drawable d = ta.getDrawable(0);
+ ta.recycle();
+ return d;
}
public static int getBaseTheme() {
@@ -58,7 +68,17 @@ public class ThemeHelper {
return THEME_SETS.get(SELECTED_THEME).dialogThemeRes;
}
- public static void changeTheme(Theme t) {
+ //Returns true if theme has changed after startup.
+ public static boolean changeTheme(Theme t) {
+ if (t == SELECTED_THEME) {
+ first = false;
+ return false;
+ }
SELECTED_THEME = t;
+ if (first) {
+ first = false;
+ return false;
+ }
+ return true;
}
}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
index 354ca9329..640dc3c84 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
@@ -115,7 +115,7 @@ public class CustomDialogFactory {
Button b = new Button(dialog.getContext());
b.setLayoutParams(params);
//Old android versions need this "reminder"
- b.setBackgroundDrawable(dialog.getContext().getResources().getDrawable(R.drawable.ui_blue_textbutton));
+ b.setBackgroundDrawable(ThemeHelper.getThemeDrawable(dialog.getContext(), R.attr.ui_theme_textbutton_drawable));
b.setTextColor(ThemeHelper.getThemeColor(dialog.getContext(), R.attr.ui_theme_dialogue_light_color));
b.setText(textId);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
index 3cbd5732b..cab9df2d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
@@ -21,6 +21,7 @@ import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListener;
import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class DisplayActiveActorConditionIcons implements ActorConditionListener {
@@ -262,7 +263,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
this.id = id;
this.image = new ActiveConditionIconImageView(context);
this.image.setId(id);
- this.image.setBackgroundResource(R.drawable.ui_blue_buttonbar);
+ this.image.setBackgroundResource(ThemeHelper.getThemeResource(context, R.attr.ui_theme_buttonbar_drawable));
this.image.setHorizontal();
this.image.reverse();
this.onNewIconAnimation = AnimationUtils.loadAnimation(context, R.anim.scaleup);