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

Color palette in resources. Conversation activity uses it now.

Browse Source 
Preferences category headers fixed.
This commit is contained in:
Zukero
2017-11-06 23:53:40 +01:00
parent f78862e778
commit f9c3bc6bf6
5 changed files with 352 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +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="#ffffffff"/>
<item android:state_enabled="true" android:state_checked="true" android:color="#ffffffff"/>
<item android:state_enabled="true" android:color="#ffededed"/>
<item android:state_enabled="false" android:color="#ffa0a0a0"/>
<item android:color="#ffdadada"/>
</selector>
<?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>

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

@@ -1,55 +1,70 @@
<?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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<!-- <item name="android:tabWidgetStyle">@style/AndorsTrail_Blue_TabWidget</item> -->
<!-- <item name="android:toastFrameBackground">@drawable/ui_blue_richframe</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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<!-- <item name="android:tabWidgetStyle">@style/AndorsTrail_Blue_TabWidget</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:textAllCaps">false</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:textAppearanceListItem">@style/AndorsTrail_Blue_TextAppearance.ListItemTitle</item>
<item name="android:textAppearanceSmall">@style/AndorsTrail_Blue_TextAppearance.ListItemSubtitle</item>
</style>
<?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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:dialogTheme">@style/AndorsTrailStyle.Dialog</item>
<item name="android:alertDialogTheme">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</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:textAllCaps">false</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:textAppearanceListItem">@style/AndorsTrail_Blue_TextAppearance.ListItemTitle</item>
<item name="android:textAppearanceSmall">@style/AndorsTrail_Blue_TextAppearance.ListItemSubtitle</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>
<item name="android:gravity">center_vertical</item>
</style>
</resources>

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

@@ -1,5 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="displayworldmap_background">#122438</color>
<color name="ui_blue_stdframe_bg">#122438</color>
<!-- 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>
<!-- 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>
<!-- 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>
<!-- 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>
<!-- 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>
</resources>

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

