OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2025-12-26 16:07:57 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

WARNING: Does not run!

Browse Source 
Huge clean-up. Separation between themes and style. Preparatory work for
theme inheritance and alternative themes made by derivation.
Problem: due to a pre-lollipop bug, I still have to remove some color
indirections through attributes, as they are not preperly resolved.
This commit is contained in:
Zukero
2017-11-17 19:20:35 +01:00
parent f1867667aa
commit df81e96a08
48 changed files with 590 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AndorsTrail/AndroidManifest.xml
View File

@@ -30,7 +30,7 @@
android:icon="@drawable/icon"
android:description="@string/app_description"
android:allowBackup="true"
android:theme="@style/AndorsTrailStyle"
android:theme="@style/AndorsTrailTheme_Blue"
>
<activity
android:name=".activity.StartScreenActivity"
@@ -44,22 +44,22 @@
<activity
android:name=".activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/AndorsTrailStyle.NoBackground"
android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
/>
<activity android:name=".activity.HeroinfoActivity" />
<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ShopActivity" />
<activity android:name=".activity.AboutActivity" />
<activity android:name=".activity.LoadingActivity" />
<activity android:name=".activity.Preferences" />
<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailStyle.Dialog" />
<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.DisplayWorldMapActivity" />
</application>

8
AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml
View File

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

8
AndorsTrail/res/color/ui_theme_textbutton_textcolor.xml Normal file
View File

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

20
AndorsTrail/res/drawable/ui_blue_radiobutton.xml
View File

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

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

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AndorsTrail_Blue_TabFrame"
style="@style/AndorsTrail_Style_TabFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="left"
@@ -36,7 +36,7 @@
android:orientation="vertical" >
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
@@ -55,7 +55,7 @@
<Button
android:id="@+id/inventorylist_category_filters_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
@@ -65,7 +65,7 @@
<Button
android:id="@+id/inventorylist_sort_filters_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

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

@@ -7,14 +7,14 @@
<TextView
android:id="@+id/actorconditioninfo_title"
style="@style/titleWithIcon"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/equip_weapon"
android:text="@string/actorinfo_currentconditions" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@@ -81,7 +81,7 @@
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

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

@@ -11,12 +11,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:drawableLeft="@drawable/equip_weapon"
android:text="@string/inventory_info" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
@@ -115,7 +115,7 @@
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

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

@@ -12,7 +12,7 @@
<LinearLayout
android:id="@+id/combatview_actionbar"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
@@ -60,7 +60,7 @@
<TextView
android:id="@+id/combatview_monsterismoving"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/combatview_actionbar"
@@ -76,7 +76,7 @@
<RelativeLayout
android:id="@+id/combatview_monsterbar"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/combatview_actionbar"

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_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
>
<Button

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

@@ -5,4 +5,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:drawableRight="@drawable/ui_blue_radiobutton" />
android:drawableRight="?attr/ui_theme_radiobutton_drawable" />

18
AndorsTrail/res/layout/custom_dialog_title_icon.xml
View File

@@ -13,21 +13,21 @@
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:drawableLeft="@drawable/char_hero"
android:gravity="center_vertical" />
<LinearLayout
android:id="@+id/dialog_description_container"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" >
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp" >
<TextView
android:id="@+id/dialog_description"
@@ -42,7 +42,7 @@
<LinearLayout
android:id="@+id/dialog_content_container"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.8"
@@ -55,7 +55,7 @@
<LinearLayout
android:id="@+id/dialog_button_container"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
@@ -67,7 +67,7 @@
<Button
android:id="@+id/dialog_template_button"
style="@style/AndorsTrail_Blue_TextButton"
style="@style/AndorsTrail_Style_TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />

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

@@ -2,5 +2,5 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_listseparator" />
android:background="?attr/ui_theme_listseparator_drawable" />

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

@@ -3,5 +3,5 @@
style="@style/contextMenuText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableRight="@drawable/ui_blue_submenu_indicator" />
android:drawableRight="?attr/ui_theme_submenu_indicator_bitmap" />

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

@@ -7,7 +7,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="horizontal"
android:padding="@dimen/boxshape_margin" >
@@ -36,7 +36,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="vertical"
>

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

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AndorsTrail_Blue_TabFrame"
style="@style/AndorsTrail_Style_TabFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
@@ -32,7 +32,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:gravity="left"
android:orientation="vertical" >
@@ -49,7 +49,7 @@
<Button
android:id="@+id/inventorylist_category_filters_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
<Button
android:id="@+id/inventorylist_sort_filters_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"

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

@@ -3,12 +3,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
style="@style/AndorsTrail_Blue_TabFrame">
style="@style/AndorsTrail_Style_TabFrame">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="vertical">
<TextView
@@ -29,7 +29,7 @@
<Button
android:id="@+id/skillList_category_filters_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
<Button
android:id="@+id/skillList_sort_filters_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"

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

@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
style="@style/AndorsTrail_Blue_TabFrame" >
style="@style/AndorsTrail_Style_TabFrame" >
<ScrollView
android:layout_width="match_parent"
@@ -22,14 +22,14 @@
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:drawableLeft="@drawable/char_hero_large"
android:text="@android:string/unknownName" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe" >
android:background="?attr/ui_theme_stdframe_bitmap" >
<TableRow>
@@ -57,7 +57,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="vertical" >
<com.gpl.rpg.AndorsTrail.view.RangeBar
@@ -81,7 +81,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="vertical" >
<TextView
@@ -93,7 +93,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_blue_listseparator" />
android:background="?attr/ui_theme_listseparator_drawable" />
<TableLayout
android:id="@+id/actorinfo_stats_table"
@@ -156,7 +156,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_blue_listseparator" />
android:background="?attr/ui_theme_listseparator_drawable" />
<TableLayout
android:id="@+id/heroinfo_basestats_table"
@@ -212,7 +212,7 @@
android:id="@+id/actorinfo_currentconditions_title2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/ui_blue_listseparator" />
android:background="?attr/ui_theme_listseparator_drawable" />
<include layout="@layout/heroinfo_stats_gamestats" />
</LinearLayout>
@@ -223,7 +223,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="horizontal" >
<Button

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

@@ -7,14 +7,14 @@
<TextView
android:id="@+id/iteminfo_title"
style="@style/titleWithIcon"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/equip_weapon"
android:text="@string/inventory_info" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
@@ -70,7 +70,7 @@
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

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

@@ -10,7 +10,7 @@
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:drawableLeft="@drawable/char_hero"
android:text="@string/levelup_title" />
@@ -18,11 +18,11 @@
android:id="@+id/levelup_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:text="@string/levelup_description" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content" >

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

@@ -14,7 +14,7 @@
android:text="@string/loadsave_title_save"
style="@style/titleWithIcon"
android:gravity="center"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
/>
<TextView
@@ -22,15 +22,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/loadsave_selectslot"
android:textColor="@color/ui_blue_textbutton_textcolor"
android:background="@drawable/ui_blue_stdframe"
android:textColor="?attr/ui_theme_textbutton_textcolor_color"
android:background="?attr/ui_theme_stdframe_bitmap"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
>
<LinearLayout
android:id="@+id/loadsave_slot_list"
@@ -55,7 +55,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
>
<Button
android:id="@+id/loadsave_save_to_new_slot"

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

