OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

More UI tweaks... not there yet.

Browse Source
This commit is contained in:
Zukero
2017-11-03 18:06:50 +01:00
parent 335c853acd
commit 3a8ad1395f
36 changed files with 612 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
AndorsTrail/res/drawable/ui_blue_radiobutton_disabled_checked.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 463 B

BIN
AndorsTrail/res/drawable/ui_blue_radiobutton_enabled_checked.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 468 B

140
AndorsTrail/res/layout-land/heroinfo_inventory.xml
View File

@@ -1,88 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="left"
>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="left"
android:orientation="vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_wornequipment"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_wornequipment" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal" >
<include layout="@layout/heroinfo_equipped" />
<include layout="@layout/heroinfo_equipped" />
<include layout="@layout/heroinfo_statsicons" />
<include layout="@layout/heroinfo_statsicons" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="left"
android:orientation="vertical" >
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:orientation="vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_inventory" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="left"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<Spinner
android:id="@+id/inventorylist_category_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:orientation="horizontal"
android:prompt="@string/heroinfo_inventory_categories"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal" >
<Spinner
android:id="@+id/inventorylist_sort_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_toRightOf="@+id/inventorylist_category_filters"
android:prompt="@string/heroinfo_inventory_sort"
android:layout_margin="@dimen/dialog_margin"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp" />
</LinearLayout>
<Spinner
android:id="@+id/inventorylist_category_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:orientation="horizontal"
android:prompt="@string/heroinfo_inventory_categories" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_inventory"
/>
<Spinner
android:id="@+id/inventorylist_sort_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:orientation="horizontal"
android:prompt="@string/heroinfo_inventory_sort" />
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/inventorylist_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<ListView
android:id="@+id/inventorylist_root"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

5
AndorsTrail/res/layout/actorconditioninfo.xml
View File

@@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout
android:layout_width="match_parent"
@@ -85,13 +86,13 @@
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@android:style/ButtonBar"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button

21
AndorsTrail/res/layout/bulkselection.xml
View File

@@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout
android:layout_width="match_parent"
@@ -124,23 +125,15 @@
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@android:style/ButtonBar"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/bulkselection_finalize_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/inventory_drop"
/>
<Button
android:id="@+id/bulkselection_cancel_button"
android:layout_width="match_parent"
@@ -148,6 +141,14 @@
android:layout_weight="1"
android:text="@android:string/cancel"
/>
<Button
android:id="@+id/bulkselection_finalize_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/inventory_drop"
/>
</LinearLayout>

3
AndorsTrail/res/layout/combatview.xml
View File

@@ -15,6 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
style="@style/AndorsTrail_Blue_StdFrame"
android:orientation="horizontal" >
<Button
@@ -66,6 +67,7 @@
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
style="@style/AndorsTrail_Blue_StdFrame"
android:text="@string/combat_monsteraction"
android:textSize="@dimen/actionbar_text" />
@@ -76,6 +78,7 @@
android:layout_below="@id/combatview_actionbar"
android:gravity="center_vertical"
android:orientation="horizontal"
style="@style/AndorsTrail_Blue_StdFrame"
>
<!-- android:animateLayoutChanges="true" -->

2
AndorsTrail/res/layout/conversation.xml
View File

@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
style="@style/AndorsTrail_Blue_RichFrame"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button

62
AndorsTrail/res/layout/custom_dialog_title_icon.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:fitsSystemWindows="true" >
<LinearLayout android:id="@+id/title_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:minHeight="53dp"
android:paddingTop="6dp"
android:paddingBottom="9dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:background="@drawable/ui_blue_richframe"
>
<ImageView android:id="@+id/left_icon"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginTop="6dp"
android:layout_gravity="top"
android:scaleType="fitCenter"
/>
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingTop="2dp"
android:paddingBottom="1dp"
android:paddingStart="14dp"
android:paddingEnd="14dp"
/>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:background="@drawable/ui_blue_stdframe"
>
<FrameLayout android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</FrameLayout>
<LinearLayout android:id="@+id/button_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
</LinearLayout>
</LinearLayout>

