Merge branch 'master' into stoutford_tests

Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java

AndorsTrail/AndroidManifest.xml

@@ -23,6 +23,8 @@
 	<uses-permission 
 	    android:name="android.permission.WRITE_EXTERNAL_STORAGE" 
 	    />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><uses-permission android:name="android.permission.READ_LOGS"/>
+	
 		
 	<application 
 		android:name=".AndorsTrailApplication" 
@@ -30,6 +32,7 @@
 		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
+        android:theme="@style/AndorsTrailTheme_Blue"
 		>
 		<activity 
 		    android:name=".activity.StartScreenActivity" 
@@ -43,22 +46,22 @@
    		<activity 
 			android:name=".activity.MainActivity" 
 			android:label="@string/app_name" 
-			android:theme="@style/Theme.NoBackground"
+			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
 		<activity android:name=".activity.HeroinfoActivity" />
-		<activity android:name=".activity.MonsterInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ItemInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.LevelUpActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ConversationActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
 		<activity android:name=".activity.ShopActivity" />
 		<activity android:name=".activity.AboutActivity" />
 		<activity android:name=".activity.LoadingActivity" />
 		<activity android:name=".activity.Preferences" />
-		<activity android:name=".activity.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
 		<activity android:name=".activity.DisplayWorldMapActivity" />
 	</application>
 	

AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_pressed="true" android:color="@color/ui_blue_palette_text_gray_light"/>
+ 	<item android:state_enabled="true" android:state_checked="true" android:color="@color/ui_blue_palette_text_gray_light"/>
+ 	<item android:state_enabled="true" android:color="@color/ui_blue_palette_text_gray_mid"/>
+ 	<item android:state_enabled="false" android:color="@color/ui_blue_palette_text_gray_darker"/>
+ 	<item android:color="@color/ui_blue_palette_text_gray_mid"/>
+</selector>

AndorsTrail/res/drawable/loading_anim.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:oneshot="false">
+        
+    <item android:drawable="@drawable/loading_anim_00"
+        android:duration="150" />
+    <item android:drawable="@drawable/loading_anim_01"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_02"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_03"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_04"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_05"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_06"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_00"
+        android:duration="150" />
+
+</animation-list>

AndorsTrail/res/drawable/sky_gradient_drawable.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:tileMode="repeat"
+    android:src="@drawable/ts_sky_gradient_x6"
+    android:antialias="false"
+    android:dither="false"
+    />

AndorsTrail/res/drawable/title_logo_animated.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:oneshot="false">
+        
+    <item android:drawable="@drawable/logo_anim_shine_00"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_01"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_02"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_03"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_04"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_05"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_06"
+        android:duration="180" />
+    <item android:drawable="@drawable/logo_anim_shine_07"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_08"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_09"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_00"
+        android:duration="5000" />
+
+</animation-list>

AndorsTrail/res/drawable/ui_blue_buttonbar.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_blue_buttonbar_bg"/>
+    <item android:drawable="@drawable/ui_blue_buttonbar_frame"/>
+</layer-list>

AndorsTrail/res/drawable/ui_blue_buttonbar_bg.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_disabled_unpressed"
+        android:state_enabled="false"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_buttonbar_bg_enabled_unpressed"
+        />
+    
+</selector>

AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
+    
+    <item app:single="true" android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
+    
+    <item app:vertical="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:first="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
+
+	<item app:vertical="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
+    <item app:vertical="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vtop" />
+    <item app:vertical="true" app:last="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vbottom" />
+    
+    <item app:vertical="true" android:drawable="@drawable/ui_blue_buttonbar_frame_vmid" />
+    
+    <item app:horizontal="true" app:first="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:first="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:first="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
+
+	<item app:horizontal="true" app:last="true" app:reverse="false" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
+    <item app:horizontal="true" app:last="true" app:reverse="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hleft" />
+    <item app:horizontal="true" app:last="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hright" />
+    
+    <item app:horizontal="true" android:drawable="@drawable/ui_blue_buttonbar_frame_hmid" />
+    
+    <item android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />
+    
+</selector>

AndorsTrail/res/drawable/ui_blue_groupindicator.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_expanded="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_unchecked"
+        />
+    
+</selector>

AndorsTrail/res/drawable/ui_blue_listseparator.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:top="1dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@color/ui_blue_palette_blue_light"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+	<item android:top="2dp" android:left="3dp" android:right="3dp" android:bottom="1dp">
+        <shape android:shape="line">
+            <stroke android:width="1dp" android:color="@android:color/black"/>
+            <size android:height="4dp"/>
+        </shape>
+    </item>
+</layer-list>

AndorsTrail/res/drawable/ui_blue_radiobutton.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_enabled_checked"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_disabled_unchecked"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_radiobutton_disabled_checked"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+
+</selector>

AndorsTrail/res/drawable/ui_blue_spinner.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_blue_spinner_bg"/>
+    <item android:drawable="@drawable/ui_blue_spinner_arrow"/>
+</layer-list>

AndorsTrail/res/drawable/ui_blue_spinner_bg.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_blue_spinner_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_spinner_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_spinner_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_spinner_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>

AndorsTrail/res/drawable/ui_blue_spinner_list_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_focused="true" android:drawable="@drawable/ui_blue_lightframe_highlight"/>
+	<item android:state_pressed="true" android:drawable="@drawable/ui_blue_lightframe_highlight"/>
+	<item android:state_checked="true" android:drawable="@drawable/ui_blue_lightframe_highlight"/>
+	<item android:state_checked="false" android:drawable="@drawable/ui_blue_lightframe"/>
+</selector>

AndorsTrail/res/drawable/ui_blue_tabwidget.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_blue_tabwidget_enabled_selected"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_enabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_enabled_selected"
+        android:state_selected="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_disabled_unselected"
+        android:state_selected="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_tabwidget_disabled_selected"
+        android:state_selected="true"
+        android:state_enabled="false"
+        />
+</selector>

AndorsTrail/res/drawable/ui_blue_textbutton.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_unpressed"
+        android:state_pressed="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="false"
+        />
+    
+    
+    
+</selector>

AndorsTrail/res/drawable/ui_blue_togglebutton.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:constantSize="true">
+    
+     <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_pressed"
+        android:state_pressed="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="true"
+        />
+
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_enabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="true"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_unpressed"
+        android:state_checked="false"
+        android:state_enabled="false"
+        />
+    
+    <item
+        android:drawable="@drawable/ui_blue_textbutton_disabled_pressed"
+        android:state_checked="true"
+        android:state_enabled="false"
+        />
+</selector>

AndorsTrail/res/drawable/ui_charcoal_buttonbar.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/ui_charcoal_buttonbar_bg"/>
+    <item android:drawable="@drawable/ui_charcoal_buttonbar_frame"/>
+</layer-list>