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

More UI tweaks... getting there...

Browse Source
This commit is contained in:
Zukero
2017-11-04 00:17:11 +01:00
parent 3a8ad1395f
commit e87ea318ec
24 changed files with 756 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
AndorsTrail/res/drawable/ui_blue_lightframe.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 167 B

BIN
AndorsTrail/res/drawable/ui_blue_lightframe_gray.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 167 B

BIN
AndorsTrail/res/drawable/ui_blue_lightframe_gray_highlight.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 227 B

BIN
AndorsTrail/res/drawable/ui_blue_lightframe_highlight.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 227 B

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

@@ -1,106 +1,96 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<TextView
android:id="@+id/actorconditioninfo_title"
style="@style/titleWithIcon"
android:background="@drawable/ui_blue_richframe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/equip_weapon"
android:text="@string/actorinfo_currentconditions" />
<ScrollView
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"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
>
<TextView
android:id="@+id/actorconditioninfo_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_currentconditions"
style="@style/titleWithIcon"
android:drawableLeft="@drawable/equip_weapon"
/>
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:text="@string/actorconditioninfo_category"
android:id="@+id/actorconditioninfo_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
<TextView
android:text="@string/actorconditioninfo_constant_effect"
android:id="@+id/actorconditioninfo_constant_effect_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/actorconditioninfo_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
android:text="@string/actorconditioninfo_category" />
<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp"
/>
<TextView
android:id="@+id/actorconditioninfo_constant_effect_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorconditioninfo_constant_effect" />
<TextView
android:text="@string/actorconditioninfo_effect_every_round"
android:id="@+id/actorconditioninfo_everyround_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp" />
<LinearLayout
android:id="@+id/actorconditioninfo_everyround_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp"
android:orientation="vertical"
>
</LinearLayout>
<TextView
android:id="@+id/actorconditioninfo_everyround_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorconditioninfo_effect_every_round" />
<TextView
android:text="@string/actorconditioninfo_effect_every_full_round"
android:id="@+id/actorconditioninfo_everyfullround_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:id="@+id/actorconditioninfo_everyround_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp"
android:orientation="vertical" >
</LinearLayout>
<LinearLayout
android:id="@+id/actorconditioninfo_everyfullround_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp"
android:orientation="vertical"
>
</LinearLayout>
<TextView
android:id="@+id/actorconditioninfo_everyfullround_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorconditioninfo_effect_every_full_round" />
</LinearLayout>
</ScrollView>
<LinearLayout
android:id="@+id/actorconditioninfo_everyfullround_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp"
android:orientation="vertical" >
</LinearLayout>
</LinearLayout>
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@style/AndorsTrail_Blue_StdFrame"
>
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<Button
android:id="@+id/actorconditioninfo_close"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/dialog_close"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/actorconditioninfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_close" />
</LinearLayout>
</LinearLayout>

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

@@ -1,155 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical" >
<ScrollView
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"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
>
<TextView
android:id="@+id/bulkselection_itemname"
style="@style/titleWithIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/equip_weapon"
android:text="@string/inventory_info" />
<TextView
android:id="@+id/bulkselection_itemname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/inventory_info"
style="@style/titleWithIcon"
android:drawableLeft="@drawable/equip_weapon"
/>
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
android:gravity="center_horizontal"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
<TextView
android:text="@string/inventory_drop"
android:id="@+id/bulkselection_action_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal" >
<EditText
android:text="1"
android:inputType="number"
android:singleLine="true"
android:id="@+id/bulkselection_amount_taken"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
/>
<TextView
android:id="@+id/bulkselection_action_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/inventory_drop" />
<TextView
android:text="/"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
/>
<EditText
android:id="@+id/bulkselection_amount_taken"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="number"
android:singleLine="true"
android:text="1" />
<TextView
android:text="250"
android:id="@+id/bulkselection_amount_available"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="/" />
</LinearLayout>
<TextView
android:id="@+id/bulkselection_amount_available"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="250" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:text="-1"
android:id="@+id/bulkselection_decrement_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
/>
<Button
android:id="@+id/bulkselection_decrement_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="-1" />
<SeekBar
android:id="@+id/bulkselection_slider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
/>
<SeekBar
android:id="@+id/bulkselection_slider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1" />
<Button
android:text="+1"
android:id="@+id/bulkselection_increment_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
/>
<Button
android:id="@+id/bulkselection_increment_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="+1" />
<Button
android:text="@string/bulkselection_select_all"
android:id="@+id/bulkselection_select_all_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
/>
<Button
android:id="@+id/bulkselection_select_all_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/bulkselection_select_all" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/bulkselection_summary_totalgold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:text="@string/bulkselection_totalcost_buy" />
</LinearLayout>
</ScrollView>
<TextView
android:text="@string/bulkselection_totalcost_buy"
android:id="@+id/bulkselection_summary_totalgold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
/>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
</LinearLayout>
</ScrollView>
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/bulkselection_cancel_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/cancel" />
<Button
android:id="@+id/bulkselection_cancel_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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"
/>
<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>
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@@ -30,14 +30,16 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ui_blue_stdframe_gray"
android:orientation="vertical" >
android:background="@drawable/ui_blue_stdframe"
android:orientation="vertical"
android:layerType="software" >
<WebView
android:id="@+id/displayworldmap_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent" />
android:background="@android:color/transparent"
android:layerType="software" />
</LinearLayout>
</LinearLayout>

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