@@ -9,13 +9,13 @@
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:drawableLeft="@drawable/equip_weapon"
android:gravity="start"
android:text="@string/dialog_monsterencounter_title" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -36,7 +36,7 @@
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"

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

@@ -9,13 +9,13 @@
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:drawableLeft="@drawable/char_hero"
android:gravity="left"
android:text="@string/dialog_monsterencounter_info" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
@@ -96,7 +96,7 @@
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

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

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AndorsTrail_Blue_TabFrame"
style="@style/AndorsTrail_Style_TabFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
@@ -14,7 +14,7 @@
<Button
android:id="@+id/questlog_includecompleted_button"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
</LinearLayout>
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

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

@@ -5,28 +5,9 @@
android:gravity="left"
android:orientation="vertical" >
<!--
<TextView
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:text="@string/inventory_assign" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:text="@string/inventory_selectitem"
android:textColor="@color/ui_blue_textbutton_textcolor" />
-->
<ListView
android:id="@+id/quickbuttons_assignlist"
style="@style/AndorsTrail_Blue_List_Frameless"
style="@style/AndorsTrail_Style_ListView_Frameless"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

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

@@ -19,7 +19,7 @@
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
android:textColor="@color/ui_blue_palette_text_gray_mid"
android:textColor="?attr/ui_theme_palette_text_gray_mid_color"
android:shadowColor="#000"
android:ellipsize="marquee"
android:singleLine="true"
@@ -47,7 +47,7 @@
android:paddingLeft="35sp"
android:textSize="@dimen/statusbar_text"
android:layout_centerInParent="true"
android:textColor="@color/ui_blue_palette_text_gray_light"
android:textColor="?attr/ui_theme_palette_text_gray_light_color"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"

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

@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/ui_blue_stdframe"
android:background="?attr/ui_theme_stdframe_bitmap"
android:gravity="top|start"
>

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

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/AndorsTrail_Blue_TabFrame"
style="@style/AndorsTrail_Style_TabFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="left"
android:orientation="vertical" >
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
@@ -27,7 +27,7 @@
<Button
android:id="@+id/shoplist_sort_filters"
style="@style/AndorsTrail_Blue_SpinnerEmulator"
style="@style/AndorsTrail_Style_SpinnerEmulator"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
@@ -39,7 +39,7 @@
<ListView
android:id="@+id/shop_list"
style="@style/AndorsTrail_Blue_List_Frameless"
style="@style/AndorsTrail_Style_ListView_Frameless"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

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

@@ -9,13 +9,13 @@
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:background="?attr/ui_theme_richframe_bitmap"
android:drawableLeft="@drawable/ui_icon_skill"
android:gravity="start"
android:text="@string/heroinfo_skill" />
<ScrollView
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >
@@ -58,7 +58,7 @@
android:background="@android:color/transparent" />
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

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

@@ -25,20 +25,20 @@
android:visibility="gone" />
<LinearLayout
android:background="@drawable/ui_blue_stdframe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="?attr/ui_theme_stdframe_bitmap"
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:layout_marginTop="5dp"
android:gravity="center_vertical"
android:orientation="horizontal" >
@@ -46,6 +46,8 @@
android:id="@+id/startscreen_newgame"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_weight="1"
android:text="@string/startscreen_newgame" />
@@ -53,6 +55,8 @@
android:id="@+id/startscreen_load"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_weight="1"
android:text="@string/startscreen_load" />
</LinearLayout>
@@ -68,6 +72,8 @@
android:id="@+id/startscreen_preferences"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_weight="1"
android:text="@string/menu_settings" />
@@ -75,6 +81,8 @@
android:id="@+id/startscreen_about"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_weight="1"
android:text="@string/startscreen_about" />
</LinearLayout>

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

@@ -7,10 +7,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="@drawable/ui_blue_stdframe"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="?attr/ui_theme_stdframe_bitmap"
android:gravity="bottom|start"
android:orientation="vertical" >
@@ -19,51 +19,49 @@
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/startscreen_selectherosprite" />
<RadioGroup
<RadioGroup
android:id="@+id/newgame_spritegroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ToggleButton
android:orientation="horizontal" >
<ToggleButton
android:id="@+id/newgame_sprite0"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text=""
android:textSize="0dp"
android:layout_weight="1"
android:checked="true"
android:drawableTop="@drawable/char_hero_large"
android:checked="true"/>
<ToggleButton
android:text=""
android:textSize="0dp" />
<ToggleButton
android:id="@+id/newgame_sprite1"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/char_hero_maksiu_girl_01_large"
android:text=""
android:textSize="0dp"
android:drawableTop="@drawable/char_hero_maksiu_girl_01_large"/>
<ToggleButton
android:textSize="0dp" />
<ToggleButton
android:id="@+id/newgame_sprite2"
android:layout_width="match_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/char_hero_maksiu_boy_01_large"
android:text=""
android:textSize="0dp"
android:drawableTop="@drawable/char_hero_maksiu_boy_01_large"/>
</RadioGroup>
android:textSize="0dp" />
</RadioGroup>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="@drawable/ui_blue_stdframe"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="?attr/ui_theme_stdframe_bitmap"
android:gravity="bottom|start"
android:orientation="vertical" >
@@ -79,16 +77,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@drawable/ui_blue_stdframe"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:background="?attr/ui_theme_stdframe_bitmap"
android:gravity="center_vertical"
android:orientation="horizontal" >
@@ -96,18 +93,22 @@
android:id="@+id/startscreen_newgame_cancel"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
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_marginBottom="5dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:text="@string/startscreen_newgame_start" />
</LinearLayout>

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

@@ -4,7 +4,7 @@
android:layout_height="wrap_content" >
<RelativeLayout
style="@style/AndorsTrail_Blue_StdFrame"
style="@style/AndorsTrail_Style_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content" >

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

@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_weight="0"
android:visibility="gone"
android:background="@drawable/ui_blue_tabwidget"
android:background="?attr/ui_theme_tabwidget_drawable"
/>
<FrameLayout

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

@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/ui_blue_tabwidget"
android:background="?attr/ui_theme_tabwidget_drawable"
>
<ImageView
@@ -20,6 +20,6 @@
android:ellipsize="marquee"
android:singleLine="true"
android:scrollHorizontally="true"
android:textColor="@color/ui_blue_textbutton_textcolor"/>
android:textColor="?attr/ui_theme_textbutton_textcolor_color"/>
</LinearLayout>

2
AndorsTrail/res/values-v10/ui_listviewstyle.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ConversationListView" parent="@style/AndorsTrail_Blue_List">
<style name="ConversationListView" parent="@style/AndorsTrail_Style_ListView">
<!-- See http://community.developer.motorola.com/t5/MOTODEV-Blog/Why-Does-My-ListView-Look-Different/ba-p/17462 -->
<item name="android:listSelector">@null</item>
<item name="android:overScrollFooter">@null</item>

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