@@ -1,204 +1,220 @@
<?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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<!-- <item name="android:tabWidgetStyle">@style/AndorsTrail_Blue_TabWidget</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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<!-- <item name="android:tabWidgetStyle">@style/AndorsTrail_Blue_TabWidget</item> -->
</style>
<style name="AndorsTrailStyle.Dialog.Alert" parent="AndorsTrailStyle.Dialog">
<item name="android:background">@null</item>
<item name="android:windowBackground">@drawable/ui_blue_stdframe</item>
<item name="android:windowTitleStyle">@style/AndorsTrailStyle.DialogWindowTitle</item>
<!--
<item name="android:dialogTitleDecorLayout">@layout/custom_dialog_title_icon</item>
<item name="android:dialogCustomTitleDecorLayout">@layout/custom_dialog_title_icon</item>
<item name="android:dialogTitleIconsDecorLayout">@layout/custom_dialog_title_icon</item>
-->
</style>
<style name="AndorsTrailStyle.DialogWindowTitle"> <!-- parent="android:style/DialogWindowTitle" -->
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
</style>
<style name="AndorsTrail_Blue_List" parent="android:style/Widget.ListView">
<item name="android:background">@drawable/ui_blue_stdframe</item>
<item name="android:divider">@android:color/transparent</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>
<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_Spinner" parent="android:style/Widget.Spinner">
<item name="android:background">@drawable/ui_blue_spinner</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textAppearance">@color/ui_blue_textbutton_textcolor</item>
<item name="android:gravity">start</item>
</style>
<style name="AndorsTrail_Blue_SpinnerDropDown" parent="android:style/Widget.DropDownItem.Spinner">
<item name="android:background">@drawable/ui_blue_spinner_list_bg</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:checkMark">@drawable/ui_blue_radiobutton</item>
</style>
<style name="AndorsTrail_Blue_SpinnerCollapsed" parent="android:style/Widget.DropDownItem">
<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>
</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_TabWidget" parent="android:style/Widget.TabWidget">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:background">@drawable/ui_blue_tabwidget</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="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>
</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>
</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>
</style>
<style name="statsBoxStyle" parent="android:Widget.TextView">
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:drawablePadding">@dimen/boxshape_margin</item>
<item name="android:gravity">center_vertical</item>
<item name="android:layout_margin">@dimen/boxshape_margin</item>
<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>
</style>
<style name="quickButton" parent="@style/AndorsTrail_Blue_TextButton">
<item name="android:longClickable">true</item>
<item name="android:textSize">@dimen/actionbar_text</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">@dimen/smalltext_buttonheight</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:adjustViewBounds">true</item>
<item name="android:padding">5dp</item>
</style>
<style name="toolboxButtonTile" parent="@style/AndorsTrail_Blue_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">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:padding">0dp</item>
</style>
<style name="traitsinfo_label" parent="android:Widget.TextView">
<item name="android:layout_marginRight">10sp</item>
</style>
<style name="traitsinfo_2linelabel" parent="android:Widget.TextView"></style>
<style name="traitsinfo_2linevalue" parent="android:Widget.TextView">
<item name="android:layout_marginLeft">30sp</item>
</style>
<?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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Blue_PreferencesListHeader</item>
<!-- <item name="android:tabWidgetStyle">@style/AndorsTrail_Blue_TabWidget</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:spinnerStyle">@style/AndorsTrail_Blue_Spinner</item>
<item name="android:spinnerDropDownItemStyle">@style/AndorsTrail_Blue_SpinnerDropDown</item>
<item name="android:alertDialogStyle">@style/AndorsTrailStyle.Dialog.Alert</item>
<item name="android:spinnerItemStyle">@style/AndorsTrail_Blue_SpinnerCollapsed</item>
<item name="android:expandableListViewStyle">@style/AndorsTrail_Blue_ExpandableListView</item>
<item name="android:listSeparatorTextViewStyle">@style/AndorsTrail_Blue_PreferencesListHeader</item>
<!-- <item name="android:tabWidgetStyle">@style/AndorsTrail_Blue_TabWidget</item> -->
</style>
<style name="AndorsTrailStyle.Dialog.Alert" parent="AndorsTrailStyle.Dialog">
<item name="android:background">@null</item>
<item name="android:windowBackground">@drawable/ui_blue_stdframe</item>
<item name="android:windowTitleStyle">@style/AndorsTrailStyle.DialogWindowTitle</item>
<!--
<item name="android:dialogTitleDecorLayout">@layout/custom_dialog_title_icon</item>
<item name="android:dialogCustomTitleDecorLayout">@layout/custom_dialog_title_icon</item>
<item name="android:dialogTitleIconsDecorLayout">@layout/custom_dialog_title_icon</item>
-->
</style>
<style name="AndorsTrailStyle.DialogWindowTitle"> <!-- parent="android:style/DialogWindowTitle" -->
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
</style>
<style name="AndorsTrail_Blue_List" parent="android:style/Widget.ListView">
<item name="android:background">@drawable/ui_blue_stdframe</item>
<item name="android:divider">@android:color/transparent</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>
<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_Spinner" parent="android:style/Widget.Spinner">
<item name="android:background">@drawable/ui_blue_spinner</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:textAppearance">@color/ui_blue_textbutton_textcolor</item>
<item name="android:gravity">start</item>
</style>
<style name="AndorsTrail_Blue_SpinnerDropDown" parent="android:style/Widget.DropDownItem.Spinner">
<item name="android:background">@drawable/ui_blue_spinner_list_bg</item>
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:checkMark">@drawable/ui_blue_radiobutton</item>
</style>
<style name="AndorsTrail_Blue_SpinnerCollapsed" parent="android:style/Widget.DropDownItem">
<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>
</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_TabWidget" parent="android:style/Widget.TabWidget">
<item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
<item name="android:background">@drawable/ui_blue_tabwidget</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="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>
</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>
</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>
</style>
<style name="statsBoxStyle" parent="android:Widget.TextView">
<item name="android:background">@drawable/ui_blue_richframe</item>
<item name="android:drawablePadding">@dimen/boxshape_margin</item>
<item name="android:gravity">center_vertical</item>
<item name="android:layout_margin">@dimen/boxshape_margin</item>
<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>
</style>
<style name="quickButton" parent="@style/AndorsTrail_Blue_TextButton">
<item name="android:longClickable">true</item>
<item name="android:textSize">@dimen/actionbar_text</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">@dimen/smalltext_buttonheight</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:adjustViewBounds">true</item>
<item name="android:padding">5dp</item>
</style>
<style name="toolboxButtonTile" parent="@style/AndorsTrail_Blue_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">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:padding">0dp</item>
</style>
<style name="traitsinfo_label" parent="android:Widget.TextView">
<item name="android:layout_marginRight">10sp</item>
</style>
<style name="traitsinfo_2linelabel" parent="android:Widget.TextView"></style>
<style name="traitsinfo_2linevalue" parent="android:Widget.TextView">
<item name="android:layout_marginLeft">30sp</item>
</style>
</resources>

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