@@ -2,7 +2,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:orientation="vertical"
style="@style/AndorsTrail_Blue_StdFrame">
<LinearLayout
android:layout_width="match_parent"

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

@@ -3,7 +3,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:orientation="vertical" >
android:orientation="vertical"
style="@style/AndorsTrail_Blue_StdFrame" >
<ScrollView
android:layout_width="match_parent"

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

@@ -1,96 +1,93 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<ScrollView
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"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
>
<TextView
android:id="@+id/iteminfo_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/inventory_info"
style="@style/titleWithIcon"
android:drawableLeft="@drawable/equip_weapon"
/>
<TextView
android:id="@+id/iteminfo_title"
style="@style/titleWithIcon"
android:background="@drawable/ui_blue_richframe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/equip_weapon"
android:text="@string/inventory_info" />
<TextView
android:id="@+id/iteminfo_description"
android:textStyle="italic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
/>
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
<TextView
android:id="@+id/iteminfo_displaytype"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/section_margin"
>
<TextView
android:text="@string/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
<TextView
android:id="@+id/iteminfo_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
android:textStyle="italic" />
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/iteminfo_effects"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
</ScrollView>
<TextView
android:id="@+id/iteminfo_displaytype"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<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:layout_marginBottom="@dimen/section_margin"
android:gravity="center_vertical"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/iteminfo_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/iteminfo_action_use"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/iteminfo_category" />
<Button
android:id="@+id/iteminfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_close"
/>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/iteminfo_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/iteminfo_effects"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/iteminfo_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/iteminfo_action_use" />
<Button
android:id="@+id/iteminfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_close" />
</LinearLayout>
</LinearLayout>

129
AndorsTrail/res/layout/levelup.xml
View File

@@ -1,71 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dialog_margin"
android:background="@drawable/ui_blue_stdframe"
>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:padding="@dimen/dialog_margin" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<TextView
android:id="@+id/levelup_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/char_hero"
android:text="@string/levelup_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/levelup_title"
android:text="@string/levelup_title"
style="@style/titleWithIcon"
android:drawableLeft="@drawable/char_hero"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/levelup_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_description"
/>
<TextView
android:id="@+id/levelup_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:text="@string/levelup_description" />
<Button
android:id="@+id/levelup_add_health"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_health"
/>
<Button
android:id="@+id/levelup_add_attackchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackchance"
/>
<Button
android:id="@+id/levelup_add_attackdamage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackdamage"
/>
<Button
android:id="@+id/levelup_add_blockchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_blockchance"
/>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/levelup_adds_new_skillpoint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_adds_new_skillpoint"
style="@style/textWithIcon"
android:drawableLeft="@drawable/ui_icon_skill"
/>
<Button
android:id="@+id/levelup_add_health"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_health" />
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="1dp" android:background="@null" />
<Button
android:id="@+id/levelup_add_attackchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackchance" />
</LinearLayout>
<Button
android:id="@+id/levelup_add_attackdamage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackdamage" />
</ScrollView>
<Button
android:id="@+id/levelup_add_blockchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_blockchance" />
<TextView
android:id="@+id/levelup_adds_new_skillpoint"
style="@style/textWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ui_icon_skill"
android:text="@string/levelup_adds_new_skillpoint" />
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@null" />
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@@ -5,7 +5,6 @@
android:layout_height="wrap_content"
android:padding="@dimen/dialog_margin"
android:orientation="vertical"
android:background="@drawable/ui_blue_stdframe"
>
<TextView
@@ -16,7 +15,6 @@
style="@style/titleWithIcon"
android:gravity="center"
android:background="@drawable/ui_blue_richframe"
android:layout_marginBottom="5dp"
/>
<TextView
@@ -25,12 +23,13 @@
android:layout_height="wrap_content"
android:text="@string/loadsave_selectslot"
android:textColor="@color/ui_blue_textbutton_textcolor"
android:layout_marginBottom="5dp"
android:background="@drawable/ui_blue_stdframe"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout
android:id="@+id/loadsave_slot_list"
@@ -45,6 +44,17 @@
android:text="@android:string/unknownName"
android:layout_marginBottom="5dp"
/>
</LinearLayout>
</ScrollView>
<LinearLayout
android:id="@+id/loadsave_save_to_new_slot_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/loadsave_save_to_new_slot"
android:layout_width="match_parent"
@@ -52,7 +62,6 @@
android:text="@string/loadsave_save_to_new_slot"
/>
</LinearLayout>
</ScrollView>
</LinearLayout>

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