@@ -1,61 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AndorsTrailStyle" parent="android:Theme">
<item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
<item name="android:buttonStyleToggle">@style/AndorsTrail_Blue_ToggleButton</item>
<item name="android:imageButtonStyle">@style/AndorsTrail_Blue_ImageButton</item>
<item name="android:buttonBarStyle">@style/AndorsTrail_Blue_StdFrame</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:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Blue_PreferencesListHeader</item>
</style>
<style name="AndorsTrailStyle.Dialog" parent="android:Theme.Dialog">
<item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
<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">@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:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Blue_PreferencesListHeader</item>
</style>
<style name="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">
<item name="android:background">@drawable/ui_blue_textbutton</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:paddingTop">10dp</item>
<item name="android:paddingBottom">10dp</item>
<item name="android:paddingLeft">5dp</item>
<item name="android:paddingRight">5dp</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
<style name="AndorsTrail_Style_TextButton" parent="AndorsTrail_Style_TextButton_Base">
<item name="android:textAllCaps">false</item>
</style>
<style name="AndorsTrail_Blue_PreferencesListHeader">
<item name="android:background">@drawable/ui_blue_lightframe</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<style name="AndorsTrail_Style_PreferencesListHeader" parent="AndorsTrail_Style_PreferencesListHeader_Base">
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_marginRight">5dp</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/ui_blue_palette_text_gray_mid</item>
<item name="android:textSize">16sp</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:gravity">center_vertical</item>
</style>

13
AndorsTrail/res/values-v14/ui_theme.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AndorsTrailTheme_Blue" parent="AndorsTrailStyle_Base">
<item name="android:buttonBarStyle">@style/AndorsTrail_Style_StdFrame</item>
<item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Blue</item>
</style>
<style name="AndorsTrailDialogTheme_Blue" parent="AndorsTrailDialogTheme_Base">
<item name="android:buttonBarButtonStyle">@style/AndorsTrail_Style_TextButton</item>
<item name="android:buttonBarStyle">@style/AndorsTrail_Style_StdFrame</item>
<item name="android:dialogTheme">@style/AndorsTrailDialogTheme_Blue</item>
</style>
</resources>

2
AndorsTrail/res/values-v17/ui_styles.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AndorsTrail_Blue_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
<style name="AndorsTrail_Style_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
<item name="android:button">@drawable/ui_blue_radiobutton</item>
<item name="android:paddingStart">10dp</item>
</style>

14
AndorsTrail/res/values/attrs.xml
View File

@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- <declare-stylable name="ui_blue_buttonbar_frame"> -->
<attr name="single" format="boolean" />
<attr name="vertical" format="boolean" />
<attr name="horizontal" format="boolean" />
<attr name="first" format="boolean" />
<attr name="last" format="boolean" />
<attr name="reverse" format="boolean" />
<!-- </declare-stylable> -->
<attr name="single" format="boolean" />
<attr name="vertical" format="boolean" />
<attr name="horizontal" format="boolean" />
<attr name="first" format="boolean" />
<attr name="last" format="boolean" />
<attr name="reverse" format="boolean" />
</resources>

47
AndorsTrail/res/values/ui_colors.xml
View File

@@ -1,47 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- PALETTE -->
<!-- Backgrounds -->
<color name="ui_blue_palette_blue_dark">#122438</color>
<color name="ui_blue_palette_blue_mid">#2e4464</color>
<color name="ui_blue_palette_blue_light">#4a6390</color>
<!-- Highlights -->
<color name="ui_blue_palette_highlight_gray_dark">#5e5e5e</color>
<color name="ui_blue_palette_highlight_gray_mid">#8c8c8c</color>
<color name="ui_blue_palette_highlight_gray_light">#b9b9b9</color>
<!-- Text grays -->
<color name="ui_blue_palette_text_gray_darker">#b0b0b0</color>
<color name="ui_blue_palette_text_gray_dark">#dadada</color>
<color name="ui_blue_palette_text_gray_mid">#ededed</color>
<color name="ui_blue_palette_text_gray_light">#fcfcfc</color>
<!-- Bright high-contrasts accents & player name in convo -->
<color name="ui_blue_palette_orange_dark">#c98e00</color>
<color name="ui_blue_palette_orange_light">#ffb400</color>
<!-- Washy accents & NPC name in convo -->
<color name="ui_blue_palette_mustard_dark">#a2a21d</color>
<color name="ui_blue_palette_mustard_light">#bbbb22</color>
<!-- Bright low-contrast accents & rewards in convo -->
<color name="ui_blue_palette_cyan_dark">#1e8f9c</color>
<color name="ui_blue_palette_cyan_light">#5ee3f1</color>
<!-- ALIASES -->
<color name="displayworldmap_background">@color/ui_blue_palette_blue_dark</color>
<color name="ui_blue_stdframe_bg">@color/ui_blue_palette_blue_dark</color>
<color name="ui_theme_stdframe_bg">?attr/ui_theme_palette_blue_dark_color</color>
<color name="ui_theme_buttonbar_bg">?attr/ui_theme_palette_blue_mid_color</color>
<color name="displayworldmap_background">@color/ui_theme_stdframe_bg</color>
<!-- Player name in convo -->
<color name="ui_blue_playername_dark">@color/ui_blue_palette_orange_dark</color>
<color name="ui_blue_playername_light">@color/ui_blue_palette_orange_light</color>
<color name="ui_theme_playername_dark">?attr/ui_theme_palette_orange_dark_color</color>
<color name="ui_theme_playername_light">?attr/ui_theme_palette_orange_light_color</color>
<!-- NPC name in convo -->
<color name="ui_blue_npcname_dark">@color/ui_blue_palette_mustard_dark</color>
<color name="ui_blue_npcname_light">@color/ui_blue_palette_mustard_light</color>
<color name="ui_theme_npcname_dark">?attr/ui_theme_palette_mustard_dark_color</color>
<color name="ui_theme_npcname_light">?attr/ui_theme_palette_mustard_light_color</color>
<!-- Rewards in convo -->
<color name="ui_blue_reward_dark">@color/ui_blue_palette_cyan_dark</color>
<color name="ui_blue_reward_light">@color/ui_blue_palette_cyan_light</color>
<color name="ui_theme_reward_dark">?attr/ui_theme_palette_cyan_dark_color</color>
<color name="ui_theme_reward_light">?attr/ui_theme_palette_cyan_light_color</color>
<!-- Actual dialogue text in convo -->
<color name="ui_blue_dialogue_dark">@color/ui_blue_palette_text_gray_mid</color>
<color name="ui_blue_dialogue_light">@color/ui_blue_palette_text_gray_light</color>
<color name="ui_theme_dialogue_dark">?attr/ui_theme_palette_text_gray_mid_color</color>
<color name="ui_theme_dialogue_light">?attr/ui_theme_palette_text_gray_light_color</color>
</resources>

2
AndorsTrail/res/values/ui_listviewstyle.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ConversationListView" parent="@style/AndorsTrail_Blue_List">
<style name="ConversationListView" parent="@style/AndorsTrail_Style_ListView">
<!-- Not used here. Overridden in values-v10/ -->
</style>
</resources>

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