71
AndorsTrail/res/layout/displayworldmap.xml
View File

@@ -1,44 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/ui_gradientshape"
android:padding="@dimen/boxshape_margin"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:orientation="horizontal"
android:padding="@dimen/boxshape_margin" >
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/menu_button_worldmap"
style="@style/textWithIcon"
android:textSize="@dimen/titletext"
android:drawableLeft="@android:drawable/ic_dialog_map"
<TextView
style="@style/textWithIcon"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableLeft="@drawable/ui_icon_map"
android:text="@string/menu_button_worldmap"
android:textSize="@dimen/titletext" />
/>
<Button
android:id="@+id/displayworldmap_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dialog_close" />
</LinearLayout>
<Button
android:id="@+id/displayworldmap_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/buttonStyleSmall"
android:text="@string/dialog_close"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ui_blue_stdframe_gray"
android:orientation="vertical" >
</LinearLayout>
<WebView
android:id="@+id/displayworldmap_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent" />
</LinearLayout>
<WebView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/displayworldmap_webview"
/>
</LinearLayout>
</LinearLayout>

135
AndorsTrail/res/layout/heroinfo_inventory.xml
View File

@@ -1,88 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="vertical"
android:gravity="left"
>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:orientation="vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_wornequipment"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/heroinfo_wornequipment" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<include layout="@layout/heroinfo_equipped" />
<include layout="@layout/heroinfo_equipped" />
<include layout="@layout/heroinfo_statsicons" />
<include layout="@layout/heroinfo_statsicons" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:gravity="left"
android:orientation="vertical" >
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_inventory" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="left"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<Spinner
android:id="@+id/inventorylist_category_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:orientation="horizontal"
android:prompt="@string/heroinfo_inventory_categories"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp" />
<Spinner
android:id="@+id/inventorylist_category_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:orientation="horizontal"
android:prompt="@string/heroinfo_inventory_categories" />
<Spinner
android:id="@+id/inventorylist_sort_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_toRightOf="@+id/inventorylist_category_filters"
android:prompt="@string/heroinfo_inventory_sort"
android:layout_margin="@dimen/dialog_margin"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp" />
</LinearLayout>
<Spinner
android:id="@+id/inventorylist_sort_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:orientation="horizontal"
android:prompt="@string/heroinfo_inventory_sort" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/heroinfo_inventory"
/>
<ListView
android:id="@+id/inventorylist_root"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ListView
android:id="@+id/inventorylist_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

28
AndorsTrail/res/layout/heroinfo_skill_list.xml
View File

@@ -4,32 +4,25 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:gravity="right"
android:orientation="horizontal">
android:background="@drawable/ui_blue_stdframe"
android:orientation="vertical">
<TextView
android:id="@+id/heroinfo_listskills_number_of_increases"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_gravity="left"
android:layout_marginBottom="@dimen/section_margin"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="@dimen/section_margin"
android:layout_weight="1"
android:text="@string/skill_number_of_increases_several" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:id="@+id/skillList_filters_spinners"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="right"
android:orientation="horizontal">
@@ -37,21 +30,14 @@
android:id="@+id/skillList_category_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:orientation="horizontal"
android:layout_marginRight="10dp"
android:prompt="@string/heroinfo_skill_categories" />
<Spinner
android:id="@+id/skillList_sort_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/heroinfo_skill_categories"
android:layout_marginRight="10dp"
android:orientation="horizontal"
android:prompt="@string/heroinfo_skill_sort" />
</LinearLayout>

361
AndorsTrail/res/layout/heroinfo_stats.xml
View File