@@ -10,7 +10,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@drawable/ui_blue_stdframe"
/>
<com.gpl.rpg.AndorsTrail.view.QuickitemView

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

@@ -1,69 +1,67 @@
<?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="wrap_content"
android:orientation="vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/monsterencounter_title"
android:layout_width="match_parent"
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"
/>
<TextView
android:id="@+id/monsterencounter_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/equip_weapon"
android:gravity="center"
android:text="@string/dialog_monsterencounter_title" />
<TextView
android:id="@+id/monsterencounter_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_monsterencounter_message"
/>
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<TextView
android:id="@+id/monsterencounter_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_monsterencounter_message" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/monsterencounter_attack"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@android:string/yes"
/>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<Button
android:id="@+id/monsterencounter_info"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/dialog_monsterencounter_info"
/>
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<Button
android:id="@+id/monsterencounter_cancel"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@android:string/no"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<Button
android:id="@+id/monsterencounter_attack"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/yes" />
<Button
android:id="@+id/monsterencounter_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_monsterencounter_info" />
<Button
android:id="@+id/monsterencounter_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/no" />
</LinearLayout>
</LinearLayout>

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

@@ -1,110 +1,111 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<ScrollView
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"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
android:id="@+id/monsterinfo_container"
>
<TextView
android:id="@+id/monsterinfo_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/char_hero"
android:gravity="center"
android:text="@string/dialog_monsterencounter_info" />
<TextView
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" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
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="horizontal"
android:layout_marginBottom="@dimen/section_margin"
>
<TextView
android:text="@string/actorinfo_difficulty"
android:layout_marginRight="10sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/monsterinfo_difficulty"
android:text="@string/monster_difficulty_normal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/monsterinfo_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/monsterinfo_healthbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
android:orientation="horizontal" >
<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/traitsinfo_base_max_ap" />
<TextView android:id="@+id/monsterinfo_max_ap" />
</TableRow>
<include layout="@layout/traitsinfoview" />
</TableLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10sp"
android:text="@string/actorinfo_difficulty" />
<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/monsterinfo_difficulty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/monster_difficulty_normal" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/actorinfo_currentconditions"
android:id="@+id/actorinfo_currentconditions_title"
android:layout_marginTop="@dimen/section_margin"
/>
<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/monsterinfo_healthbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin" />
</LinearLayout>
</ScrollView>
<TableLayout
android:id="@+id/actorinfo_stats_table"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<TableRow>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/monsterinfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_close"
/>
</LinearLayout>
</LinearLayout>
<TextView
style="@style/traitsinfo_label"
android:text="@string/traitsinfo_base_max_ap" />
<TextView android:id="@+id/monsterinfo_max_ap" />
</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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/section_margin"
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" />
</LinearLayout>
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/monsterinfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_close" />
</LinearLayout>
</LinearLayout>

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

@@ -1,25 +1,34 @@
<?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:padding="@dimen/dialog_margin"
android:orientation="vertical"
style="@style/AndorsTrail_Blue_StdFrame"
>
<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" >
<Spinner
android:id="@+id/questlog_includecompleted"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:prompt="@string/questlog_includecompleted_prompt"
/>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<ExpandableListView
android:id="@+id/questlog_contents"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
/>
<Spinner
android:id="@+id/questlog_includecompleted"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:prompt="@string/questlog_includecompleted_prompt" />
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<ExpandableListView
android:id="@+id/questlog_contents"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
</LinearLayout>
</LinearLayout>

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