@@ -1,183 +1,156 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AndorsTrailStyle" parent="android:Theme">
<item name="android:buttonStyle">@style/AndorsTrail_Blue_TextButton</item>
<item name="android:buttonStyleToggle">@style/AndorsTrail_Blue_ToggleButton</item>
<item name="android:imageButtonStyle">@style/AndorsTrail_Blue_ImageButton</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:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Blue_PreferencesListHeader</item>
<style name="AndorsTrail_Style_ListView" parent="android:style/Widget.ListView">
<item name="android:background">?attr/ui_theme_stdframe_bitmap</item>
<item name="android:divider">?attr/ui_theme_listseparator_drawable</item>
</style>
<style name="AndorsTrailStyle.NoBackground" parent="AndorsTrailStyle">
<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">@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:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Blue_PreferencesListHeader</item>
</style>
<style name="AndorsTrail_Blue_List" parent="android:style/Widget.ListView">
<item name="android:background">@drawable/ui_blue_stdframe</item>
<item name="android:divider">@drawable/ui_blue_listseparator</item>
<!-- <item name="android:dividerHeight">1dp</item> -->
</style>
<style name="AndorsTrail_Blue_List_Frameless" parent="android:style/Widget.ListView">
<style name="AndorsTrail_Style_ListView_Frameless" parent="android:style/Widget.ListView">
<item name="android:background">@android:color/transparent</item>
<item name="android:divider">@drawable/ui_blue_listseparator</item>
<!-- <item name="android:dividerHeight">1dp</item> -->
<item name="android:divider">?attr/ui_theme_listseparator_drawable</item>
</style>
<style name="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">
<item name="android:background">@drawable/ui_blue_textbutton</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<style name="AndorsTrail_Style_TextButton_Base" parent="android:style/Widget.Button">
<item name="android:background">?attr/ui_theme_textbutton_drawable</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:paddingTop">10dp</item>
<item name="android:paddingBottom">10dp</item>
<item name="android:paddingLeft">5dp</item>
<item name="android:paddingRight">5dp</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
</style>
<style name="AndorsTrail_Blue_ImageButton" parent="android:style/Widget.ImageButton">
<item name="android:background">@drawable/ui_blue_textbutton</item>
</style>
<style name="AndorsTrail_Blue_ToggleButton" parent="android:style/Widget.Button.Toggle">
<item name="android:background">@drawable/ui_blue_togglebutton</item>
<item name="android:textOn">@null</item>
<item name="android:textOff">@null</item>
</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">22dp</item>
</style>
<style name="AndorsTrail_Blue_Checkbox" parent="android:style/Widget.CompoundButton.CheckBox">
<item name="android:button">@drawable/ui_blue_radiobutton</item>
</style>
<style name="AndorsTrail_Blue_SpinnerEmulator" parent="android:style/Widget.Button">
<item name="android:background">@drawable/ui_blue_spinner</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
</style>
<style name="AndorsTrail_Blue_ExpandableListView" parent="android:style/Widget.ExpandableListView">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textAppearanceLarge">@style/AndorsTrail_Blue_TextAppearance.ListItemTitle</item>
<item name="android:textAppearanceSmall">@style/AndorsTrail_Blue_TextAppearance.ListItemSubtitle</item>
<item name="android:groupIndicator">@drawable/ui_blue_groupindicator</item>
<item name="android:divider">@drawable/ui_blue_listseparator</item>
<item name="android:childDivider">@drawable/ui_blue_listseparator</item>
</style>
<style name="AndorsTrail_Blue_PreferencesListHeader">
<item name="android:background">@drawable/ui_blue_lightframe</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/ui_blue_palette_text_gray_mid</item>
<item name="android:textSize">16sp</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
</style>
<style name="AndorsTrail_Blue_TextAppearance.ListItemTitle" parent="android:style/TextAppearance.Large.Inverse">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textSize">22sp</item>
</style>
<style name="AndorsTrail_Blue_TextAppearance.ListItemSubtitle" parent="android:style/TextAppearance.Small">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textSize">14sp</item>
</style>
<style name="AndorsTrail_Blue_RichFrame">
<item name="android:background">@drawable/ui_blue_richframe</item>
</style>
<style name="AndorsTrail_Blue_StdFrame">
<item name="android:background">@drawable/ui_blue_stdframe</item>
</style>
<style name="AndorsTrail_Blue_TabFrame">
<item name="android:background">@drawable/ui_blue_tabframe</item>
</style>
<style name="AndorsTrail_Blue_LightFrame">
<item name="android:background">@drawable/ui_blue_lightframe</item>
</style>
<style name="textView" parent="android:Widget.TextView">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
</style>
<style name="autoScrollingText" parent="android:Widget.TextView">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
</style>
<style name="AndorsTrail_Style_TextButton" parent="AndorsTrail_Style_TextButton_Base" />
<style name="AndorsTrail_Style_ImageButton" parent="android:style/Widget.ImageButton">
<item name="android:background">?attr/ui_theme_textbutton_drawable</item>
</style>
<style name="AndorsTrail_Style_ToggleButton" parent="android:style/Widget.Button.Toggle">
<item name="android:background">?attr/ui_theme_togglebutton_drawable</item>
<item name="android:textOn">@null</item>
<item name="android:textOff">@null</item>
</style>
<style name="AndorsTrail_Style_RadioButton" parent="android:style/Widget.CompoundButton.RadioButton">
<item name="android:button">?attr/ui_theme_radiobutton_drawable</item>
<item name="android:paddingLeft">22dp</item>
</style>
<style name="AndorsTrail_Style_Checkbox" parent="android:style/Widget.CompoundButton.CheckBox">
<item name="android:button">?attr/ui_theme_radiobutton_drawable</item>
</style>
<style name="AndorsTrail_Style_SpinnerEmulator" parent="android:style/Widget.Button">
<item name="android:background">?attr/ui_theme_spinner_drawable</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
</style>
<style name="AndorsTrail_Style_ExpandableListView" parent="android:style/Widget.ExpandableListView">
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:textAppearanceLarge">@style/AndorsTrail_Style_TextAppearance_ListItemTitle</item>
<item name="android:textAppearanceSmall">@style/AndorsTrail_Style_TextAppearance.ListItemSubtitle</item>
<item name="android:groupIndicator">?attr/ui_theme_groupindicator_drawable</item>
<item name="android:divider">?attr/ui_theme_listseparator_drawable</item>
<item name="android:childDivider">?attr/ui_theme_listseparator_drawable</item>
</style>
<style name="AndorsTrail_Style_PreferencesListHeader_Base">
<item name="android:background">?attr/ui_theme_lightframe_bitmap</item>
<item name="android:paddingLeft">10dp</item>
<item name="android:paddingRight">10dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">?attr/ui_theme_palette_text_gray_mid_color</item>
<item name="android:textSize">16sp</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
</style>
<style name="AndorsTrail_Style_PreferencesListHeader" parent="AndorsTrail_Style_PreferencesListHeader_Base" />
<style name="AndorsTrail_Style_TextAppearance_ListItemTitle" parent="android:style/TextAppearance.Large.Inverse">
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:textSize">22sp</item>
</style>
<style name="AndorsTrail_Style_TextAppearance.ListItemSubtitle" parent="android:style/TextAppearance.Small">
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:textSize">14sp</item>
</style>
<style name="AndorsTrail_Style_RichFrame">
<item name="android:background">?attr/ui_theme_richframe_bitmap</item>
</style>
<style name="AndorsTrail_Style_StdFrame">
<item name="android:background">?attr/ui_theme_stdframe_bitmap</item>
</style>
<style name="AndorsTrail_Style_LightFrame">
<item name="android:background">?attr/ui_theme_lightframe_bitmap</item>
</style>
<style name="AndorsTrail_Style_TabFrame">
<item name="android:background">?attr/ui_theme_tabframe_bitmap</item>
</style>
<style name="textView" parent="android:Widget.TextView">
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
</style>
<style name="autoScrollingText" parent="android:Widget.TextView">
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:ellipsize">marquee</item>
<item name="android:singleLine">true</item>
<item name="android:scrollHorizontally">true</item>
</style>
<style name="textWithIcon" parent="android:Widget.TextView">
<item name="android:drawablePadding">@dimen/dialog_iconpadding_right</item>
<item name="android:gravity">center_vertical</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
</style>
<style name="textWithIconInList" parent="android:Widget.TextView">
<item name="android:drawablePadding">@dimen/dialog_iconpadding_right</item>
<item name="android:gravity">center_vertical</item>
<!-- <item name="android:background">@drawable/ui_blue_spinner_list_bg</item> -->
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
</style>
<style name="contextMenuText" parent="android:Widget.TextView">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:textSize">@dimen/titletext</item>
</style>
<style name="titleWithIcon" parent="@style/textWithIcon">
<item name="android:textSize">@dimen/titletext</item>
<item name="android:paddingBottom">@dimen/dialog_iconpadding_bottom</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
</style>
<style name="checkedListItem" parent="android:style/Widget.TextView">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
<item name="android:textSize">@dimen/titletext</item>
</style>
<style name="statsBoxStyle" parent="android:Widget.TextView">
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:background">?attr/ui_theme_richframe_bitmap</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>
<item name="android:padding">@dimen/boxshape_margin</item>
<item name="android:textSize">@dimen/smalltext</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textColor">?attr/ui_theme_textbutton_textcolor_color</item>
</style>
<style name="quickButton" parent="@style/AndorsTrail_Blue_TextButton">
<style name="quickButton" parent="@style/AndorsTrail_Style_TextButton">
<item name="android:longClickable">true</item>
<item name="android:textSize">@dimen/actionbar_text</item>
<item name="android:layout_width">wrap_content</item>
@@ -187,12 +160,12 @@
<item name="android:padding">5dp</item>
</style>
<style name="toolboxButtonTile" parent="@style/AndorsTrail_Blue_TextButton">
<style name="toolboxButtonTile" parent="@style/AndorsTrail_Style_TextButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
<style name="toolboxButtonDrawable" parent="@style/AndorsTrail_Blue_TextButton">
<style name="toolboxButtonDrawable" parent="@style/AndorsTrail_Style_TextButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:padding">0dp</item>