@@ -1,175 +1,230 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:orientation="vertical" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/heroinfo_container"
>
<LinearLayout
android:id="@+id/heroinfo_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/heroinfo_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/titleWithIcon"
android:drawableLeft="@drawable/char_hero"
android:text="@android:string/unknownName"
/>
<TextView
android:id="@+id/heroinfo_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:drawableLeft="@drawable/char_hero"
android:text="@android:string/unknownName" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin" >
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe" >
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_level" />
<TextView android:id="@+id/heroinfo_level" android:text="@android:string/unknownName" />
</TableRow>
<TableRow>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_totalexperience" />
<TextView android:id="@+id/heroinfo_totalexperience" android:text="@android:string/unknownName" />
</TableRow>
</TableLayout>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_level" />
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_healthbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/heroinfo_level"
android:text="@android:string/unknownName" />
</TableRow>
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_expbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5sp" />
<TableRow>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_currenttraits"
style="@style/actorinfo_sectionheader"
/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_headerbackground"
/>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_totalexperience" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/actorinfo_stats_table"
>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_actionpoints" />
<TextView android:id="@+id/heroinfo_ap" />
</TableRow>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
<TextView android:id="@+id/heroinfo_reequip_cost" />
</TableRow>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
<TextView android:id="@+id/heroinfo_useitem_cost" />
</TableRow>
<include layout="@layout/traitsinfoview" />
</TableLayout>
<TextView
android:id="@+id/heroinfo_totalexperience"
android:text="@android:string/unknownName" />
</TableRow>
</TableLayout>
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/actorinfo_onhiteffects"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:orientation="vertical" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_currentconditions"
android:id="@+id/actorinfo_currentconditions_title"
style="@style/actorinfo_sectionheader"
/>
<com.gpl.rpg.AndorsTrail.view.ActorConditionList
android:id="@+id/actorinfo_currentconditions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_healthbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_basetraits"
style="@style/actorinfo_sectionheader"
/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_headerbackground"
/>
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_expbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5sp" />
</LinearLayout>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/heroinfo_basestats_table"
>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_hp" />
<TextView android:id="@+id/basetraitsinfo_max_hp" />
</TableRow>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_ap" />
<TextView android:id="@+id/basetraitsinfo_max_ap" />
</TableRow>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
<TextView android:id="@+id/heroinfo_base_reequip_cost" />
</TableRow>
<TableRow>
<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
<TextView android:id="@+id/heroinfo_base_useitem_cost" />
</TableRow>
<include layout="@layout/traitsinfoview" />
</TableLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:orientation="vertical" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/heroinfo_gamestats"
style="@style/actorinfo_sectionheader"
/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:id="@+id/actorinfo_currentconditions_title2"
android:background="@drawable/ui_headerbackground"
/>
<include layout="@layout/heroinfo_stats_gamestats" />
<TextView
style="@style/actorinfo_sectionheader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_currenttraits" />
</LinearLayout>
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_headerbackground" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<TableLayout
android:id="@+id/actorinfo_stats_table"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/heroinfo_levelup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/heroinfo_levelup" />
</LinearLayout>
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_actionpoints" />
<TextView android:id="@+id/heroinfo_ap" />
</TableRow>
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_reequip_cost" />
<TextView android:id="@+id/heroinfo_reequip_cost" />
</TableRow>
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_useitem_cost" />
<TextView android:id="@+id/heroinfo_useitem_cost" />
</TableRow>
<include layout="@layout/traitsinfoview" />
</TableLayout>
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/actorinfo_onhiteffects"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/actorinfo_currentconditions_title"
style="@style/actorinfo_sectionheader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_currentconditions" />
<com.gpl.rpg.AndorsTrail.view.ActorConditionList
android:id="@+id/actorinfo_currentconditions"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/actorinfo_sectionheader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_basetraits" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_headerbackground" />
<TableLayout
android:id="@+id/heroinfo_basestats_table"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/traitsinfo_base_max_hp" />
<TextView android:id="@+id/basetraitsinfo_max_hp" />
</TableRow>
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/traitsinfo_base_max_ap" />
<TextView android:id="@+id/basetraitsinfo_max_ap" />
</TableRow>
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_reequip_cost" />
<TextView android:id="@+id/heroinfo_base_reequip_cost" />
</TableRow>
<TableRow>
<TextView
style="@style/traitsinfo_label"
android:text="@string/heroinfo_useitem_cost" />
<TextView android:id="@+id/heroinfo_base_useitem_cost" />
</TableRow>
<include layout="@layout/traitsinfoview" />
</TableLayout>
<TextView
style="@style/actorinfo_sectionheader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/heroinfo_gamestats" />
<View
android:id="@+id/actorinfo_currentconditions_title2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_headerbackground" />
<include layout="@layout/heroinfo_stats_gamestats" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@drawable/ui_blue_stdframe"
android:orientation="horizontal" >
<Button
android:id="@+id/heroinfo_levelup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/heroinfo_levelup" />
</LinearLayout>
</LinearLayout>