@@ -1,38 +1,33 @@
<?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="wrap_content"
android:orientation="vertical"
android:gravity="left"
android:background="@drawable/ui_blue_stdframe"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:orientation="vertical" >
<TextView
android:id="@+id/quickslot_assign_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/inventory_assign"
android:drawableLeft="@drawable/ui_icon_equipment"
android:paddingTop="3sp"
style="@style/titleWithIcon"
android:gravity="center"
android:background="@drawable/ui_blue_richframe"
/>
android:id="@+id/quickslot_assign_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/ui_icon_equipment"
android:gravity="center"
android:paddingTop="3sp"
android:text="@string/inventory_assign" />
<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"
/>
<ListView
android:id="@+id/quickbuttons_assignlist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:background="@drawable/ui_blue_stdframe"
android:text="@string/inventory_selectitem"
android:textColor="@color/ui_blue_textbutton_textcolor" />
<ListView
android:id="@+id/quickbuttons_assignlist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe" />
</LinearLayout>

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

@@ -1,86 +1,81 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<ScrollView
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"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin"
>
<TextView
android:id="@+id/skillinfo_title"
android:layout_width="match_parent"
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"
/>
<TextView
android:id="@+id/skillinfo_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/ui_icon_skill"
android:gravity="center"
android:text="@string/heroinfo_skill" />
<TextView
android:text="@string/skill_current_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:id="@+id/skillinfo_currentlevel"
android:layout_marginBottom="@dimen/section_margin"
/>
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
<TextView
android:text="@string/skill_longdescription_weapon_chance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/skillinfo_longdescription"
android:layout_marginBottom="@dimen/section_margin"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/dialog_margin" >
<TextView
android:text="@string/skill_prerequisite_other_skill"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/skillinfo_requirement"
android:layout_marginBottom="@dimen/section_margin"
/>
<TextView
android:id="@+id/skillinfo_currentlevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginBottom="@dimen/section_margin"
android:text="@string/skill_current_level" />
</LinearLayout>
<TextView
android:id="@+id/skillinfo_longdescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
android:text="@string/skill_longdescription_weapon_chance" />
</ScrollView>
<TextView
android:id="@+id/skillinfo_requirement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/section_margin"
android:text="@string/skill_prerequisite_other_skill" />
</LinearLayout>
</ScrollView>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@android:color/transparent"/>
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="@style/AndorsTrail_Blue_StdFrame"
>
<Button
android:id="@+id/skillinfoinfo_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/skillinfo_action_levelup"
/>
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<Button
android:id="@+id/skillinfoinfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_close"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/skillinfoinfo_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/skillinfo_action_levelup" />
<Button
android:id="@+id/skillinfoinfo_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_close" />
</LinearLayout>
</LinearLayout>

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

@@ -19,8 +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"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
layout="@layout/save_preview"
android:visibility="gone" />
@@ -28,8 +28,9 @@
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:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:gravity="bottom"
android:orientation="vertical" >

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

@@ -8,8 +8,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="@drawable/ui_blue_stdframe"
android:gravity="bottom|start"
android:orientation="vertical" >
@@ -61,8 +61,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="@drawable/ui_blue_stdframe"
android:gravity="bottom|start"
android:orientation="vertical" >
@@ -85,8 +85,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@drawable/ui_blue_stdframe"
android:gravity="center_vertical"
android:orientation="horizontal" >

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

@@ -1,51 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/AndorsTrail_Blue_StdFrame"
>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<ImageButton
android:id="@+id/status_image"
android:scaleType="fitCenter"
android:padding="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_margin="0sp"
/>
<RelativeLayout
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<ImageButton
android:id="@+id/toolbox_toggle"
android:scaleType="fitCenter"
android:padding="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="0sp"
/>
<ImageButton
android:id="@+id/status_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_margin="0sp"
android:padding="8dp"
android:scaleType="fitCenter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/status_image"
android:layout_toLeftOf="@id/toolbox_toggle"
android:orientation="vertical"
>
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/statusview_health"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/statusview_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
<ImageButton
android:id="@+id/toolbox_toggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="0sp"
android:padding="8dp"
android:scaleType="fitCenter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/toolbox_toggle"
android:layout_toRightOf="@id/status_image"
android:orientation="vertical" >
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/statusview_health"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/statusview_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>
</merge>

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