202
AndorsTrail/res/values/ui_theme.xml Normal file
View File

@@ -0,0 +1,202 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AndorsTrailStyle_Base" parent="android:Theme">
<item name="android:buttonStyle">@style/AndorsTrail_Style_TextButton</item>
<item name="android:buttonStyleToggle">@style/AndorsTrail_Style_ToggleButton</item>
<item name="android:imageButtonStyle">@style/AndorsTrail_Style_ImageButton</item>
<item name="android:checkboxStyle">@style/AndorsTrail_Style_Checkbox</item>
<item name="android:radioButtonStyle">@style/AndorsTrail_Style_RadioButton</item>
<item name="android:listViewStyle">@style/AndorsTrail_Style_ListView</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Style_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Style_PreferencesListHeader</item>
<!-- XML drawables -->
<item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_blue_buttonbar_bg</item>
<item name="ui_theme_buttonbar_drawable">@drawable/ui_blue_buttonbar</item>
<item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_blue_buttonbar_frame</item>
<item name="ui_theme_groupindicator_drawable">@drawable/ui_blue_groupindicator</item>
<item name="ui_theme_listseparator_drawable">@drawable/ui_blue_listseparator</item>
<item name="ui_theme_radiobutton_drawable">@drawable/ui_blue_radiobutton</item>
<item name="ui_theme_spinner_drawable">@drawable/ui_blue_spinner</item>
<item name="ui_theme_spinner_bg_drawable">@drawable/ui_blue_spinner_bg</item>
<item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_blue_spinner_list_bg</item>
<item name="ui_theme_tabwidget_drawable">@drawable/ui_blue_tabwidget</item>
<item name="ui_theme_textbutton_drawable">@drawable/ui_blue_textbutton</item>
<item name="ui_theme_togglebutton_drawable">@drawable/ui_blue_togglebutton</item>
<!-- Bitmaps -->
<item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_pressed</item>
<item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_unpressed</item>
<item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_pressed</item>
<item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_unpressed</item>
<item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_blue_buttonbar_frame_hleft</item>
<item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_blue_buttonbar_frame_hmid</item>
<item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_blue_buttonbar_frame_hright</item>
<item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_blue_buttonbar_frame_solo</item>
<item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_blue_buttonbar_frame_vbottom</item>
<item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_blue_buttonbar_frame_vmid</item>
<item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_blue_buttonbar_frame_vtop</item>
<item name="ui_theme_lightframe_bitmap">@drawable/ui_blue_lightframe</item>
<item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_blue_lightframe_highlight</item>
<item name="ui_theme_listseparator_img_bitmap">@drawable/ui_blue_listseparator_img</item>
<item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_blue_radiobutton_disabled_checked</item>
<item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_disabled_unchecked</item>
<item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_blue_radiobutton_enabled_checked</item>
<item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_enabled_unchecked</item>
<item name="ui_theme_richframe_bitmap">@drawable/ui_blue_richframe</item>
<item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_blue_spinner_arrow</item>
<item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_blue_spinner_disabled_pressed</item>
<item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_blue_spinner_disabled_unpressed</item>
<item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_blue_spinner_enabled_pressed</item>
<item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_blue_spinner_enabled_unpressed</item>
<item name="ui_theme_stdframe_bitmap">@drawable/ui_blue_stdframe</item>
<item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_blue_submenu_indicator</item>
<item name="ui_theme_tabframe_bitmap">@drawable/ui_blue_tabframe</item>
<item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_blue_tabwidget_disabled_selected</item>
<item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_blue_tabwidget_disabled_unselected</item>
<item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_blue_tabwidget_enabled_selected</item>
<item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_blue_tabwidget_enabled_unselected</item>
<item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_blue_textbutton_disabled_pressed</item>
<item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_blue_textbutton_disabled_unpressed</item>
<item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_blue_textbutton_enabled_pressed</item>
<item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_blue_textbutton_enabled_unpressed</item>
<!-- Color palette -->
<item name="ui_theme_dialogue_dark_color">@color/ui_theme_dialogue_dark</item>
<item name="ui_theme_dialogue_light_color">@color/ui_theme_dialogue_light</item>
<item name="ui_theme_npcname_dark_color">@color/ui_theme_npcname_dark</item>
<item name="ui_theme_palette_blue_dark_color">@color/ui_blue_palette_blue_dark</item>
<item name="ui_theme_palette_blue_mid_color">@color/ui_blue_palette_blue_mid</item>
<item name="ui_theme_palette_cyan_dark_color">@color/ui_blue_palette_cyan_dark</item>
<item name="ui_theme_palette_cyan_light_color">@color/ui_blue_palette_cyan_light</item>
<item name="ui_theme_palette_mustard_dark_color">@color/ui_blue_palette_mustard_dark</item>
<item name="ui_theme_palette_mustard_light_color">@color/ui_blue_palette_mustard_light</item>
<item name="ui_theme_palette_orange_dark_color">@color/ui_blue_palette_orange_dark</item>
<item name="ui_theme_palette_orange_light_color">@color/ui_blue_palette_orange_light</item>
<item name="ui_theme_palette_text_gray_darker_color">@color/ui_blue_palette_text_gray_darker</item>
<item name="ui_theme_palette_text_gray_light_color">@color/ui_blue_palette_text_gray_light</item>
<item name="ui_theme_palette_text_gray_mid_color">@color/ui_blue_palette_text_gray_mid</item>
<item name="ui_theme_playername_light_color">@color/ui_theme_playername_light</item>
<item name="ui_theme_reward_light_color">@color/ui_theme_reward_light</item>
<item name="ui_theme_stdframe_bg_color">@color/ui_theme_stdframe_bg</item>
<item name="ui_theme_textbutton_textcolor_color">@color/ui_theme_textbutton_textcolor</item>
</style>
<style name="AndorsTrailDialogTheme_Base" parent="android:Theme.Dialog">
<item name="android:buttonStyle">@style/AndorsTrail_Style_TextButton</item>
<item name="android:imageButtonStyle">@style/AndorsTrail_Style_ImageButton</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_Style_Checkbox</item>
<item name="android:radioButtonStyle">@style/AndorsTrail_Style_RadioButton</item>
<item name="android:listViewStyle">@style/AndorsTrail_Style_ListView</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Style_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Style_PreferencesListHeader</item>
<!-- XML drawables -->
<item name="ui_theme_buttonbar_bg_drawable">@drawable/ui_blue_buttonbar_bg</item>
<item name="ui_theme_buttonbar_drawable">@drawable/ui_blue_buttonbar</item>
<item name="ui_theme_buttonbar_frame_drawable">@drawable/ui_blue_buttonbar_frame</item>
<item name="ui_theme_groupindicator_drawable">@drawable/ui_blue_groupindicator</item>
<item name="ui_theme_listseparator_drawable">@drawable/ui_blue_listseparator</item>
<item name="ui_theme_radiobutton_drawable">@drawable/ui_blue_radiobutton</item>
<item name="ui_theme_spinner_drawable">@drawable/ui_blue_spinner</item>
<item name="ui_theme_spinner_bg_drawable">@drawable/ui_blue_spinner_bg</item>
<item name="ui_theme_spinner_list_bg_drawable">@drawable/ui_blue_spinner_list_bg</item>
<item name="ui_theme_tabwidget_drawable">@drawable/ui_blue_tabwidget</item>
<item name="ui_theme_textbutton_drawable">@drawable/ui_blue_textbutton</item>
<item name="ui_theme_togglebutton_drawable">@drawable/ui_blue_togglebutton</item>
<!-- Bitmaps -->
<item name="ui_theme_buttonbar_bg_disabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_pressed</item>
<item name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_disabled_unpressed</item>
<item name="ui_theme_buttonbar_bg_enabled_pressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_pressed</item>
<item name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap">@drawable/ui_blue_buttonbar_bg_enabled_unpressed</item>
<item name="ui_theme_buttonbar_frame_hleft_bitmap">@drawable/ui_blue_buttonbar_frame_hleft</item>
<item name="ui_theme_buttonbar_frame_hmid_bitmap">@drawable/ui_blue_buttonbar_frame_hmid</item>
<item name="ui_theme_buttonbar_frame_hright_bitmap">@drawable/ui_blue_buttonbar_frame_hright</item>
<item name="ui_theme_buttonbar_frame_solo_bitmap">@drawable/ui_blue_buttonbar_frame_solo</item>
<item name="ui_theme_buttonbar_frame_vbottom_bitmap">@drawable/ui_blue_buttonbar_frame_vbottom</item>
<item name="ui_theme_buttonbar_frame_vmid_bitmap">@drawable/ui_blue_buttonbar_frame_vmid</item>
<item name="ui_theme_buttonbar_frame_vtop_bitmap">@drawable/ui_blue_buttonbar_frame_vtop</item>
<item name="ui_theme_lightframe_bitmap">@drawable/ui_blue_lightframe</item>
<item name="ui_theme_lightframe_highlight_bitmap">@drawable/ui_blue_lightframe_highlight</item>
<item name="ui_theme_listseparator_img_bitmap">@drawable/ui_blue_listseparator_img</item>
<item name="ui_theme_radiobutton_disabled_checked_bitmap">@drawable/ui_blue_radiobutton_disabled_checked</item>
<item name="ui_theme_radiobutton_disabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_disabled_unchecked</item>
<item name="ui_theme_radiobutton_enabled_checked_bitmap">@drawable/ui_blue_radiobutton_enabled_checked</item>
<item name="ui_theme_radiobutton_enabled_unchecked_bitmap">@drawable/ui_blue_radiobutton_enabled_unchecked</item>
<item name="ui_theme_richframe_bitmap">@drawable/ui_blue_richframe</item>
<item name="ui_theme_spinner_arrow_bitmap">@drawable/ui_blue_spinner_arrow</item>
<item name="ui_theme_spinner_disabled_pressed_bitmap">@drawable/ui_blue_spinner_disabled_pressed</item>
<item name="ui_theme_spinner_disabled_unpressed_bitmap">@drawable/ui_blue_spinner_disabled_unpressed</item>
<item name="ui_theme_spinner_enabled_pressed_bitmap">@drawable/ui_blue_spinner_enabled_pressed</item>
<item name="ui_theme_spinner_enabled_unpressed_bitmap">@drawable/ui_blue_spinner_enabled_unpressed</item>
<item name="ui_theme_stdframe_bitmap">@drawable/ui_blue_stdframe</item>
<item name="ui_theme_submenu_indicator_bitmap">@drawable/ui_blue_submenu_indicator</item>
<item name="ui_theme_tabframe_bitmap">@drawable/ui_blue_tabframe</item>
<item name="ui_theme_tabwidget_disabled_selected_bitmap">@drawable/ui_blue_tabwidget_disabled_selected</item>
<item name="ui_theme_tabwidget_disabled_unselected_bitmap">@drawable/ui_blue_tabwidget_disabled_unselected</item>
<item name="ui_theme_tabwidget_enabled_selected_bitmap">@drawable/ui_blue_tabwidget_enabled_selected</item>
<item name="ui_theme_tabwidget_enabled_unselected_bitmap">@drawable/ui_blue_tabwidget_enabled_unselected</item>
<item name="ui_theme_textbutton_disabled_pressed_bitmap">@drawable/ui_blue_textbutton_disabled_pressed</item>
<item name="ui_theme_textbutton_disabled_unpressed_bitmap">@drawable/ui_blue_textbutton_disabled_unpressed</item>
<item name="ui_theme_textbutton_enabled_pressed_bitmap">@drawable/ui_blue_textbutton_enabled_pressed</item>
<item name="ui_theme_textbutton_enabled_unpressed_bitmap">@drawable/ui_blue_textbutton_enabled_unpressed</item>
<!-- Color palette -->
<item name="ui_theme_palette_blue_dark_color">@color/ui_blue_palette_blue_dark</item>
<item name="ui_theme_palette_blue_mid_color">@color/ui_blue_palette_blue_mid</item>
<item name="ui_theme_palette_cyan_dark_color">@color/ui_blue_palette_cyan_dark</item>
<item name="ui_theme_palette_cyan_light_color">@color/ui_blue_palette_cyan_light</item>
<item name="ui_theme_palette_mustard_dark_color">@color/ui_blue_palette_mustard_dark</item>
<item name="ui_theme_palette_mustard_light_color">@color/ui_blue_palette_mustard_light</item>
<item name="ui_theme_palette_orange_dark_color">@color/ui_blue_palette_orange_dark</item>
<item name="ui_theme_palette_orange_light_color">@color/ui_blue_palette_orange_light</item>
<item name="ui_theme_palette_text_gray_darker_color">@color/ui_blue_palette_text_gray_darker</item>
<item name="ui_theme_palette_text_gray_light_color">@color/ui_blue_palette_text_gray_light</item>
<item name="ui_theme_palette_text_gray_mid_color">@color/ui_blue_palette_text_gray_mid</item>
<!-- Color Aliases -->
<item name="ui_theme_dialogue_dark_color">@color/ui_theme_dialogue_dark</item>
<item name="ui_theme_dialogue_light_color">@color/ui_theme_dialogue_light</item>
<item name="ui_theme_npcname_dark_color">@color/ui_theme_npcname_dark</item>
<item name="ui_theme_playername_light_color">@color/ui_theme_playername_light</item>
<item name="ui_theme_reward_light_color">@color/ui_theme_reward_light</item>
<item name="ui_theme_stdframe_bg_color">@color/ui_theme_stdframe_bg</item>
<item name="ui_theme_textbutton_textcolor_color">@color/ui_theme_textbutton_textcolor</item>
</style>
<!-- PALETTE -->
<!-- Backgrounds -->
<color name="ui_blue_palette_blue_dark">#122438</color>
<color name="ui_blue_palette_blue_mid">#2e4464</color>
<color name="ui_blue_palette_blue_light">#4a6390</color>
<!-- Highlights -->
<color name="ui_blue_palette_highlight_gray_dark">#5e5e5e</color>
<color name="ui_blue_palette_highlight_gray_mid">#8c8c8c</color>
<color name="ui_blue_palette_highlight_gray_light">#b9b9b9</color>
<!-- Text grays -->
<color name="ui_blue_palette_text_gray_darker">#b0b0b0</color>
<color name="ui_blue_palette_text_gray_dark">#dadada</color>
<color name="ui_blue_palette_text_gray_mid">#ededed</color>
<color name="ui_blue_palette_text_gray_light">#fcfcfc</color>
<!-- Bright high-contrasts accents & player name in convo -->
<color name="ui_blue_palette_orange_dark">#c98e00</color>
<color name="ui_blue_palette_orange_light">#ffb400</color>
<!-- Washy accents & NPC name in convo -->
<color name="ui_blue_palette_mustard_dark">#a2a21d</color>
<color name="ui_blue_palette_mustard_light">#bbbb22</color>
<!-- Bright low-contrast accents & rewards in convo -->
<color name="ui_blue_palette_cyan_dark">#1e8f9c</color>
<color name="ui_blue_palette_cyan_light">#5ee3f1</color>
<!-- Wrappers -->
<style name="AndorsTrailTheme_Blue" parent="AndorsTrailStyle_Base" />
<style name="AndorsTrailTheme_Blue.NoBackground" parent="AndorsTrailTheme_Blue">
<item name="android:windowBackground">@null</item>
</style>
<style name="AndorsTrailDialogTheme_Blue" parent="AndorsTrailDialogTheme_Base" />
</resources>