2
AndorsTrail/res/layout/iteminfo.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_RichFrame"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout
android:layout_width="match_parent"

5
AndorsTrail/res/layout/loadsave.xml
View File

@@ -14,6 +14,9 @@
android:layout_height="wrap_content"
android:text="@string/loadsave_title_save"
style="@style/titleWithIcon"
android:gravity="center"
android:background="@drawable/ui_blue_richframe"
android:layout_marginBottom="5dp"
/>
<TextView
@@ -22,6 +25,7 @@
android:layout_height="wrap_content"
android:text="@string/loadsave_selectslot"
android:textColor="@color/ui_blue_textbutton_textcolor"
android:layout_marginBottom="5dp"
/>
<ScrollView
@@ -39,6 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@android:string/unknownName"
android:layout_marginBottom="5dp"
/>
<Button
android:id="@+id/loadsave_save_to_new_slot"

7
AndorsTrail/res/layout/monsterencounter.xml
View File

@@ -10,6 +10,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
style="@style/AndorsTrail_Blue_StdFrame"
>
<TextView
@@ -18,6 +19,8 @@
android:layout_height="wrap_content"
android:text="@string/dialog_monsterencounter_title"
style="@style/titleWithIcon"
android:background="@drawable/ui_blue_richframe"
android:gravity="center"
android:drawableLeft="@drawable/equip_weapon"
/>
@@ -30,14 +33,14 @@
</LinearLayout>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
style="@android:style/ButtonBar"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/monsterencounter_attack"

21
AndorsTrail/res/layout/monsterinfo.xml
View File

@@ -10,6 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout
android:layout_width="match_parent"
@@ -20,13 +21,14 @@
>
<TextView
android:id="@+id/monsterinfo_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_monsterencounter_info"
style="@style/titleWithIcon"
android:drawableLeft="@drawable/char_hero"
/>
android:id="@+id/monsterinfo_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/char_hero"
android:background="@drawable/ui_blue_richframe"
android:gravity="center"
android:text="@string/dialog_monsterencounter_info" />
<LinearLayout
android:layout_width="match_parent"
@@ -90,19 +92,18 @@
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@android:style/ButtonBar"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/monsterinfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_close"
/>
</LinearLayout>

1
AndorsTrail/res/layout/questlog.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="match_parent"
android:padding="@dimen/dialog_margin"
android:orientation="vertical"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Spinner

5
AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="left"
android:background="@drawable/ui_blue_stdframe"
>
<TextView
@@ -15,12 +16,16 @@
android:drawableLeft="@drawable/ui_icon_equipment"
android:paddingTop="3sp"
style="@style/titleWithIcon"
android:gravity="center"
android:background="@drawable/ui_blue_richframe"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/inventory_selectitem"
android:textColor="@color/ui_blue_textbutton_textcolor"
android:layout_marginBottom="5dp"
/>

10
AndorsTrail/res/layout/shoplist.xml
View File