@@ -2,10 +2,12 @@ package com.gpl.rpg.AndorsTrail.activity;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.Toast;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -64,6 +66,7 @@ public final class DisplayWorldMapActivity extends Activity {
update();
}
@SuppressLint("NewApi")
private void update() {
File worldmap = WorldMapController.getCombinedWorldMapFile(worldMapSegmentName);
@@ -85,5 +88,19 @@ public final class DisplayWorldMapActivity extends Activity {
+ (world.model.player.position.y + map.worldPosition.y-1) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
L.log("Showing " + url);
displayworldmap_webview.loadUrl(url);
displayworldmap_webview.setBackgroundColor(getResources().getColor(android.R.color.transparent));
if (Build.VERSION.SDK_INT >= 11) displayworldmap_webview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
displayworldmap_webview.setWebViewClient(new WebViewClient()
{
@SuppressLint("NewApi")
@Override
public void onPageFinished(WebView view, String url)
{
displayworldmap_webview.setBackgroundColor(0x00000000);
if (Build.VERSION.SDK_INT >= 11) displayworldmap_webview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
}
});
}
}

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

@@ -57,20 +57,19 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
ViewGroup slotList = (ViewGroup) findViewById(R.id.loadsave_slot_list);
Button slotTemplateButton = (Button) findViewById(R.id.loadsave_slot_n);
Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
LayoutParams params = slotTemplateButton.getLayoutParams();
slotList.removeView(slotTemplateButton);
slotList.removeView(createNewSlot);
ViewGroup newSlotContainer = (ViewGroup) findViewById(R.id.loadsave_save_to_new_slot_container);
Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots());
if (!isLoading) {
Button b = new Button(this);
b.setLayoutParams(params);
b.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
b.setOnClickListener(this);
b.setText(R.string.loadsave_save_to_new_slot);
slotList.addView(b, params);
createNewSlot.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
createNewSlot.setOnClickListener(this);
} else {
newSlotContainer.setVisibility(View.GONE);
}
}

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

@@ -29,6 +29,7 @@ public final class ResourceLoader {
private static final int mapsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_maps_debug : R.array.loadresource_maps;
private static DynamicTileLoader loader;
private static TranslationLoader translationLoader;
private static long taskStart;
private static void timingCheckpoint(String loaderName) {
long now = System.currentTimeMillis();
@@ -71,52 +72,7 @@ public final class ResourceLoader {
world.visualEffectTypes.initialize(loader);
if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
// ========================================================================
// Load preloaded tiles
loader.flush();
world.tileManager.loadPreloadedTiles(r);
}
public static void loadResourcesAsync(WorldContext world, Resources r) {
long start = System.currentTimeMillis();
taskStart = start;
// final int mTileSize = world.tileManager.tileSize;
//
//
// DynamicTileLoader loader = new DynamicTileLoader(world.tileManager.tileCache);
// prepareTilesets(loader, mTileSize);
// if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("prepareTilesets");
//
// // ========================================================================
// // Load various ui icons
// /*TileManager.iconID_CHAR_HERO = */loader.prepareTileID(R.drawable.char_hero, 0);
// /*TileManager.iconID_selection_red = */loader.prepareTileID(R.drawable.ui_selections, 0);
// /*TileManager.iconID_selection_yellow = */loader.prepareTileID(R.drawable.ui_selections, 1);
// /*TileManager.iconID_groundbag = */loader.prepareTileID(R.drawable.ui_icon_equipment, 0);
// /*TileManager.iconID_boxopened = */loader.prepareTileID(R.drawable.ui_quickslots, 1);
// /*TileManager.iconID_boxclosed = */loader.prepareTileID(R.drawable.ui_quickslots, 0);
// /*TileManager.iconID_selection_blue = */loader.prepareTileID(R.drawable.ui_selections, 2);
// /*TileManager.iconID_selection_purple = */loader.prepareTileID(R.drawable.ui_selections, 3);
// /*TileManager.iconID_selection_green = */loader.prepareTileID(R.drawable.ui_selections, 4);
// for(int i = 0; i < 5; ++i) {
// loader.prepareTileID(R.drawable.ui_splatters1, i);
// 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();
// world.tileManager.loadPreloadedTiles(r);
final TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
translationLoader = new TranslationLoader(r.getAssets(), r);
// ========================================================================
@@ -144,6 +100,17 @@ public final class ResourceLoader {
conditionsToLoad.recycle();
if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ActorConditionsTypeParser");
// ========================================================================
// Load preloaded tiles
loader.flush();
world.tileManager.loadPreloadedTiles(r);
}
public static void loadResourcesAsync(WorldContext world, Resources r) {
long start = System.currentTimeMillis();
taskStart = start;
// ========================================================================
// Load items
final ItemTypeParser itemTypeParser = new ItemTypeParser(loader, world.actorConditionsTypes, world.itemCategories, translationLoader);