76
AndorsTrail/res/values/ui_theme_attrs.xml Normal file
View File

@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- XML drawables -->
<attr name="ui_theme_buttonbar_bg_drawable" format="reference" />
<attr name="ui_theme_buttonbar_drawable" format="reference" />
<attr name="ui_theme_buttonbar_frame_drawable" format="reference" />
<attr name="ui_theme_groupindicator_drawable" format="reference" />
<attr name="ui_theme_listseparator_drawable" format="reference" />
<attr name="ui_theme_radiobutton_drawable" format="reference" />
<attr name="ui_theme_spinner_drawable" format="reference" />
<attr name="ui_theme_spinner_bg_drawable" format="reference" />
<attr name="ui_theme_spinner_list_bg_drawable" format="reference" />
<attr name="ui_theme_tabwidget_drawable" format="reference" />
<attr name="ui_theme_textbutton_drawable" format="reference" />
<attr name="ui_theme_togglebutton_drawable" format="reference" />
<!-- Bitmaps -->
<attr name="ui_theme_buttonbar_bg_disabled_pressed_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_bg_disabled_unpressed_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_bg_enabled_pressed_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_bg_enabled_unpressed_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_hleft_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_hmid_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_hright_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_solo_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_vbottom_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_vmid_bitmap" format="reference" />
<attr name="ui_theme_buttonbar_frame_vtop_bitmap" format="reference" />
<attr name="ui_theme_foreground_bitmap" format="reference" />
<attr name="ui_theme_lightframe_bitmap" format="reference" />
<attr name="ui_theme_lightframe_highlight_bitmap" format="reference" />
<attr name="ui_theme_listseparator_img_bitmap" format="reference" />
<attr name="ui_theme_radiobutton_disabled_checked_bitmap" format="reference" />
<attr name="ui_theme_radiobutton_disabled_unchecked_bitmap" format="reference" />
<attr name="ui_theme_radiobutton_enabled_checked_bitmap" format="reference" />
<attr name="ui_theme_radiobutton_enabled_unchecked_bitmap" format="reference" />
<attr name="ui_theme_richframe_bitmap" format="reference" />
<attr name="ui_theme_spinner_arrow_bitmap" format="reference" />
<attr name="ui_theme_spinner_disabled_pressed_bitmap" format="reference" />
<attr name="ui_theme_spinner_disabled_unpressed_bitmap" format="reference" />
<attr name="ui_theme_spinner_enabled_pressed_bitmap" format="reference" />
<attr name="ui_theme_spinner_enabled_unpressed_bitmap" format="reference" />
<attr name="ui_theme_stdframe_bitmap" format="reference" />
<attr name="ui_theme_submenu_indicator_bitmap" format="reference" />
<attr name="ui_theme_tabframe_bitmap" format="reference" />
<attr name="ui_theme_tabwidget_disabled_selected_bitmap" format="reference" />
<attr name="ui_theme_tabwidget_disabled_unselected_bitmap" format="reference" />
<attr name="ui_theme_tabwidget_enabled_selected_bitmap" format="reference" />
<attr name="ui_theme_tabwidget_enabled_unselected_bitmap" format="reference" />
<attr name="ui_theme_textbutton_disabled_pressed_bitmap" format="reference" />
<attr name="ui_theme_textbutton_disabled_unpressed_bitmap" format="reference" />
<attr name="ui_theme_textbutton_enabled_pressed_bitmap" format="reference" />
<attr name="ui_theme_textbutton_enabled_unpressed_bitmap" format="reference" />
<!-- Color palette -->
<attr name="ui_theme_dialogue_dark_color" format="reference" />
<attr name="ui_theme_dialogue_light_color" format="reference" />
<attr name="ui_theme_npcname_dark_color" format="reference" />
<attr name="ui_theme_palette_blue_dark_color" format="reference" />
<attr name="ui_theme_palette_blue_mid_color" format="reference" />
<attr name="ui_theme_palette_cyan_dark_color" format="reference" />
<attr name="ui_theme_palette_cyan_light_color" format="reference" />
<attr name="ui_theme_palette_mustard_dark_color" format="reference" />
<attr name="ui_theme_palette_mustard_light_color" format="reference" />
<attr name="ui_theme_palette_orange_dark_color" format="reference" />
<attr name="ui_theme_palette_orange_light_color" format="reference" />
<attr name="ui_theme_palette_text_gray_darker_color" format="reference" />
<attr name="ui_theme_palette_text_gray_light_color" format="reference" />
<attr name="ui_theme_palette_text_gray_mid_color" format="reference" />
<attr name="ui_theme_playername_light_color" format="reference" />
<attr name="ui_theme_reward_light_color" format="reference" />
<attr name="ui_theme_stdframe_bg_color" format="reference" />
<attr name="ui_theme_textbutton_textcolor_color" format="reference" />
</resources>

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