@@ -5,14 +5,13 @@
android:gravity="left"
android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:gravity="right"
android:orientation="horizontal"
android:layout_alignParentRight="true">
style="@style/AndorsTrail_Blue_StdFrame"
android:orientation="horizontal">
<TextView
android:id="@+id/shop_gc"
@@ -21,6 +20,7 @@
android:drawableLeft="@drawable/ui_icon_coins"
android:drawablePadding="@dimen/boxshape_margin"
android:gravity="center_vertical"
android:layout_gravity="left"
/>
<Spinner
android:id="@+id/shoplist_sort_filters"
@@ -29,7 +29,7 @@
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_gravity="right"
android:prompt="@string/shop_item_sort" />
</LinearLayout>

4
AndorsTrail/res/layout/skill_info_view.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_RichFrame"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout
android:layout_width="match_parent"
@@ -24,6 +24,8 @@
android:layout_height="wrap_content"
android:text="@string/heroinfo_skill"
style="@style/titleWithIcon"
android:background="@drawable/ui_blue_richframe"
android:gravity="center"
android:drawableLeft="@drawable/ui_icon_skill"
/>

5
AndorsTrail/res/layout/startscreen_mainmenu.xml
View File

@@ -19,6 +19,8 @@
android:id="@+id/save_preview_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
layout="@layout/save_preview"
android:visibility="gone" />
@@ -26,12 +28,15 @@
android:background="@drawable/ui_blue_stdframe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:gravity="bottom"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:gravity="center_vertical"
android:orientation="horizontal" >

6
AndorsTrail/res/layout/startscreen_newgame.xml
View File

@@ -96,13 +96,17 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/startscreen_newgame_cancel" />
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:text="@android:string/cancel" />
<Button
android:id="@+id/startscreen_newgame_start"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:text="@string/startscreen_newgame_start" />
</LinearLayout>

1
AndorsTrail/res/layout/statusview.xml
View File

@@ -3,6 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/AndorsTrail_Blue_StdFrame"
>
<ImageButton

11
AndorsTrail/res/values-v14/ui_styles.xml
View File

@@ -10,6 +10,10 @@
<item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
<item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<!-- <item name="android:toastFrameBackground">@drawable/ui_blue_richframe</item> -->
</style>
<style name="AndorsTrailStyle.Dialog" parent="android:Theme.Dialog">
@@ -17,12 +21,17 @@
<item name="android:buttonBarButtonStyle">@style/AndorsTrail_Blue_TextButton</item>
<item name="android:imageButtonStyle">@style/AndorsTrail_Blue_ImageButton</item>
<item name="android:buttonBarStyle">@style/AndorsTrail_Blue_StdFrame</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:background">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:checkboxStyle">@style/AndorsTrail_Blue_Checkbox</item>
<item name="android:radioButtonStyle">@style/AndorsTrail_Blue_RadioButton</item>
<item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
<item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
</style>
<style name="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">

1
AndorsTrail/res/values/strings.xml
View File

@@ -134,7 +134,6 @@
<string name="startscreen_continue">Continue current game</string>
<string name="startscreen_newgame">New game</string>
<string name="startscreen_newgame_start">Start game</string>
<string name="startscreen_newgame_cancel">Cancel</string>
<string name="startscreen_newgame_confirm">You will lose your current game and your current character, are you sure you want to start a new game?</string>
<string name="startscreen_about">About/help</string>
<string name="startscreen_selectherosprite">Choose your hero</string>

26
AndorsTrail/res/values/ui_styles.xml
View File