@@ -48,16 +48,6 @@ public final class ConversationActivity
implements OnKeyListener
, ConversationController.ConversationStatemachine.ConversationStateListener {
private static final int playerNameColor = Color.argb(255, 0xbb, 0x22, 0x22);
private static final int NPCNameColor = Color.argb(255, 0xbb, 0xbb, 0x22);
private static final int playerPhraseColor = Color.argb(255, 0xff, 0xff, 0xff);
private static final int NPCPhraseColor = Color.argb(255, 0xff, 0xff, 0xff);
private static final int rewardColor = Color.argb(255, 0x99, 0x99, 0x55);
private static final int oldPhraseColor = Color.argb(255, 0xb0, 0xb0, 0xb0);
private static final int oldPlayerNameColor = Color.argb(255, 0x89, 0x19, 0x19);
private static final int oldNPCNameColor = Color.argb(255, 0xa2, 0xa2, 0x1d);
private static final int oldRewardColor = Color.argb(255, 0x7a, 0x7a, 0x44);
private WorldContext world;
private Player player;
private final ArrayList<ConversationStatement> conversationHistory = new ArrayList<ConversationStatement>();
@@ -223,14 +213,14 @@ public final class ConversationActivity
while(numberOfNewMessage != 0){
ConversationStatement conversation = conversationHistory.get(numberOfMessage - numberOfNewMessage);
if(conversation.hasActor()){
conversation.textColor = oldPhraseColor;
conversation.textColor = getSpanColor(R.color.ui_blue_dialogue_dark);
if(conversation.isPlayerActor){
conversation.nameColor = oldPlayerNameColor;
conversation.nameColor = getSpanColor(R.color.ui_blue_playername_light);
} else {
conversation.nameColor = oldNPCNameColor;
conversation.nameColor = getSpanColor(R.color.ui_blue_npcname_dark);
}
}else{
conversation.textColor = oldRewardColor;
conversation.textColor = getSpanColor(R.color.ui_blue_reward_light);
}
numberOfNewMessage--;
}
@@ -246,7 +236,7 @@ public final class ConversationActivity
} else {
if (rb == null) return;
Reply r = (Reply) rb.getTag();
addConversationStatement(player, rb.getText().toString(), playerPhraseColor);
addConversationStatement(player, rb.getText().toString(), getSpanColor(R.color.ui_blue_dialogue_light));
conversationState.playerSelectedReply(getResources(), r);
}
}
@@ -260,7 +250,7 @@ public final class ConversationActivity
s.iconID = ConversationStatement.NO_ICON;
}
s.text = text;
s.nameColor = actor == player ? playerNameColor : NPCNameColor;
s.nameColor = actor == player ? getSpanColor(R.color.ui_blue_playername_light) : getSpanColor(R.color.ui_blue_npcname_light);
s.textColor = textColor;
s.isPlayerActor = actor != null && actor == player;
conversationHistory.add(s);
@@ -381,7 +371,7 @@ public final class ConversationActivity
@Override
public void onTextPhraseReached(String message, Actor actor, String phraseID) {
addConversationStatement(actor, message, NPCPhraseColor);
addConversationStatement(actor, message, getSpanColor(R.color.ui_blue_dialogue_light));
}
@Override
@@ -417,7 +407,7 @@ public final class ConversationActivity
}
private void addRewardMessage(String text) {
addConversationStatement(null, text, rewardColor);
addConversationStatement(null, text, getSpanColor(R.color.ui_blue_reward_light));
}
@Override
@@ -461,4 +451,8 @@ public final class ConversationActivity
rb.setFocusableInTouchMode(false);
replyGroup.addView(rb, layoutParams);
}
private int getSpanColor(int resId) {
return getResources().getColor(resId);
}
}