@@ -396,7 +396,7 @@ public final class Dialogs {
itemList.setStackFromBottom(true);
itemList.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
itemList.setChoiceMode(ListView.CHOICE_MODE_NONE);
itemList.setBackgroundResource(R.color.ui_blue_stdframe_bg);
itemList.setBackgroundResource(R.color.ui_theme_stdframe_bg);
if (combatLogMessages.length <= 0) {
combatLogMessages = new String[] {context.getResources().getString(R.string.combat_log_noentries)};
}

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
View File

@@ -231,14 +231,14 @@ public final class ConversationActivity
while(numberOfNewMessage != 0){
ConversationStatement conversation = conversationHistory.get(numberOfMessage - numberOfNewMessage);
if(conversation.hasActor()){
conversation.textColor = getSpanColor(R.color.ui_blue_dialogue_dark);
conversation.textColor = getSpanColor(R.color.ui_theme_dialogue_dark);
if(conversation.isPlayerActor){
conversation.nameColor = getSpanColor(R.color.ui_blue_playername_light);
conversation.nameColor = getSpanColor(R.color.ui_theme_playername_light);
} else {
conversation.nameColor = getSpanColor(R.color.ui_blue_npcname_dark);
conversation.nameColor = getSpanColor(R.color.ui_theme_npcname_dark);
}
}else{
conversation.textColor = getSpanColor(R.color.ui_blue_reward_light);
conversation.textColor = getSpanColor(R.color.ui_theme_reward_light);
}
numberOfNewMessage--;
}
@@ -254,7 +254,7 @@ public final class ConversationActivity
} else {
if (rb == null) return;
Reply r = (Reply) rb.getTag();
addConversationStatement(player, rb.getText().toString(), getSpanColor(R.color.ui_blue_dialogue_light));
addConversationStatement(player, rb.getText().toString(), getSpanColor(R.color.ui_theme_dialogue_light));
conversationState.playerSelectedReply(getResources(), r);
}
}
@@ -268,7 +268,7 @@ public final class ConversationActivity
s.iconID = ConversationStatement.NO_ICON;
}
s.text = text;
s.nameColor = actor == player ? getSpanColor(R.color.ui_blue_playername_light) : getSpanColor(R.color.ui_blue_npcname_light);
s.nameColor = actor == player ? getSpanColor(R.color.ui_theme_playername_light) : getSpanColor(R.color.ui_theme_npcname_light);
s.textColor = textColor;
s.isPlayerActor = actor != null && actor == player;
conversationHistory.add(s);
@@ -389,7 +389,7 @@ public final class ConversationActivity
@Override
public void onTextPhraseReached(String message, Actor actor, String phraseID) {
addConversationStatement(actor, message, getSpanColor(R.color.ui_blue_dialogue_light));
addConversationStatement(actor, message, getSpanColor(R.color.ui_theme_dialogue_light));
}
@Override
@@ -425,7 +425,7 @@ public final class ConversationActivity
}
private void addRewardMessage(String text) {
addConversationStatement(null, text, getSpanColor(R.color.ui_blue_reward_light));
addConversationStatement(null, text, getSpanColor(R.color.ui_theme_reward_light));
}
@Override

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