@@ -10,25 +10,40 @@
<item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
<item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
</style>
<style name="AndorsTrailStyle.NoBackground" parent="AndorsTrailStyle">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowBackground">@null</item>
</style>
<style name="AndorsTrailStyle.Dialog" parent="android:Theme.Dialog">
<item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
<item name="android:imageButtonStyle">@style/AndorsTrail_Blue_ImageButton</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:background">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:checkboxStyle">@style/AndorsTrail_Blue_Checkbox</item>
<item name="android:radioButtonStyle">@style/AndorsTrail_Blue_RadioButton</item>
<item name="android:listViewStyle">@style/AndorsTrail_Blue_List</item>
<item name="android:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
</style>
<style name="AndorsTrailStyle.Dialog.Alert" parent="AndorsTrailStyle.Dialog">
<item name="android:background">@null</item>
<item name="android:windowBackground">@drawable/ui_blue_stdframe</item>
<item name="android:windowTitleStyle">@style/AndorsTrailStyle.DialogWindowTitle</item>
<!-- <item name="android:dialogTitleDecorLayout">@layout/custom_dialog_title_icon</item>
<item name="android:dialogCustomTitleDecorLayout">@layout/custom_dialog_title_icon</item>
<item name="android:dialogTitleIconsDecorLayout">@layout/custom_dialog_title_icon</item> -->
</style>
<style name="AndorsTrail_Blue_List" parent="@android:style/Widget.ListView">
<style name="AndorsTrailStyle.DialogWindowTitle" > <!-- parent="android:style/DialogWindowTitle" -->
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
</style>
<style name="AndorsTrail_Blue_List" parent="android:style/Widget.ListView">
<item name="android:background">@drawable/ui_blue_stdframe</item>
</style>
@@ -44,7 +59,7 @@
</style>
<style name="AndorsTrail_Blue_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
<item name="android:button">@drawable/ui_blue_radiobutton</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingLeft">20dp</item>
</style>
<style name="AndorsTrail_Blue_Checkbox" parent="android:style/Widget.CompoundButton.CheckBox">
<item name="android:button">@drawable/ui_blue_radiobutton</item>
@@ -52,6 +67,7 @@
<style name="AndorsTrail_Blue_Spinner" parent="android:style/Widget.Spinner">
<item name="android:background">@drawable/ui_blue_spinner</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textAppearance">@color/ui_blue_textbutton_textcolor</item>
</style>
<style name="AndorsTrail_Blue_SpinnerDropDown" parent="android:style/Widget.DropDownItem.Spinner">
<item name="android:background">@drawable/ui_blue_spinner_list_bg</item>
@@ -86,7 +102,7 @@
</style>
<style name="statsBoxStyle" parent="android:Widget.TextView">
<item name="android:background">@drawable/ui_boxshape</item>
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:drawablePadding">@dimen/boxshape_margin</item>
<item name="android:gravity">center_vertical</item>
<item name="android:layout_margin">@dimen/boxshape_margin</item>

11
AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
View File