@@ -437,7 +437,7 @@ public final class TileManager {
public void init(Resources res) {
mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mFillPaint.setColor(res.getColor(R.color.ui_blue_palette_text_gray_light));
mFillPaint.setColor(res.getColor(R.color.ui_theme_dialogue_light));
// mFillPaint.setShadowLayer(5f * res.getDisplayMetrics().scaledDensity, 1, 1, res.getColor(android.R.color.black));
mFillPaint.setStyle(Paint.Style.FILL);
mFillPaint.setTextSize(size * res.getDisplayMetrics().scaledDensity);
@@ -446,7 +446,7 @@ public final class TileManager {
mStrokePaint=new Paint(mFillPaint);
// mStrokePaint.setStyle(Paint.Style.FILL);
// mStrokePaint.setStrokeWidth(1f * res.getDisplayMetrics().scaledDensity);
mStrokePaint.setColor(res.getColor(R.color.ui_blue_palette_blue_mid));
mStrokePaint.setColor(res.getColor(R.color.ui_theme_buttonbar_bg));
}

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomDialogFactory.java
View File

@@ -29,7 +29,7 @@ public class CustomDialogFactory {
}
public static CustomDialog createDialog(final Context context, String title, Drawable icon, String desc, View content, boolean hasButtons) {
final CustomDialog dialog = new CustomDialog(new ContextThemeWrapper(context, R.style.AndorsTrailStyle_Dialog)) {
final CustomDialog dialog = new CustomDialog(new ContextThemeWrapper(context, R.style.AndorsTrailDialogTheme_Blue)) {
@Override
public boolean onTouchEvent(MotionEvent event) {
Rect r = new Rect();
@@ -47,8 +47,6 @@ public class CustomDialogFactory {
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.custom_dialog_title_icon);
dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
// dialog.getWindow().getAttributes().width=WindowManager.LayoutParams.MATCH_PARENT;
// dialog.getWindow().getAttributes().height=WindowManager.LayoutParams.MATCH_PARENT;
if (((AndorsTrailApplication)context.getApplicationContext()).getPreferences().fullscreen) {
dialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
} else {
@@ -117,7 +115,7 @@ public class CustomDialogFactory {
b.setLayoutParams(params);
//Old android versions need this "reminder"
b.setBackgroundDrawable(dialog.getContext().getResources().getDrawable(R.drawable.ui_blue_textbutton));
b.setTextColor(dialog.getContext().getResources().getColor(R.color.ui_blue_palette_text_gray_light));
b.setTextColor(dialog.getContext().getResources().getColor(R.color.ui_theme_dialogue_light));
b.setText(textId);
b.setOnClickListener(new OnClickListener() {

7
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
View File

@@ -262,22 +262,15 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
this.id = id;
this.image = new ActiveConditionIconImageView(context);
this.image.setId(id);
// GradientDrawable grad = new GradientDrawable(target == world.model.player ? Orientation.BOTTOM_TOP : Orientation.TOP_BOTTOM, new int[]{Color.argb(190, 68, 68, 68), Color.argb(10, 34, 34, 34)});
// grad.setCornerRadius(3);
// this.image.setBackgroundDrawable(grad);
this.image.setBackgroundResource(R.drawable.ui_blue_buttonbar);
this.image.setHorizontal();
this.image.reverse();
// this.text = new TextView(context);
this.onNewIconAnimation = AnimationUtils.loadAnimation(context, R.anim.scaleup);
this.onRemovedIconAnimation = AnimationUtils.loadAnimation(context, R.anim.scaledown);
this.onAppliedEffectAnimation = AnimationUtils.loadAnimation(context, R.anim.scalebeat);
this.onRemovedIconAnimation.setAnimationListener(this);
res = context.getResources();
// text.setTextColor(res.getColor(R.color.ui_blue_palette_text_gray_light));
// text.setShadowLayer(1, 1, 1, res.getColor(android.R.color.black));
}
private void setActiveCondition(ActorCondition condition, boolean immunity) {