@@ -11,6 +11,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
@@ -201,7 +202,7 @@ public final class Dialogs {
});
itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
AlertDialog.Builder db = new AlertDialog.Builder(mainActivity)
AlertDialog.Builder db = new AlertDialog.Builder(new ContextThemeWrapper(mainActivity, R.style.AndorsTrailStyle))
.setTitle(title)
.setMessage(msg)
.setIcon(new BitmapDrawable(mainActivity.getResources(), world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_groundbag)))
@@ -244,7 +245,7 @@ public final class Dialogs {
}
public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
Dialog d = new AlertDialog.Builder(currentActivity)
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() {
@@ -259,7 +260,7 @@ public final class Dialogs {
showDialogAndPause(d, controllerContext);
}
public static void showRested(final Activity currentActivity, final ControllerContext controllerContext) {
Dialog d = new AlertDialog.Builder(currentActivity)
Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
.setTitle(R.string.dialog_rest_title)
.setMessage(R.string.dialog_rest_message)
.setNeutralButton(android.R.string.ok, null)
@@ -269,7 +270,7 @@ public final class Dialogs {
}
public static void showNewVersion(final Activity currentActivity) {
new AlertDialog.Builder(currentActivity)
new AlertDialog.Builder(new ContextThemeWrapper(currentActivity, R.style.AndorsTrailStyle))
.setTitle(R.string.dialog_newversion_title)
.setMessage(R.string.dialog_newversion_message)
.setNeutralButton(android.R.string.ok, null)
@@ -344,7 +345,7 @@ public final class Dialogs {
itemList.setChoiceMode(ListView.CHOICE_MODE_NONE);
itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
final Dialog d = new AlertDialog.Builder(context)
final Dialog d = new AlertDialog.Builder(new ContextThemeWrapper(context, R.style.AndorsTrailStyle))
.setTitle(R.string.combat_log_title)
.setIcon(R.drawable.ui_icon_combat)
.setNegativeButton(R.string.dialog_close, null)

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
View File

@@ -37,7 +37,7 @@ public final class DisplayWorldMapActivity extends Activity {
setContentView(R.layout.displayworldmap);
displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
// displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
displayworldmap_webview.getSettings().setBuiltInZoomControls(true);
displayworldmap_webview.getSettings().setUseWideViewPort(true);
enableJavascript();

15
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
View File

@@ -4,6 +4,8 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTabHost;
import android.widget.ImageView;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Inventory;
@@ -49,6 +51,19 @@ public final class HeroinfoActivity extends FragmentActivity {
if (t != null && t.length() > 0) {
tabHost.setCurrentTabByTag(t);
}
updateIconForPlayer();
}
@Override
protected void onResume() {
super.onResume();
updateIconForPlayer();
}
private void updateIconForPlayer() {
ImageView iv = (ImageView) tabHost.getTabWidget().getChildTabViewAt(0).findViewById(android.R.id.icon);
world.tileManager.setImageViewTileForPlayer(getResources(), iv, world.model.player.iconID);
}
@Override

5
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
View File

@@ -11,10 +11,12 @@ import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.Button;
import android.widget.TextView;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.model.ModelContainer;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.savegames.Savegames;
import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
@@ -26,6 +28,7 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
private static final int SLOT_NUMBER_CREATE_NEW_SLOT = -1;
private static final int SLOT_NUMBER_FIRST_SLOT = 1;
private ModelContainer model;
private TileManager tileManager;
private AndorsTrailPreferences preferences;
@Override
@@ -36,6 +39,7 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
app.setWindowParameters(this);
this.model = app.getWorld().model;
this.preferences = app.getPreferences();
this.tileManager = app.getWorld().tileManager;
String loadsave = getIntent().getData().getLastPathSegment();
isLoading = (loadsave.equalsIgnoreCase("load"));
@@ -80,6 +84,7 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
b.setTag(slot);
b.setOnClickListener(this);
b.setText(slot + ". " + header.describe());
tileManager.setImageViewTileForPlayer(getResources(), b, header.iconID);
parent.addView(b, params);
}
}

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

@@ -7,6 +7,7 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.content.Intent;
import android.os.Bundle;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
@@ -231,7 +232,7 @@ public final class MainActivity
final int buttonId = ((QuickButton)v).getIndex();
final AlertDialog dialog = new AlertDialog.Builder(v.getContext()).create();
final AlertDialog dialog = new AlertDialog.Builder(new ContextThemeWrapper(v.getContext(), R.style.AndorsTrailStyle_Dialog)).create();
View view = getLayoutInflater().inflate(R.layout.quickbuttons_usable_inventory, null);
ListView lv = (ListView) view.findViewById(R.id.quickbuttons_assignlist);

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
View File

@@ -8,6 +8,7 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -188,7 +189,7 @@ public class StartScreenActivity_MainMenu extends Fragment {
}
private void comfirmNewGame() {
new AlertDialog.Builder(getActivity())
new AlertDialog.Builder(new ContextThemeWrapper(getActivity(), R.style.AndorsTrailStyle_Dialog))
.setTitle(R.string.startscreen_newgame)
.setMessage(R.string.startscreen_newgame_confirm)
.setIcon(android.R.drawable.ic_delete)

17
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
View File

@@ -66,6 +66,11 @@ public final class ResourceLoader {
loader.prepareTileID(R.drawable.ui_splatters1, i+8);
}
loader.prepareTileID(R.drawable.ui_icon_immunity, 0);
// Load effects
world.visualEffectTypes.initialize(loader);
if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
// ========================================================================
// Load preloaded tiles
loader.flush();
@@ -100,6 +105,12 @@ public final class ResourceLoader {
// }
// loader.prepareTileID(R.drawable.ui_icon_immunity, 0);
// // ========================================================================
// ========================================================================
//
// // Load effects
// world.visualEffectTypes.initialize(loader);
// if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
//
// // Load preloaded tiles
// loader.flush();
// world.tileManager.loadPreloadedTiles(r);
@@ -107,11 +118,7 @@ public final class ResourceLoader {
final TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
// ========================================================================
// Load effects
world.visualEffectTypes.initialize(loader);
if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
// ========================================================================
// Load skills
world.skills.initialize();

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
View File

@@ -42,6 +42,8 @@ public final class TileManager {
public static final int CHAR_HERO_2 = CHAR_HERO_1+1;
//Default hero
public static final int CHAR_HERO = CHAR_HERO_2;
//Max hero icon ID in this version.
public static final int LAST_HERO = CHAR_HERO_2;
public static final int iconID_selection_red = CHAR_HERO_2+1;
public static final int iconID_selection_yellow = iconID_selection_red+1;
@@ -69,6 +71,7 @@ public final class TileManager {
public static final int iconID_immunity_overlay = iconID_splatter_white_1b+1;
public int tileSize;
public float density;
public float uiIconScale;

24
AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
View File

@@ -48,8 +48,9 @@ public final class Savegames {
}
public static LoadSavegameResult loadWorld(WorldContext world, ControllerContext controllers, Context androidContext, int slot) {
try {
FileHeader fh = quickload(androidContext, slot);
FileInputStream fos = getInputFile(androidContext, slot);
LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos);
LoadSavegameResult result = loadWorld(androidContext.getResources(), world, controllers, fos, fh);
fos.close();
return result;
} catch (IOException e) {
@@ -102,9 +103,9 @@ public final class Savegames {
dest.close();
}
public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState) throws IOException {
public static LoadSavegameResult loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState, FileHeader fh) throws IOException {
DataInputStream src = new DataInputStream(inState);
final FileHeader header = new FileHeader(src);
final FileHeader header = new FileHeader(src, fh.skipIcon);
if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION) return LoadSavegameResult.savegameIsFromAFutureVersion;
world.maps.readFromParcel(src, world, controllers, header.fileversion);
@@ -131,7 +132,7 @@ public final class Savegames {
}
FileInputStream fos = getInputFile(androidContext, slot);
DataInputStream src = new DataInputStream(fos);
final FileHeader header = new FileHeader(src);
final FileHeader header = new FileHeader(src, false);
src.close();
fos.close();
return header;
@@ -167,6 +168,7 @@ public final class Savegames {
public final String playerName;
public final String displayInfo;
public final int iconID;
public boolean skipIcon = false;
public String describe() {
return playerName + ", " + displayInfo;
@@ -175,7 +177,7 @@ public final class Savegames {
// ====== PARCELABLE ===================================================================
public FileHeader(DataInputStream src) throws IOException {
public FileHeader(DataInputStream src, boolean skipIcon) throws IOException {
int fileversion = src.readInt();
if (fileversion == 11) fileversion = 5; // Fileversion 5 had no version identifier, but the first byte was 11.
this.fileversion = fileversion;
@@ -186,10 +188,16 @@ public final class Savegames {
this.playerName = null;
this.displayInfo = null;
}
if (fileversion >= 43) {
this.iconID = src.readInt();
if (fileversion >= 43 && !skipIcon) {
int id = src.readInt();
if (id > TileManager.LAST_HERO) {
this.iconID = TileManager.CHAR_HERO_0;
this.skipIcon = true;
} else {
this.iconID = id;
}
} else {
this.iconID = TileManager.CHAR_HERO;
this.iconID = TileManager.CHAR_HERO_0;
}
}

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ATDialog.java Normal file
View File

@@ -0,0 +1,16 @@
package com.gpl.rpg.AndorsTrail.view;
import com.gpl.rpg.AndorsTrail.R;
import android.app.Dialog;
import android.content.Context;
public class ATDialog extends Dialog {
public ATDialog(Context context) {
super(context, R.style.AndorsTrailStyle_Dialog);
}
}